Upgrade to Yarn 3

.github/workflows/main.yml

@@ -25,23 +25,10 @@ jobs:
         uses: actions/setup-node@main
         with:
           node-version: 12.x
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn --immutable
 
       - name: Run Tests
         run: yarn test:ci --color
@@ -60,23 +47,10 @@ jobs:
         uses: actions/setup-node@main
         with:
           node-version: 12.x
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn --immutable
 
       - name: Check Types
         run: yarn flow:check
@@ -91,23 +65,10 @@ jobs:
         uses: actions/setup-node@main
         with:
           node-version: 12.x
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn --immutable
 
       - name: Run Tests with React 18
         run: yarn test:react18:ci
@@ -122,23 +83,10 @@ jobs:
         uses: actions/setup-node@main
         with:
           node-version: 12.x
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn --immutable
 
       - name: Dist Tests
         run: yarn test:prod
@@ -153,23 +101,10 @@ jobs:
         uses: actions/setup-node@main
         with:
           node-version: 12.x
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn --immutable
 
       - name: ESLint
         run: yarn lint:check
@@ -203,25 +138,10 @@ jobs:
         uses: actions/setup-node@main
         with:
           node-version: 12.x
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+          cache: yarn
 
       - name: Install Dependencies
-        run: yarn
+        run: yarn --immutable
 
-      - name: ESLint
-        run: yarn lint:check
       - name: TypeScript
         run: cd packages/${{ matrix.package }} && yarn test:typescript

.github/workflows/release.yml

@@ -19,15 +19,12 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node.js 12.x
-        uses: actions/setup-node@master
+        uses: actions/setup-node@main
         with:
           node-version: 12.x
 
-      - name: Install Yarn
-        run: npm install --global yarn
-
       - name: Install Dependencies
-        run: yarn --frozen-lockfile
+        run: yarn --immutable
 
       - name: Create Release Pull Request or Publish to npm
         uses: changesets/action@master

.gitignore

@@ -12,4 +12,11 @@ public/
 !playgrounds/cra/public
 .env
 .vscode
-.parcel-cache/
+.parcel-cache/
+
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.yarnrc.yml

@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+npmPublishAccess: public
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 ## Prerequisites
 
-- [Node.js](http://nodejs.org/) >= v7 must be installed.
-- [Yarn](https://yarnpkg.com/en/docs/install)
+- [Node.js](http://nodejs.org/) >= v14 must be installed.
+- [Enable corepack](https://yarnpkg.com/getting-started/install) so that the correct version of Yarn Modern is automatically downloaded
 
 ## Installation
 

netlify.toml

@@ -1,9 +1,9 @@
 [build]
-  command = "npm run build && npm run build:site"
+  command = "yarn build && yarn build:site"
   publish = "site/public"
 
 [build.environment]
-  NODE_VERSION = "10"
-  YARN_VERSION = "1.7.0"
-  YARN_FLAGS = "--frozen-lockfile"
+  NODE_VERSION = "16"
+  YARN_VERSION = "1.22.15"
+  YARN_FLAGS = "--immutable"
   NETLIFY = "true"

package.json

@@ -9,7 +9,7 @@
     "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --watch",
     "test": "jest",
     "test:react18": "jest -c jest-react18.config.js",
-    "test:typescript": "yarn workspaces run test:typescript",
+    "test:typescript": "yarn workspaces foreach --verbose --exclude emotion-monorepo run test:typescript",
     "test:ci": "jest --coverage --no-cache --ci --runInBand",
     "test:react18:ci": "yarn test:react18 --coverage --no-cache --ci --runInBand",
     "test:prod": "yarn build && jest -c jest.dist.js --no-cache --ci --runInBand",
@@ -23,17 +23,11 @@
     "flow": "flow",
     "flow:check": "flow check --flowconfig-name=.flowconfig-ci",
     "preinstall": "node ./scripts/ensure-yarn.js",
-    "postinstall": "opencollective postinstall && preconstruct dev && manypkg check",
+    "postinstall": "preconstruct dev && manypkg check",
     "changeset": "changeset",
     "version-packages": "changeset version",
     "release": "yarn build && changeset publish"
   },
-  "resolutions": {
-    "**/react": "16.14.0",
-    "**/react-dom": "16.14.0",
-    "**/browserslist": "^3.2.8",
-    "**/graphql-type-json": "0.2.4"
-  },
   "author": "Kye Hohenberger",
   "homepage": "https://emotion.sh",
   "license": "MIT",
@@ -125,9 +119,6 @@
       "site",
       "scripts/*",
       "playgrounds/*"
-    ],
-    "nohoist": [
-      "**/dtslint"
     ]
   },
   "preconstruct": {
@@ -263,5 +254,6 @@
     "unist-util-visit": "^1.2.0",
     "webpack-bundle-analyzer": "3.3.2",
     "worker-loader": "2.0.0"
-  }
+  },
+  "packageManager": "yarn@3.2.0"
 }

packages/babel-plugin-jsx-pragmatic/package.json

@@ -6,9 +6,6 @@
   "module": "dist/emotion-babel-plugin-jsx-pragmatic.esm.js",
   "license": "MIT",
   "repository": "https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin-jsx-pragmatic",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "dependencies": {
     "@babel/plugin-syntax-jsx": "^7.12.13"
   },

packages/babel-plugin/package.json

@@ -9,9 +9,6 @@
     "lib",
     "dist"
   ],
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "dependencies": {
     "@babel/helper-module-imports": "^7.12.13",
     "@babel/plugin-syntax-jsx": "^7.12.13",

packages/babel-preset-css-prop/package.json

@@ -6,9 +6,6 @@
   "module": "dist/emotion-babel-preset-css-prop.esm.js",
   "license": "MIT",
   "repository": "https://github.com/emotion-js/emotion/tree/main/packages/babel-preset-css-prop",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "dependencies": {
     "@babel/plugin-transform-react-jsx": "^7.12.17",
     "@babel/runtime": "^7.13.10",

packages/css-prettifier/package.json

@@ -2,9 +2,6 @@
   "name": "@emotion/css-prettifier",
   "version": "1.0.1",
   "description": "Simple Stylis-based CSS prettifier",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "keywords": [
     "emotion"
   ],
@@ -18,7 +15,6 @@
     "@emotion/memoize": "^0.7.4",
     "stylis": "4.0.13"
   },
-  "devDependencies": {},
   "publishConfig": {
     "access": "public"
   },

packages/eslint-plugin/package.json

@@ -2,9 +2,6 @@
   "name": "@emotion/eslint-plugin",
   "version": "11.7.0",
   "description": "ESLint rules for emotion",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "keywords": [
     "eslint",
     "eslintplugin",

packages/jest/package.json

@@ -41,8 +41,6 @@
     "@types/jest": "^27.0.3",
     "dtslint": "^4.2.1",
     "enzyme-to-json": "^3.6.1",
-    "preact": "^8.2.9",
-    "preact-render-to-json": "^3.6.6",
     "pretty-format": "^22.4.3",
     "react": "16.14.0",
     "react-dom": "16.14.0",