Skip to content

Commit f8c5141

Browse files
authoredSep 14, 2021
chore: apply patches for v4 (#33170)
* chore: apply patches for v4 * adjust publish-next command * replace alpha with next * switch to node14 in circleci * update yarn.lock * set COMPILER_OPTIONS and update circleci config * use sudo for now
1 parent e1cba20 commit f8c5141

File tree

122 files changed

+278
-289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+278
-289
lines changed
 

‎.circleci/config.yml

+14-25
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ executors:
88
image:
99
type: string
1010
# First 10.x LTS release, but old Yarn
11-
default: "12.13.0"
11+
default: "14.17.0"
1212
docker:
1313
- image: cimg/node:<< parameters.image >>
1414

1515
aliases:
1616
e2e-executor: &e2e-executor
1717
docker:
18-
- image: cypress/browsers:node12.18.3-chrome87-ff82
18+
- image: cypress/browsers:node14.15.0-chrome86-ff82
1919

2020
restore_cache: &restore_cache
2121
restore_cache:
@@ -102,7 +102,7 @@ aliases:
102102
requires:
103103
- lint
104104
- typecheck
105-
- unit_tests_node12
105+
- unit_tests_node14
106106

107107
e2e_tests_production_runtime_alias: &e2e_tests_production_runtime_alias
108108
<<: *e2e-executor
@@ -188,7 +188,7 @@ jobs:
188188
- checkout
189189
- run: ./scripts/assert-changed-files.sh "packages/*|(e2e|integration)-tests/*|.circleci/*|scripts/e2e-test.sh|yarn.lock"
190190
# python 2 is not built in and node-gyp needs it to build lmdb
191-
- run: apt-get update && apt-get install python -y
191+
- run: sudo apt-get update && sudo apt-get install python -y
192192
- <<: *restore_cache
193193
- <<: *install_node_modules
194194
- <<: *check_lockfile
@@ -227,11 +227,6 @@ jobs:
227227
- run: yarn typecheck
228228
- run: yarn check-repo-fields
229229

230-
unit_tests_node12:
231-
executor:
232-
name: node
233-
<<: *test_template
234-
235230
unit_tests_node14:
236231
executor:
237232
name: node
@@ -255,9 +250,9 @@ jobs:
255250
command: |
256251
echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
257252
echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
258-
- run: nvm install v12
259-
- run: nvm alias default v12
260-
- run: nvm use v12
253+
- run: nvm install v14
254+
- run: nvm alias default v14
255+
- run: nvm use v14
261256
- run: npm i -g yarn@1.22.10
262257
- e2e-test:
263258
test_path: integration-tests/gatsby-source-wordpress
@@ -477,7 +472,7 @@ jobs:
477472
steps:
478473
- checkout
479474
# jq is helpful for parsing json & python required for node-gyp to build lmdb
480-
- run: apt-get update && apt-get install jq python -y
475+
- run: sudo apt-get update && sudo apt-get install jq python -y
481476
- <<: *restore_cache
482477
- <<: *install_node_modules
483478
- run: yarn markdown
@@ -489,7 +484,7 @@ jobs:
489484
executor: node
490485
steps:
491486
- checkout
492-
- run: apt-get update && apt-get install jq python -y
487+
- run: sudo apt-get update && sudo apt-get install jq python -y
493488
- <<: *restore_cache
494489
- <<: *install_node_modules
495490
- run: git config --global user.name "GatsbyJS Bot"
@@ -540,11 +535,11 @@ jobs:
540535

541536
- <<: *attach_to_bootstrap
542537
- run:
543-
name: Install node 12.13 and yarn
538+
name: Install node 14.17 and yarn
544539
command: |
545-
nvm install 12.13.0
546-
nvm alias default 12.13.0
547-
nvm use 12.13.0
540+
nvm install 14.17.0
541+
nvm alias default 14.17.0
542+
nvm use 14.17.0
548543
choco install yarn
549544
- run:
550545
name: Rebuild packages for windows
@@ -571,7 +566,7 @@ jobs:
571566
steps:
572567
- checkout
573568
# python 2 is not built in and node-gyp needs it to build lmdb
574-
- run: apt-get update && apt-get install python -y
569+
- run: sudo apt-get update && sudo apt-get install python -y
575570
- run:
576571
name: "Update React to prerelease"
577572
command: "REACT_CHANNEL=<< parameters.version >> node ./scripts/upgrade-react"
@@ -664,12 +659,6 @@ workflows:
664659
requires:
665660
- lint
666661
- bootstrap
667-
- unit_tests_node12:
668-
<<: *ignore_docs
669-
requires:
670-
- lint
671-
- typecheck
672-
- bootstrap
673662
- unit_tests_node14:
674663
<<: *ignore_docs
675664
requires:

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"csstype": "2.6.17"
116116
},
117117
"scripts": {
118-
"bootstrap": "npm-run-all -s check-versions \"lerna-prepare -- --{@}\" --",
118+
"bootstrap": "cross-env COMPILER_OPTIONS=\"GATSBY_MAJOR=4\" npm-run-all -s check-versions \"lerna-prepare -- --{@}\" --",
119119
"check-repo-fields": "node scripts/check-repo-fields.js",
120120
"check-versions": "node scripts/check-versions.js",
121121
"format": "npm run format:code && npm run format:other && npm run format:svg",
@@ -141,7 +141,7 @@
141141
"prettier": "prettier \"**/*.{md,css,scss,yaml,yml}\"",
142142
"publish": "echo \"Use 'yarn publish-next' or 'yarn publish-release' instead of 'yarn run publish'\"",
143143
"publish-canary": "node scripts/check-publish-access && lerna publish --canary --yes",
144-
"publish-next": "node scripts/check-publish-access && node scripts/clear-package-dir prerelease --verbose && lerna publish prerelease --pre-dist-tag=next --preid=next --allow-branch=master --message=\"chore(release): Publish next\"",
144+
"publish-next": "node scripts/check-publish-access && node scripts/clear-package-dir prerelease --verbose && cross-env COMPILER_OPTIONS=\"GATSBY_MAJOR=4\" lerna publish prerelease --pre-dist-tag=next --preid=next --allow-branch=master --message=\"chore(release): Publish next\"",
145145
"publish-preminor": "node scripts/check-publish-access && node scripts/clear-package-dir preminor --verbose && lerna publish preminor --pre-dist-tag=next --preid=next --force-publish --allow-branch=master --message=\"chore(release): Publish next pre-minor\"",
146146
"publish-rc": "node scripts/check-publish-access && node scripts/clear-package-dir prerelease --verbose && lerna publish prerelease --pre-dist-tag=rc --preid=rc --message=\"chore(release): Publish rc\"",
147147
"publish-release": "node scripts/check-publish-access && node scripts/clear-package-dir patch --verbose && lerna publish patch",

0 commit comments

Comments
 (0)
Please sign in to comment.