Skip to content

Commit 4952d54

Browse files
piehascorbic
andauthored
Backport #28459 and #28464 to 2.28 release branch (#28481)
* fix(gatsby-source-graphql): Pin resolution of extract-files (#28459) (cherry picked from commit 4ef4bf5) * 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 (cherry picked from commit 4add7d2) Co-authored-by: Matt Kane <[email protected]>
1 parent 52637b6 commit 4952d54

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

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

Lines changed: 5 additions & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11374,13 +11374,6 @@ gather-stream@^1.0.0:
1137411374
version "1.0.0"
1137511375
resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
1137611376

11377-
gatsby-design-tokens@^2.0.2:
11378-
version "2.0.13"
11379-
resolved "https://registry.yarnpkg.com/gatsby-design-tokens/-/gatsby-design-tokens-2.0.13.tgz#33f5fa84a399b821ae224b9921847d7b37c45600"
11380-
integrity sha512-I4i1pYG5y8yQ9uul1uvUZ1sy5skCOg33kHUUeYCWvW7vPdtBcQLgYqT2tLPQMMCc16ljbJF0DL4g52zQ7tVAhQ==
11381-
dependencies:
11382-
hex2rgba "^0.0.1"
11383-
1138411377
gatsby-interface@^0.0.225:
1138511378
version "0.0.225"
1138611379
resolved "https://registry.yarnpkg.com/gatsby-interface/-/gatsby-interface-0.0.225.tgz#f2962d8f2e40163ff1bf908f3083ef634a3f4730"

0 commit comments

Comments
 (0)