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

chore: pin @vercel/webpack-asset-relocator-loader (#38981) #38983

Merged
merged 6 commits into from
May 17, 2024
Merged

chore: pin @vercel/webpack-asset-relocator-loader (#38981) #38983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9946581
chore: pin @vercel/webpack-asset-relocator-loader (#38981)
pieh May 17, 2024
bb474fd
ignore engines
pieh May 17, 2024
ac69507
ignore engines2
pieh May 17, 2024
80c25b2
ignore engines3
pieh May 17, 2024
c691aed
ignore engines4
pieh May 17, 2024
a23ed39
ignore engines5
pieh May 17, 2024
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: 2 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 @@ -119,7 +119,7 @@ const installPackages = async ({

// package.json files are changed - so we just want to install
// using verdaccio registry
const yarnCommands = [`install`]
const yarnCommands = [`install`, `--ignore-engines`]

if (!externalRegistry) {
yarnCommands.push(`--registry=${registryUrl}`)
Expand All @@ -134,6 +134,7 @@ const installPackages = async ({
return `${packageName}@${packageVersion}`
}),
`--exact`,
`--ignore-engines`,
]

if (!externalRegistry) {
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@types/http-proxy": "^1.17.7",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"@vercel/webpack-asset-relocator-loader": "^1.7.0",
"@vercel/webpack-asset-relocator-loader": "1.7.3",
"acorn-loose": "^8.3.0",
"acorn-walk": "^8.2.0",
"address": "1.1.2",
Expand Down
9 changes: 4 additions & 5 deletions scripts/e2e-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,17 @@ TMP_TEST_LOCATION=$TMP_LOCATION/$SRC_PATH
mkdir -p $TMP_LOCATION/scripts/
mkdir -p $TMP_TEST_LOCATION

# 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@next) || npm install -g gatsby-dev-cli@next

echo "Copy $SRC_PATH into $TMP_LOCATION to isolate test"
cp -Rv $SRC_PATH/. $TMP_TEST_LOCATION
cp -Rv $GATSBY_PATH/scripts/. $TMP_LOCATION/scripts/

# setting up child integration test link to gatsby packages
cd "$TMP_TEST_LOCATION"

gatsby-dev --set-path-to-repo "$GATSBY_PATH"
gatsby-dev --force-install --scan-once # Do not copy files, only install through npm, like our users would
echo "Using $GATSBY_PATH/packages/gatsby-dev-cli/dist/index.js"

node $GATSBY_PATH/packages/gatsby-dev-cli/dist/index.js --set-path-to-repo "$GATSBY_PATH"
node $GATSBY_PATH/packages/gatsby-dev-cli/dist/index.js --force-install --scan-once # Do not copy files, only install through npm, like our users would
if test -f "./node_modules/.bin/gatsby"; then
chmod +x ./node_modules/.bin/gatsby # this is sometimes necessary to ensure executable
echo "Gatsby bin chmoded"
Expand Down
10 changes: 6 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4914,10 +4914,12 @@
async-retry "^1.3.3"
debug "^4.3.3"

"@vercel/webpack-asset-relocator-loader@^1.7.0":
version "1.7.0"
resolved "https://registry.yarnpkg.com/@vercel/webpack-asset-relocator-loader/-/webpack-asset-relocator-loader-1.7.0.tgz#d3b707e0aba3111719f941dacb2408eff3c27319"
integrity sha512-1Dy3BdOliDwxA7VZSIg55E1d/us2KvsCQOZV25fgufG//CsnZBGiSAL7qewTQf7YVHH0A9PHgzwMmKIZ8aFYVw==
"@vercel/[email protected]":
version "1.7.3"
resolved "https://registry.yarnpkg.com/@vercel/webpack-asset-relocator-loader/-/webpack-asset-relocator-loader-1.7.3.tgz#e65ca1fd9feb045039788f9b4710e5acc84b01b0"
integrity sha512-vizrI18v8Lcb1PmNNUBz7yxPxxXoOeuaVEjTG9MjvDrphjiSxFZrRJ5tIghk+qdLFRCXI5HBCshgobftbmrC5g==
dependencies:
resolve "^1.10.0"

"@verdaccio/[email protected]", "@verdaccio/commons-api@^9.7.1":
version "9.7.1"
Expand Down