Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(recipes): Fix shadow-file resource for scoped NPM packages & re-enable e2e testing for resources #23274

Merged
merged 14 commits into from
Apr 20, 2020
Merged

fix(recipes): Fix shadow-file resource for scoped NPM packages & re-enable e2e testing for resources #23274

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
164522b
fix(recipes): Fix shadow-file resource for scoped NPM packages
KyleAMathews Apr 19, 2020
e9da890
WILL SLASH FIX WINDOWS???
KyleAMathews Apr 19, 2020
23b17ef
Add missing code block
KyleAMathews Apr 19, 2020
62306f6
Try again
KyleAMathews Apr 19, 2020
a9edeb1
hmmm joinPath maybe is the problem
KyleAMathews Apr 19, 2020
e8457a0
More fixes
KyleAMathews Apr 19, 2020
d889c0d
try reenabling tests
KyleAMathews Apr 19, 2020
479ef73
disable colors in diffs
KyleAMathews Apr 19, 2020
5c9f9b3
Fix npm script test
KyleAMathews Apr 20, 2020
f85b0d7
Why do these keep changing all the time??
KyleAMathews Apr 20, 2020
450138f
Use parsed value for the plan
KyleAMathews Apr 20, 2020
ee56a91
Disable Chalk colors on unit tests so match local ones
KyleAMathews Apr 20, 2020
9c8163e
Update packages/gatsby-recipes/src/providers/utils/get-diff.js
KyleAMathews Apr 20, 2020
87fffce
Merge remote-tracking branch 'upstream/master' into fix-shadowing
Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use parsed value for the plan
  • Loading branch information
@KyleAMathews
KyleAMathews committed Apr 20, 2020
commit 450138fe747bd2768b27be6ad7983dcf05a209a8
10 changes: 8 additions & 2 deletions packages/gatsby-recipes/src/providers/npm/__snapshots__/package-json.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ Object {
"id": "husky",
"name": "husky",
"newState": "{
\\"husky\\": \\"{\\\\n \\\\\\"hooks\\\\\\": {}\\\\n}\\"
\\"husky\\": {
\\"hooks\\": {}
}
}",
}
`;
Expand All @@ -45,7 +47,11 @@ Object {
"id": "husky",
"name": "husky",
"newState": "{
\\"husky\\": \\"{\\\\n \\\\\\"hooks\\\\\\": {\\\\n \\\\\\"pre-commit\\\\\\": \\\\\\"lint-staged\\\\\\"\\\\n }\\\\n}\\"
\\"husky\\": {
\\"hooks\\": {
\\"pre-commit\\": \\"lint-staged\\"
}
}
}",
}
`;
Expand Down
3 changes: 2 additions & 1 deletion packages/gatsby-recipes/src/providers/npm/package-json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,10 @@ exports.schema = schema
exports.validate = validate

module.exports.plan = async ({ root }, { id, name, value }) => {
const parsedValue = typeof value === `string` ? JSON.parse(value) : value
const key = id || name
const currentState = readPackageJson(root)
const newState = { ...currentState, [key]: value }
const newState = { ...currentState, [key]: parsedValue }

return {
id: key,
Expand Down