Upgrade to Yarn 3 (#2841)

* [wip] yarn3 upgrade * Upgrade yarn.lock * Fix ssr-benchmarks import * Add back accidentally-removed stuff from package.json * Fix action.yml * Remove jest-snapshot patch * empty commit to test CI caching * Add Yarn 3 patch for jest-snapshot
emotion-js · Aug 2, 2022 · 7b4f016 · 7b4f016
1 parent 16d971d
commit 7b4f016
Show file tree

Hide file tree

Showing 30 changed files with 32,239 additions and 23,456 deletions.
diff --git a/.github/actions/ci-setup/action.yml b/.github/actions/ci-setup/action.yml
@@ -6,22 +6,8 @@ runs:
       uses: actions/setup-node@v3
       with:
         node-version: 16.x
-
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-      shell: bash
-
-    - uses: actions/cache@v3
-      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 --frozen-lockfile
+      run: yarn --immutable
       shell: bash
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,13 @@ package-lock.json
 *.orig
 *.tsbuildinfo
 
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # Website
 site/out
 .next
diff --git a/patches/jest-cli++jest-snapshot+27.4.5.patch → ...jest-snapshot-npm-27.4.5-6ace6bf68e.patch b/patches/jest-cli++jest-snapshot+27.4.5.patch → ...jest-snapshot-npm-27.4.5-6ace6bf68e.patch
@@ -1,7 +1,7 @@
-diff --git a/node_modules/jest-cli/node_modules/jest-snapshot/build/InlineSnapshots.js b/node_modules/jest-cli/node_modules/jest-snapshot/build/InlineSnapshots.js
-index 5f9c3d5..1ec2ce5 100644
---- a/node_modules/jest-cli/node_modules/jest-snapshot/build/InlineSnapshots.js
-+++ b/node_modules/jest-cli/node_modules/jest-snapshot/build/InlineSnapshots.js
+diff --git a/build/InlineSnapshots.js b/build/InlineSnapshots.js
+index 5f9c3d5816c5e944f6810bc42ff67ed649d84a2b..1ec2ce5d6a5a81ccd8cd898fb65be432b04cb514 100644
+--- a/build/InlineSnapshots.js
++++ b/build/InlineSnapshots.js
 @@ -219,7 +219,8 @@ const saveSnapshotsForFile = (snapshots, sourceFilePath, prettier) => {
      filename: sourceFilePath,
      plugins,

diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.2.2.cjs b/.yarn/releases/yarn-3.2.2.cjs
diff --git a/.yarnrc b/.yarnrc
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,9 @@
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
+
+yarnPath: .yarn/releases/yarn-3.2.2.cjs
+
+nodeLinker: node-modules
+
+npmPublishAccess: public
diff --git a/CONTRIBUTING.md b/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/) >= v16 must be installed.
+- We are using Yarn Modern so you need either a global install of Yarn v1 (`npm i -g yarn`) or you need to [enable Corepack](https://yarnpkg.com/getting-started/install).
 
 ## Installation
 

diff --git a/netlify.toml b/netlify.toml
@@ -5,7 +5,7 @@
 [build.environment]
   NODE_VERSION = "16"
   YARN_VERSION = "1.22.19"
-  YARN_FLAGS = "--frozen-lockfile"
+  YARN_FLAGS = "--immutable"
   NETLIFY = "true"
 
 # These take effect in production and should match the redirects in next.config.js

diff --git a/package.json b/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",
@@ -21,17 +21,11 @@
     "flow": "flow",
     "flow:check": "flow check --flowconfig-name=.flowconfig-ci",
     "preinstall": "node ./scripts/ensure-yarn.js",
-    "postinstall": "patch-package && 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",
@@ -234,7 +228,6 @@
     "normalize.css": "^8.0.0",
     "npm-run-all": "^4.0.2",
     "opencollective": "^1.0.3",
-    "patch-package": "^6.4.7",
     "polished": "^1.2.1",
     "prettier": "^2.3.0",
     "raf": "^3.4.0",
@@ -250,5 +243,9 @@
     "through": "^2.3.8",
     "unified": "^6.1.6",
     "webpack-bundle-analyzer": "3.3.2"
+  },
+  "packageManager": "yarn@3.2.2",
+  "resolutions": {
+    "jest-snapshot@27.4.5": "patch:jest-snapshot@npm:27.4.5#.yarn/patches/jest-snapshot-npm-27.4.5-6ace6bf68e.patch"
   }
 }
diff --git a/packages/babel-plugin-jsx-pragmatic/package.json b/packages/babel-plugin-jsx-pragmatic/package.json
@@ -13,9 +13,6 @@
   },
   "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.17.12"
   },

diff --git a/packages/babel-plugin/package.json b/packages/babel-plugin/package.json
@@ -16,9 +16,6 @@
     "lib",
     "dist"
   ],
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.7",
     "@babel/plugin-syntax-jsx": "^7.17.12",

diff --git a/packages/babel-preset-css-prop/package.json b/packages/babel-preset-css-prop/package.json
@@ -13,9 +13,6 @@
   },
   "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.17.12",
     "@babel/runtime": "^7.18.3",

diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -36,9 +36,6 @@
     "@emotion/hash": "*",
     "typescript": "^4.5.5"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "files": [
     "src",
     "dist",

diff --git a/packages/css-prettifier/package.json b/packages/css-prettifier/package.json
@@ -2,9 +2,6 @@
   "name": "@emotion/css-prettifier",
   "version": "1.1.0",
   "description": "Simple Stylis-based CSS prettifier",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "keywords": [
     "emotion"
   ],
@@ -25,7 +22,6 @@
     "@emotion/memoize": "^0.8.0",
     "stylis": "4.0.13"
   },
