From df1226576b911be0f962c149c0bcbad279d9f806 Mon Sep 17 00:00:00 2001
From: Lennart <lekoarts@gmail.com>
Date: Mon, 12 Jun 2023 09:33:58 +0200
Subject: [PATCH] chore: Various `yarn bootstrap` fixes (#38223)

initial
---
 package.json                                    | 6 +++---
 packages/gatsby-cli/src/reporter/redux/utils.ts | 2 +-
 packages/gatsby-core-utils/package.json         | 2 +-
 packages/gatsby-sharp/tsconfig.json             | 3 ++-
 packages/gatsby-source-shopify/tsconfig.json    | 1 -
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index f9e491ef6d328..995cc778b70a6 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
   },
   "private": true,
   "scripts": {
-    "bootstrap": "cross-env COMPILER_OPTIONS=\"GATSBY_MAJOR=5\" npm-run-all -s check-versions \"lerna-prepare -- --{@}\" --",
+    "bootstrap": "cross-env COMPILER_OPTIONS=\"GATSBY_MAJOR=5\" npm-run-all -s \"lerna-prepare -- --{@}\" --",
     "check-repo-fields": "node scripts/check-repo-fields.js",
     "check-versions": "node scripts/check-versions.js",
     "format": "npm run format:code && npm run format:other",
@@ -100,13 +100,13 @@
     "jest:inspect": "node --inspect node_modules/.bin/jest --runInBand",
     "jest:inspect-brk": "node --inspect-brk node_modules/.bin/jest --runInBand",
     "lerna": "lerna",
-    "lerna-prepare": "lerna run prepare",
+    "lerna-prepare": "lerna run prepare --ignore gatsby-core-utils",
     "lint": "npm-run-all --continue-on-error -p lint:code lint:other",
     "lint:code": "eslint --ext .js,.jsx,.ts,.tsx --quiet .",
     "lint:other": "npm run prettier -- --check",
     "markdown": "md-magic --path \"starters/**/README.md\"",
     "postmarkdown": "prettier --write \"starters/**/README.md\"",
-    "prebootstrap": "yarn",
+    "prebootstrap": "yarn && npm run check-versions && cross-env COMPILER_OPTIONS=\"GATSBY_MAJOR=5\" lerna run prepare --scope gatsby-core-utils",
     "prettier": "prettier \"**/*.{md,css,scss,yaml,yml}\"",
     "publish": "echo \"Use 'yarn publish-next' or 'yarn publish-release' instead of 'yarn run publish'\"",
     "publish-canary": "node scripts/check-publish-access && lerna publish --canary --yes",
diff --git a/packages/gatsby-cli/src/reporter/redux/utils.ts b/packages/gatsby-cli/src/reporter/redux/utils.ts
index 1ac999adc0f63..79c26583f891a 100644
--- a/packages/gatsby-cli/src/reporter/redux/utils.ts
+++ b/packages/gatsby-cli/src/reporter/redux/utils.ts
@@ -45,7 +45,7 @@ export const getGlobalStatus = (
       return generatedStatus
     },
     ActivityStatuses.Success
-  )
+  ) as ActivityStatuses
 }
 
 export const getActivity = (id: string): IActivity | null =>
diff --git a/packages/gatsby-core-utils/package.json b/packages/gatsby-core-utils/package.json
index d48fd236404ee..36ed861954751 100644
--- a/packages/gatsby-core-utils/package.json
+++ b/packages/gatsby-core-utils/package.json
@@ -48,7 +48,7 @@
     "build:cjs": "babel src --out-dir dist/ --ignore \"**/__tests__\" --ignore \"**/__mocks__\" --extensions \".ts\"",
     "build:mjs": "cross-env BABEL_ENV=modern babel src --out-dir dist/ --ignore \"**/__tests__\" --ignore \"**/__mocks__\" --extensions \".ts\" --out-file-extension .mjs",
     "typegen": "tsc --emitDeclarationOnly --declaration --declarationDir dist/",
-    "prepare": "cross-env NODE_ENV=production npm run build && npm run typegen",
+    "prepare": "cross-env NODE_ENV=production npm-run-all --npm-path npm -s build typegen",
     "watch": "npm-run-all --npm-path npm -p watch:*",
     "watch:cjs": "babel -w src --out-dir dist/ --ignore \"**/__tests__\" --ignore \"**/__mocks__\" --extensions \".ts\"",
     "watch:mjs": "cross-env BABEL_ENV=modern babel -w src --out-dir dist/ --ignore \"**/__tests__\" --ignore \"**/__mocks__\" --extensions \".ts\" --out-file-extension .mjs",
diff --git a/packages/gatsby-sharp/tsconfig.json b/packages/gatsby-sharp/tsconfig.json
index 68027cd6d44d0..293e138b586d5 100644
--- a/packages/gatsby-sharp/tsconfig.json
+++ b/packages/gatsby-sharp/tsconfig.json
@@ -2,7 +2,8 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "target": "ES5",
-    "module": "CommonJS"
+    "module": "CommonJS",
+    "downlevelIteration": true
   },
   "exclude": [
     "src/__tests__",
diff --git a/packages/gatsby-source-shopify/tsconfig.json b/packages/gatsby-source-shopify/tsconfig.json
index cab823f261c46..51c9bbd568de6 100644
--- a/packages/gatsby-source-shopify/tsconfig.json
+++ b/packages/gatsby-source-shopify/tsconfig.json
@@ -2,7 +2,6 @@
   "include": ["src/**/*.ts", "types"],
   "exclude": ["node_modules"],
   "compilerOptions": {
-    "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,