Skip to content

fix: Back out resolutions, and add ignore-engines to dev cli #28464

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

Merged
merged 2 commits into from
Dec 3, 2020
Merged

fix: Back out resolutions, and add ignore-engines to dev cli #28464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e01f26
fix: Back out resolutions, and add ignore-engines to dev cli
ascorbic Dec 3, 2020
a0b9c03
Use dev-cli@next
ascorbic Dec 3, 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
3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@
},
"resolutions": {
"theme-ui": "0.4.0-rc.14",
"csstype": "2.6.14",
"extract-files": "^8.1.0"
"csstype": "2.6.14"
},
"engines": {
"yarn": "^1.17.3",
Expand Down
6 changes: 5 additions & 1 deletion packages/gatsby-dev-cli/src/local-npm-registry/install-packages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,10 @@ const installPackages = async ({

// package.json files are changed - so we just want to install
// using verdaccio registry
installCmd = [`yarn`, [`install`, `--registry=${registryUrl}`]]
installCmd = [
`yarn`,
[`install`, `--registry=${registryUrl}`, `--ignore-engines`],
]
} else {
installCmd = [
`yarn`,
Expand All @@ -130,6 +133,7 @@ const installPackages = async ({
}),
`--registry=${registryUrl}`,
`--exact`,
`--ignore-engines`,
],
]
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/e2e-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CUSTOM_COMMAND="${2:-yarn test}"
GATSBY_PATH="${CIRCLE_WORKING_DIRECTORY:-../../}"

# cypress docker does not support sudo and does not need it, but the default node executor does
command -v gatsby-dev || command -v sudo && sudo npm install -g gatsby-dev-cli || npm install -g gatsby-dev-cli
command -v gatsby-dev || command -v sudo && sudo npm install -g gatsby-dev-cli@next || npm install -g gatsby-dev-cli@next

# setting up child integration test link to gatsby packages
cd "$SRC_PATH"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10633,10 +10633,10 @@ extglob@^2.0.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"

extract-files@^8, extract-files@^9.0.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-8.1.0.tgz#46a0690d0fe77411a2e3804852adeaa65cd59288"
integrity sha512-PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ==
extract-files@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a"
integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ==

extract-zip@^1.6.6:
version "1.7.0"
Expand Down