Upgrade Framework to Yarn v3

.github/workflows/build-eslint-jest.yaml

@@ -21,14 +21,28 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      # - name: Cache "node_modules"
-      #   uses: actions/cache@v2
-      #   with:
-      #     path: '**/node_modules'
-      #     key: node_modules_${{ runner.os }}_${{ hashFiles('**/yarn.lock') }}
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+
+      - name: Cache yarn
+        uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: yarn-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            yarn-
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
+
+      - name: 'Check Yarn constraints (fix w/ "yarn constraints --fix")'
+        run: yarn constraints
+
+      - name: 'Check for duplicate dependencies (fix w/ "yarn dedupe")'
+        if: steps.yarn-cache.outputs.cache-hit != 'true'
+        run: yarn dedupe --check
 
       - name: Build
         run: yarn build

.github/workflows/create-pr-artifact.yaml

@@ -21,7 +21,7 @@ jobs:
           node-version: 14
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
 
       - name: Build
         run: yarn build

.github/workflows/e2e.yaml

@@ -23,14 +23,21 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Cache "node_modules"
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+
+      - name: Cache yarn
         uses: actions/cache@v2
+        id: yarn-cache
         with:
-          path: '**/node_modules'
-          key: node_modules_${{ runner.os }}_${{ hashFiles('**/yarn.lock') }}
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: yarn-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            yarn-
 
-      - name: Install framework modules
-        run: yarn install --frozen-lockfile
+      - name: Install dependencies
+        run: yarn install --immutable
 
       - name: Create a temporary directory
         id: createpath

.github/workflows/publish-npm-canary.yaml

@@ -23,7 +23,7 @@ jobs:
           node --version
           yarn --version
       - name: Install dependencies
-        run: yarn install --frozen-lockfile --check-files
+        run: yarn install --immutable
 
       - name: Build
         run: yarn build

.github/workflows/publish-npm-rc.yaml

@@ -21,7 +21,7 @@ jobs:
           node-version: '14'
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile --check-files
+        run: yarn install --immutable --check-files
 
       - name: Build
         run: yarn build

.gitignore

@@ -11,3 +11,11 @@ tasks/e2e/cypress/fixtures/example.json
 tmp/
 .vscode/*
 blog-test-project/*
+.yarn/*
+**/.yarn/install-state.gz
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*

.yarnrc.yml

@@ -0,0 +1,19 @@
+compressionLevel: 0
+
+enableGlobalCache: true
+
+nmMode: hardlinks-local
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+    spec: "@yarnpkg/plugin-typescript"
+  - path: .yarn/plugins/@yarnpkg/plugin-constraints.cjs
+    spec: "@yarnpkg/plugin-constraints"
+
+preferInteractive: true
+
+yarnPath: .yarn/releases/yarn-3.0.2.cjs

babel.config.js

@@ -51,8 +51,10 @@ module.exports = {
      * https://github.com/tc39/proposal-decorators
      **/
     ['@babel/plugin-proposal-decorators', { legacy: true }],
+    // The "loose" option must be the same for all three of these plugins.
     ['@babel/plugin-proposal-class-properties', { loose: true }],
     ['@babel/plugin-proposal-private-methods', { loose: true }],
+    ['@babel/plugin-proposal-private-property-in-object', { loose: true }],
   ],
   overrides: [
     // ** WEB PACKAGES **

constraints.pro

@@ -0,0 +1,14 @@
+% Yarn Constraints https://yarnpkg.com/features/constraints
+% check with "yarn constraints" (fix w/ "yarn constraints --fix")
+% reference for other constraints: https://github.com/babel/babel/blob/main/constraints.pro
+
+% Enforces that a dependency doesn't appear in both `dependencies` and `devDependencies`
+gen_enforced_dependency(WorkspaceCwd, DependencyIdent, null, 'devDependencies') :-
+  workspace_has_dependency(WorkspaceCwd, DependencyIdent, _, 'devDependencies'),
+  workspace_has_dependency(WorkspaceCwd, DependencyIdent, _, 'dependencies').
+
+% Prevent two workspaces from depending on conflicting versions of a same dependency
+gen_enforced_dependency(WorkspaceCwd, DependencyIdent, DependencyRange2, DependencyType) :-
+  workspace_has_dependency(WorkspaceCwd, DependencyIdent, DependencyRange, DependencyType),
+  workspace_has_dependency(OtherWorkspaceCwd, DependencyIdent, DependencyRange2, DependencyType2),
+  DependencyRange \= DependencyRange2.

package.json

@@ -7,7 +7,13 @@
     "packages/*"
   ],
   "devDependencies": {
+    "@babel/cli": "7.15.4",
+    "@babel/node": "7.15.4",
+    "eslint": "7.32.0",
+    "jest": "27.2.0",
     "npm-packlist": "3.0.0",
+    "rimraf": "3.0.2",
+    "typescript": "4.4.3",
     "typescript-transform-paths": "3.3.1"
   },
   "resolutions": {
@@ -22,7 +28,7 @@
     "vscode-languageserver-textdocument": "1.0.1"
   },
   "scripts": {
-    "framework": "yarn --cwd ./tasks/framework-tools",
+    "framework": "yarn ./tasks/framework-tools",
     "build": "yarn framework build",
     "build:js": "yarn framework build:js",
     "build:types": "yarn framework build:types",
@@ -35,5 +41,6 @@
     "postinstall": "yarn framework install",
     "build:link": "node ./tasks/build-and-copy",
     "build:test-project": "node ./tasks/test-project/test-project"
-  }
+  },
+  "packageManager": "[email protected]"
 }

