Skip to content

Commit 4add7d2

Browse files
authored
fix: Back out resolutions, and add ignore-engines to dev cli (#28464)
* fix: Back out resolutions, and add ignore-engines to dev cli * Use dev-cli@next
1 parent 946eed0 commit 4add7d2

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
},
9595
"resolutions": {
9696
"theme-ui": "0.4.0-rc.14",
97-
"csstype": "2.6.14",
98-
"extract-files": "^8.1.0"
97+
"csstype": "2.6.14"
9998
},
10099
"engines": {
101100
"yarn": "^1.17.3",

packages/gatsby-dev-cli/src/local-npm-registry/install-packages.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ const installPackages = async ({
118118

119119
// package.json files are changed - so we just want to install
120120
// using verdaccio registry
121-
installCmd = [`yarn`, [`install`, `--registry=${registryUrl}`]]
121+
installCmd = [
122+
`yarn`,
123+
[`install`, `--registry=${registryUrl}`, `--ignore-engines`],
124+
]
122125
} else {
123126
installCmd = [
124127
`yarn`,
@@ -130,6 +133,7 @@ const installPackages = async ({
130133
}),
131134
`--registry=${registryUrl}`,
132135
`--exact`,
136+
`--ignore-engines`,
133137
],
134138
]
135139
}

scripts/e2e-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CUSTOM_COMMAND="${2:-yarn test}"
66
GATSBY_PATH="${CIRCLE_WORKING_DIRECTORY:-../../}"
77

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

1111
# setting up child integration test link to gatsby packages
1212
cd "$SRC_PATH"

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -10633,10 +10633,10 @@ extglob@^2.0.4:
1063310633
snapdragon "^0.8.1"
1063410634
to-regex "^3.0.1"
1063510635

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

1064110641
extract-zip@^1.6.6:
1064210642
version "1.7.0"

0 commit comments

Comments
 (0)