-  "devDependencies": {},
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
@@ -2,9 +2,6 @@
   "name": "@emotion/eslint-plugin",
   "version": "11.10.0",
   "description": "ESLint rules for emotion",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "keywords": [
     "eslint",
     "eslintplugin",

diff --git a/packages/hash/package.json b/packages/hash/package.json
@@ -7,9 +7,6 @@
   "types": "types/index.d.ts",
   "license": "MIT",
   "repository": "https://github.com/emotion-js/emotion/tree/main/packages/hash",
-  "publishConfig": {
-    "access": "public"
-  },
   "files": [
     "src",
     "dist",

diff --git a/packages/primitives-core/package.json b/packages/primitives-core/package.json
@@ -4,9 +4,6 @@
   "description": "Shared utilities for emotion primitives and native",
   "main": "dist/emotion-primitives-core.cjs.js",
   "module": "dist/emotion-primitives-core.esm.js",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "files": [
     "src",
     "dist"

diff --git a/packages/primitives/package.json b/packages/primitives/package.json
@@ -3,9 +3,6 @@
   "version": "11.10.0",
   "main": "dist/emotion-primitives.cjs.js",
   "module": "dist/emotion-primitives.esm.js",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "files": [
     "src",
     "dist",

diff --git a/packages/unitless/package.json b/packages/unitless/package.json
@@ -6,9 +6,6 @@
   "module": "dist/emotion-unitless.esm.js",
   "license": "MIT",
   "repository": "https://github.com/emotion-js/emotion/tree/main/packages/unitless",
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "publishConfig": {
     "access": "public"
   },

diff --git a/playgrounds/cra/package.json b/playgrounds/cra/package.json
@@ -12,7 +12,6 @@
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
-    "test:typescript": "exit 0",
     "eject": "react-scripts eject"
   },
   "browserslist": {

diff --git a/playgrounds/nextjs/package.json b/playgrounds/nextjs/package.json
@@ -1,11 +1,10 @@
 {
-  "name": "nextjs",
+  "name": "nextjs-playground",
   "version": "0.0.0",
   "private": true,
   "scripts": {
     "dev": "next dev -p 4000",
     "build": "next build",
-    "test:typescript": "exit 0",
     "start": "next start"
   },
   "dependencies": {

diff --git a/scripts/babel-preset-emotion-dev/package.json b/scripts/babel-preset-emotion-dev/package.json
@@ -3,9 +3,6 @@
   "main": "src/index",
   "version": "9.2.6",
   "private": true,
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "^7.17.12",
     "@babel/plugin-transform-flow-strip-types": "^7.17.12"

diff --git a/scripts/babel-tester/package.json b/scripts/babel-tester/package.json
@@ -3,9 +3,6 @@
   "main": "src/index.js",
   "version": "0.4.5",
   "private": true,
-  "scripts": {
-    "test:typescript": "exit 0"
-  },
   "dependencies": {
     "@babel/plugin-syntax-class-properties": "^7.12.13",
     "@babel/plugin-syntax-object-rest-spread": "^7.8.3"

diff --git a/scripts/benchmarks/package.json b/scripts/benchmarks/package.json
@@ -5,8 +5,7 @@
   "scripts": {
     "start": "parcel src/index.html",
     "build": "parcel build src/index.html --public-url .",
-    "run-benchmark": "node run.js",
-    "test:typescript": "exit 0"
+    "run-benchmark": "node run.js"
   },
   "dependencies": {
     "@babel/core": "^7.18.5",

diff --git a/scripts/ssr-benchmarks/bench.js b/scripts/ssr-benchmarks/bench.js
@@ -6,7 +6,7 @@ import { jsx, css, CacheProvider } from '@emotion/react'
 import { createTriangle } from './triangle.js'
 import { css as cssClassName } from '@emotion/css'
 import { renderStylesToString } from '@emotion/server'
-import EmotionServer from '@emotion/server/create-instance/dist/emotion-server-create-instance.cjs.js'
+import EmotionServer from '@emotion/server/create-instance'
 import EmotionCache from '@emotion/cache'
 import { insertStyles } from '@emotion/utils'
 

diff --git a/scripts/ssr-benchmarks/package.json b/scripts/ssr-benchmarks/package.json
@@ -5,8 +5,7 @@
   "type": "module",
   "scripts": {
     "start": "NODE_ENV=production node bench.js",
-    "start-basic": "NODE_ENV=production node basic.js",
-    "test:typescript": "exit 0"
+    "start-basic": "NODE_ENV=production node basic.js"
   },
   "dependencies": {
     "benchmark": "^2.1.4",

diff --git a/scripts/test-utils/package.json b/scripts/test-utils/package.json
@@ -2,8 +2,5 @@
   "name": "test-utils",
   "main": "src/index",
   "version": "0.3.2",
-  "private": true,
-  "scripts": {
-    "test:typescript": "exit 0"
-  }
+  "private": true
 }
diff --git a/site/package.json b/site/package.json
@@ -5,8 +5,7 @@
   "scripts": {
     "build": "next build && next export",
     "dev": "next dev",
-    "start": "next start",
-    "test:typescript": "exit 0"
+    "start": "next start"
   },
   "dependencies": {
     "@babel/standalone": "^7.18.7",