packages/api-server/package.json

@@ -13,6 +13,7 @@
   "main": "dist/handler",
   "license": "MIT",
   "dependencies": {
+    "@babel/plugin-transform-runtime": "7.15.0",
     "ansi-colors": "4.1.1",
     "body-parser": "1.19.0",
     "chokidar": "3.5.2",
@@ -28,16 +29,19 @@
     "youch-terminal": "1.1.1"
   },
   "devDependencies": {
+    "@babel/cli": "7.15.4",
     "@types/aws-lambda": "8.10.83",
     "@types/express": "4.17.13",
     "@types/lodash.escape": "4.0.6",
     "@types/morgan": "1.9.3",
     "@types/qs": "6.9.7",
-    "@types/stack-trace": "0.0.29"
+    "@types/stack-trace": "0.0.29",
+    "jest": "27.2.0",
+    "typescript": "4.4.3"
   },
   "scripts": {
     "build": "yarn build:js",
-    "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build",
+    "prepublishOnly": "NODE_ENV=production yarn build",
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\"",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build && yarn fix:permissions\"",
     "fix:permissions": "chmod +x dist/index.js; chmod +x dist/watch.js"

packages/api/package.json

@@ -22,13 +22,16 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
+    "@babel/cli": "7.15.4",
     "@redwoodjs/auth": "0.37.2",
     "@types/crypto-js": "4.0.2",
     "@types/jsonwebtoken": "8.5.5",
     "@types/lodash.merge": "4.6.6",
     "@types/lodash.omitby": "4.6.6",
     "@types/md5": "2.3.1",
-    "split2": "3.2.2"
+    "jest": "27.2.0",
+    "split2": "3.2.2",
+    "typescript": "4.4.3"
   },
   "jest": {
     "testPathIgnorePatterns": [
@@ -37,7 +40,7 @@
   },
   "scripts": {
     "build": "yarn build:js && yarn build:types",
-    "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build",
+    "prepublishOnly": "NODE_ENV=production yarn build",
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\"",
     "build:types": "tsc --build --verbose",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"",

packages/auth/ambient.d.ts

@@ -0,0 +1,17 @@
+/* eslint-disable no-var */
+import type { AuthContextInterface } from './src/index'
+
+declare global {
+  // For some reason, in this package, we need to declare it here too
+  var __REDWOOD__USE_AUTH: () => AuthContextInterface
+  var __REDWOOD__API_PROXY_PATH: string
+
+  namespace NodeJS {
+    interface Global {
+      __REDWOOD__USE_AUTH: () => AuthContextInterface
+      __REDWOOD__API_PROXY_PATH: string
+    }
+  }
+}
+
+export {}

packages/auth/package.json

@@ -9,6 +9,7 @@
   "license": "MIT",
   "devDependencies": {
     "@auth0/auth0-spa-js": "1.18.0",
+    "@babel/cli": "7.15.4",
     "@clerk/clerk-js": "1.33.0",
     "@clerk/clerk-sdk-node": "0.5.2",
     "@clerk/types": "1.13.0",
@@ -18,15 +19,17 @@
     "firebase": "9.0.1",
     "firebase-admin": "9.11.1",
     "gotrue-js": "0.9.29",
+    "jest": "27.2.0",
     "magic-sdk": "6.0.5",
     "msal": "1.4.12",
     "netlify-identity-widget": "1.9.2",
     "nhost-js-sdk": "3.1.0",
-    "react": "17.0.2"
+    "react": "17.0.2",
+    "typescript": "4.4.3"
   },
   "scripts": {
     "build": "yarn build:js && yarn build:types",
-    "prepublishOnly": "yarn cross-env NODE_ENV=production yarn build",
+    "prepublishOnly": "NODE_ENV=production yarn build",
     "build:js": "babel src -d dist --extensions \".js,.ts,.tsx\"",
     "build:types": "tsc --build --verbose",
     "build:watch": "nodemon --watch src --ext \"js,ts,tsx\" --ignore dist --exec \"yarn build\"",

packages/auth/src/useAuth.ts

@@ -7,14 +7,4 @@ export const useAuth = (): AuthContextInterface => {
   return React.useContext(AuthContext) as AuthContextInterface
 }
 
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace NodeJS {
-    interface Global {
-      __REDWOOD__USE_AUTH: () => AuthContextInterface
-      __REDWOOD__API_PROXY_PATH: string
-    }
-  }
-}
-
 global.__REDWOOD__USE_AUTH = useAuth

packages/auth/tsconfig.json

@@ -9,5 +9,5 @@
       "src/*": ["./src/*"]
     }
   },
