Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: migrate to Yarn Modern #6028

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
715e4cd
Yarn v3
RDIL Nov 29, 2021
b465d64
Merge branch 'main' into RDIL/main
Josh-Cena Nov 30, 2021
dcfdac0
Alright, this is a bit of a fixer upper.
RDIL Dec 1, 2021
52e806a
merge
RDIL Dec 1, 2021
e6cedb5
Fix (an) issue
RDIL Dec 1, 2021
7abc673
I'm going to go nuts
RDIL Dec 1, 2021
9daa205
Oops
RDIL Dec 1, 2021
140fc53
Fix everything
Josh-Cena Dec 1, 2021
2da3498
Merge branch 'main' into RDIL/main
Josh-Cena Dec 1, 2021
9afa8bd
Cleanups
Josh-Cena Dec 1, 2021
00a79fc
Does this work?
Josh-Cena Dec 1, 2021
8365966
Fix peerDep
Josh-Cena Dec 1, 2021
5997e7d
Fix peer deps
Josh-Cena Dec 1, 2021
826418a
Fix lock
Josh-Cena Dec 1, 2021
8475533
Enable inline builds
RDIL Dec 1, 2021
6b6cff4
Other things
RDIL Dec 2, 2021
b9c59c4
Remove yarn.build's `bundle` and `test` commands
RDIL Dec 5, 2021
bebb88f
Revert a few changes
Josh-Cena Dec 5, 2021
390eabb
Merge branch 'main' into RDIL/main
Josh-Cena Dec 5, 2021
560bf61
Set canary Yarn
Josh-Cena Dec 5, 2021
0e288cd
Fix build
Josh-Cena Dec 5, 2021
11a7bef
FIx a few workflows
Josh-Cena Dec 6, 2021
60cb526
No, not needed
Josh-Cena Dec 6, 2021
c124b1d
Fix build?
Josh-Cena Dec 6, 2021
76ed135
Fix again?
Josh-Cena Dec 6, 2021
74409f4
Go back to lerna?
Josh-Cena Dec 6, 2021
9404a33
Fix lock
Josh-Cena Dec 6, 2021
cece96b
Merge branch 'main' into RDIL/main
Josh-Cena Dec 9, 2021
f4cc64c
Update lock
Josh-Cena Dec 9, 2021
eecb47c
Merge branch 'main' into RDIL/main
Josh-Cena Jan 26, 2022
f6a4bf2
oops
Josh-Cena Jan 26, 2022
177d622
Merge branch 'main' into RDIL/main
Josh-Cena Jan 26, 2022
ecc4af6
use latest canary
Josh-Cena Jan 26, 2022
3f08cde
revert CSS changes
Josh-Cena Jan 26, 2022
e89a27a
downgrade
Josh-Cena Jan 26, 2022
a0fb1da
use iv
Josh-Cena Jan 26, 2022
6ff7234
Merge branch 'main' into RDIL/main
Josh-Cena Jan 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
"*.xyz",
"*.docx",
"versioned_docs",
".yarn",
".yarnrc.yml",
"*.min.*"
],
"ignoreRegExpList": ["Email", "Urls", "#[\\w-]*"]
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ jobs:
node-version: '16'
cache: yarn
- name: Installation
run: yarn
# run: yarn install --immutable # Fails if yarn.lock is modified (unfortunately only works for Yarn 2, and --frozen-lockfile is not the same!)
- name: Check immutable yarn.lock
run: git diff --exit-code
run: yarn install --immutable
- name: Lint
run: |
echo "::add-matcher::.github/workflows/cspell-problem-matcher.json"
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@
.changelog

node_modules
.yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

.eslintcache

Expand Down
28 changes: 28 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

779 changes: 779 additions & 0 deletions .yarn/releases/yarn-3.2.0-rc.11.cjs

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
enableInlineBuilds: true

nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: '@yarnpkg/plugin-workspace-tools'

yarnPath: .yarn/releases/yarn-3.2.0-rc.11.cjs
15 changes: 7 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"start:website:deployPreview": "cross-env NETLIFY=true CONTEXT='deploy-preview' yarn workspace website start",
"examples:generate": "node admin/scripts/generateExamples.mjs",
"build": "yarn build:packages && yarn build:website",
"build:packages": "lerna run build --no-private",
"build:packages": "yarn workspaces foreach --topological-dev -i -v --no-private run build",
"build:website": "yarn workspace website build",
"build:website:baseUrl": "yarn workspace website build:baseUrl",
"build:website:blogOnly": "yarn workspace website build:blogOnly",
Expand All @@ -40,7 +40,7 @@
"canary:bumpVersion": "yarn lerna version `yarn --silent canary:version` --exact --no-push --yes",
"canary:publish": "yarn lerna publish from-package --dist-tag canary --yes --no-verify-access",
"changelog": "lerna-changelog",
"postinstall": "yarn lock:update && yarn build:packages",
"postinstall": "yarn build:packages",
"prepare": "husky install",
"format": "prettier --write .",
"format:diff": "prettier --list-different .",
Expand All @@ -49,13 +49,11 @@
"lint:js": "eslint --cache --report-unused-disable-directives \"**/*.{js,jsx,ts,tsx,mjs}\"",
"lint:spelling": "cspell \"**\" --no-progress",
"lint:style": "stylelint \"**/*.css\"",
"lerna": "lerna",
"test": "cross-env TZ=UTC jest",
"test:build:website": "./admin/scripts/test-release.sh",
"watch": "yarn lerna run --parallel watch",
"clear": "(yarn workspace website clear || echo 'Failure while running docusaurus clear') && yarn lerna exec --ignore docusaurus yarn rimraf lib lib-next",
"test:baseUrl": "yarn build:website:baseUrl && yarn serve:website:baseUrl",
"lock:update": "npx yarn-deduplicate"
"watch": "yarn workspaces foreach --parallel run watch",
"clear": "(yarn workspace website clear || echo 'Failure while running docusaurus clear') && yarn workspaces foreach run yarn rimraf lib lib-next",
"test:baseUrl": "yarn build:website:baseUrl && yarn serve:website:baseUrl"
},
"devDependencies": {
"@babel/cli": "^7.16.0",
Expand Down Expand Up @@ -125,5 +123,6 @@
},
"engines": {
"node": ">=14"
}
},
"packageManager": "[email protected]"
}
4 changes: 2 additions & 2 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"write-heading-ids": "docusaurus write-heading-ids",
"start:baseUrl": "cross-env BASE_URL='/build/' yarn start",
"build:baseUrl": "cross-env BASE_URL='/build/' yarn build",
"start:blogOnly": "cross-env yarn start --config=docusaurus.config-blog-only.js",
"build:blogOnly": "cross-env yarn build --config=docusaurus.config-blog-only.js",
"start:blogOnly": "cross-env yarn run start --config=docusaurus.config-blog-only.js",
"build:blogOnly": "cross-env yarn run build --config=docusaurus.config-blog-only.js",
"build:fast": "cross-env BUILD_FAST=true yarn build --locale en",
"netlify:build:production": "yarn docusaurus write-translations && yarn netlify:crowdin:delay && yarn netlify:crowdin:uploadSources && yarn netlify:crowdin:downloadTranslations && yarn build && yarn test:css-order",
"netlify:build:deployPreview": "yarn docusaurus write-translations --locale fr --messagePrefix '(fr) ' && yarn build && yarn test:css-order",
Expand Down
Loading