-  "include": ["src"],
+  "include": ["src", "ambient.d.ts"]
 }

packages/cli/package.json

@@ -5,10 +5,10 @@
   "license": "MIT",
   "bin": {
     "redwood": "./dist/index.js",
-    "rw": "./dist/index.js",
     "redwood-tools": "./dist/redwood-tools.js",
-    "rwt": "./dist/redwood-tools.js",
-    "rwfw": "./dist/rwfw.js"
+    "rw": "./dist/index.js",
+    "rwfw": "./dist/rwfw.js",
+    "rwt": "./dist/redwood-tools.js"
   },
   "files": [
     "dist"
@@ -48,8 +48,11 @@
     "yargs": "16.2.0"
   },
   "devDependencies": {
+    "@babel/cli": "7.15.4",
     "@types/listr": "0.14.4",
-    "@types/node-fetch": "2.5.12"
+    "@types/node-fetch": "2.5.12",
+    "jest": "27.2.0",
+    "typescript": "4.4.3"
   },
   "scripts": {
     "dev": "RWJS_CWD=../../__fixtures__/example-todo-main node dist/index.js",

packages/codemods/package.json

@@ -8,11 +8,13 @@
     "dist"
   ],
   "dependencies": {
+    "@babel/cli": "7.15.4",
     "core-js": "3.17.3",
     "deepmerge": "4.2.2",
     "execa": "5.1.1",
     "fast-glob": "3.2.7",
     "findup-sync": "4.0.0",
+    "jest": "27.2.0",
     "jscodeshift": "0.13.0",
     "node-fetch": "2.6.1",
     "tasuku": "1.0.2",
@@ -25,7 +27,7 @@
     "prepublishOnly": "yarn build",
     "build:js": "babel src -d dist --extensions \".js,.ts\" --ignore \"src/**/__tests__/**\" --ignore \"src/**/__testfixtures__/**\"",
     "build:watch": "nodemon --watch src --ignore dist --exec \"yarn build\"",
-    "test": "cross-env NODE_ENV=test jest",
+    "test": "NODE_ENV=test jest",
     "test:watch": "yarn test --watch"
   },
   "devDependencies": {

packages/codemods/src/lib/runTransform.ts

@@ -25,7 +25,7 @@ const getExecaArgs = () => {
      */
     const jscodeshiftExecutable = path.resolve(
       __dirname,
-      '../../node_modules/.bin/jscodeshift'
+      '../../../../node_modules/.bin/jscodeshift'
     )
 
     return {

packages/core/package.json

@@ -34,7 +34,6 @@
     "babel-timing": "0.9.1",
     "copy-webpack-plugin": "9.0.1",
     "core-js": "3.17.3",
-    "cross-env": "7.0.3",
     "css-loader": "6.2.0",
     "css-minimizer-webpack-plugin": "3.0.2",
     "dotenv-webpack": "7.0.3",
@@ -65,7 +64,8 @@
   "devDependencies": {
     "@types/babel-core": "6.25.7",
     "@types/babel-plugin-tester": "9.0.4",
-    "babel-plugin-tester": "10.1.0"
+    "babel-plugin-tester": "10.1.0",
+    "jest": "27.2.0"
   },
   "gitHead": "8be6a35c2dfd5aaeb12d55be4f0c77eefceb7762",
   "scripts": {