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

[code infra] migrate to pnpm #2546

Merged
merged 143 commits into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
143 commits
Select commit Hold shift + click to select a range
59b99bc
Try pnpm
Janpot Feb 22, 2023
db76d7f
this
Janpot Feb 22, 2023
f1f3a89
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Aug 25, 2023
21d93a2
WIP
Janpot Aug 25, 2023
09ab7f9
go
Janpot Aug 25, 2023
b689cc4
WIP
Janpot Aug 25, 2023
26a2686
WIP
Janpot Aug 25, 2023
4cecdfd
Delete yarn-1.22.19.cjs
Janpot Aug 25, 2023
d344dee
keeping it
Janpot Aug 25, 2023
768b2e9
update curcleci
Janpot Aug 25, 2023
808851f
Update config.yml
Janpot Aug 25, 2023
c2c20bb
Update config.yml
Janpot Aug 25, 2023
706b23a
Update config.yml
Janpot Aug 25, 2023
69a667c
Update config.yml
Janpot Aug 25, 2023
52d4983
Update config.yml
Janpot Aug 25, 2023
474c983
Update config.yml
Janpot Aug 25, 2023
0b00746
Update .npmrc
Janpot Aug 25, 2023
7af3672
dedupe
Janpot Aug 25, 2023
3f75037
Update pnpm-lock.yaml
Janpot Aug 25, 2023
670b769
Update netlify.toml
Janpot Aug 25, 2023
4727f75
Working on docs:build
Janpot Aug 25, 2023
6f99762
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Aug 26, 2023
d545c98
Update pnpm-lock.yaml
Janpot Aug 26, 2023
e9f78f4
docs
Janpot Aug 26, 2023
c4ebaef
Update package.json
Janpot Aug 26, 2023
32af3dd
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 7, 2023
d8ba75f
Update pnpm-lock.yaml
Janpot Sep 7, 2023
bbba8e2
Update ci.json
Janpot Sep 7, 2023
e773832
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 8, 2023
8e8c478
Update ci.json
Janpot Sep 8, 2023
f4a705d
install
Janpot Sep 8, 2023
d66989c
dewr
Janpot Sep 8, 2023
e6d6975
gdhg
Janpot Sep 8, 2023
f705706
jhtjtu
Janpot Sep 8, 2023
3234b6d
fregergt
Janpot Sep 8, 2023
c326352
Update package.json
Janpot Sep 8, 2023
373b766
Update pnpm-lock.yaml
Janpot Sep 8, 2023
65b5513
retre
Janpot Sep 8, 2023
32f7663
gertyrty
Janpot Sep 8, 2023
1019645
fewrfw
Janpot Sep 8, 2023
6b8c725
Update .eslintignore
Janpot Sep 8, 2023
1a68d4a
fix types
Janpot Sep 8, 2023
ddf5e29
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 8, 2023
5184a38
Update pnpm-lock.yaml
Janpot Sep 8, 2023
f7a7696
Update pnpm-lock.yaml
Janpot Sep 8, 2023
11d300e
tui
Janpot Sep 8, 2023
b844187
Update pnpm-lock.yaml
Janpot Sep 8, 2023
ed8bc1e
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 14, 2023
b5939b7
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 14, 2023
73cc9b8
lock
Janpot Sep 14, 2023
bdf1aab
dewf
Janpot Sep 14, 2023
34079c1
Update package.json
Janpot Sep 14, 2023
a373b54
Update pnpm-lock.yaml
Janpot Sep 14, 2023
c58ef3d
ferf
Janpot Sep 14, 2023
a8bd68e
Update pnpm-lock.yaml
Janpot Sep 14, 2023
8e476d7
Update index.spec.ts
Janpot Sep 15, 2023
358295e
Update pnpm-lock.yaml
Janpot Sep 15, 2023
b451899
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 15, 2023
8252154
Update pnpm-lock.yaml
Janpot Sep 15, 2023
1e1ff6f
Update .eslintignore
Janpot Sep 15, 2023
6a4bc05
ewrw
Janpot Sep 15, 2023
c71d9e1
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 15, 2023
79a4ad8
Update pnpm-lock.yaml
Janpot Sep 15, 2023
b9b2dd7
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 20, 2023
a01debe
dedupe
Janpot Sep 20, 2023
5d40a8c
lock
Janpot Sep 20, 2023
fa167a3
Update config.yml
Janpot Sep 20, 2023
b87a3a6
Update localTest.ts
Janpot Sep 20, 2023
c5ba573
Update next.config.mjs
Janpot Sep 20, 2023
943d684
dewf
Janpot Sep 20, 2023
bd4a424
toolpad-tests
Janpot Sep 20, 2023
175376c
dffrwef
Janpot Sep 20, 2023
cbe6f69
dwefr
Janpot Sep 22, 2023
9aa312b
Update pnpm-lock.yaml
Janpot Sep 22, 2023
0c65e65
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 22, 2023
15ed015
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Sep 26, 2023
8695c4a
hrhy
Janpot Sep 26, 2023
43b2976
gret
Janpot Sep 26, 2023
ee50088
Update pnpm-lock.yaml
Janpot Sep 26, 2023
7cf9bc3
Update tsconfig.json
Janpot Sep 26, 2023
8cf2f01
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Oct 10, 2023
5d1c7a1
Update pnpm-lock.yaml
Janpot Oct 10, 2023
8bd1d17
dedupe
Janpot Oct 10, 2023
1e7954a
fgert
Janpot Oct 10, 2023
d097439
Update test.ts
Janpot Oct 10, 2023
428ef26
dewr
Janpot Oct 10, 2023
74856fb
rfwte
Janpot Oct 10, 2023
c103fd5
dew
Janpot Oct 10, 2023
8b19e3d
fwefwe
Janpot Oct 10, 2023
a64c32c
Update package.json
Janpot Oct 10, 2023
b1dfe1d
Update package.json
Janpot Oct 10, 2023
e274775
Update package.json
Janpot Oct 10, 2023
8355b14
fix
Janpot Oct 10, 2023
3af2c68
Update toolpadAppBuilder.ts
Janpot Oct 10, 2023
e025d2a
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Oct 11, 2023
36fe06c
dqe
Janpot Oct 11, 2023
ee41cae
Update pnpm-lock.yaml
Janpot Oct 11, 2023
dff9c56
dewr
Janpot Oct 11, 2023
9aae8a0
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Oct 12, 2023
6513baa
Update pnpm-lock.yaml
Janpot Oct 12, 2023
6df7559
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Oct 12, 2023
31b2d5e
Update pnpm-lock.yaml
Janpot Oct 12, 2023
99607ef
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Oct 13, 2023
cd664d1
Update pnpm-lock.yaml
Janpot Oct 13, 2023
e850d6e
Update package.json
Janpot Oct 13, 2023
8ef7a96
fdsgfsd
Janpot Oct 13, 2023
6b55dd1
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Dec 15, 2023
bd85258
lock
Janpot Dec 15, 2023
f7ee2fb
dewfwe
Janpot Dec 15, 2023
1a21e0b
dwef
Janpot Dec 15, 2023
6443f09
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Dec 15, 2023
60f8167
Update examples.ts
Janpot Dec 15, 2023
0601565
ksmn
Janpot Dec 16, 2023
958fd2a
fix build
Janpot Dec 19, 2023
afed130
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Dec 19, 2023
eb3d1c2
Update pnpm-lock.yaml
Janpot Dec 19, 2023
0201f8f
Update pnpm-lock.yaml
Janpot Dec 19, 2023
747e9e6
fdg
Janpot Dec 19, 2023
9a576a1
Update config.yml
Janpot Dec 19, 2023
2192acf
Update pnpm-lock.yaml
Janpot Dec 19, 2023
81a26c8
eslint
Janpot Dec 19, 2023
8fc3280
test
Janpot Dec 19, 2023
a1b3b2f
ewre
Janpot Dec 19, 2023
26db2f0
Update toolpadAppBuilder.ts
Janpot Dec 19, 2023
31c1cc3
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Dec 19, 2023
ef02e6b
Update pnpm-lock.yaml
Janpot Dec 19, 2023
fe2d5a3
revert
Janpot Dec 19, 2023
e39c682
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Dec 20, 2023
61636f5
v
Janpot Dec 20, 2023
c73a642
Update config.yml
Janpot Dec 20, 2023
0b7cde2
Update config.yml
Janpot Dec 20, 2023
f4b0b68
fds
Janpot Dec 20, 2023
de37390
Update pnpm-lock.yaml
Janpot Dec 20, 2023
1901609
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Dec 20, 2023
b1b42cf
Update pnpm-lock.yaml
Janpot Dec 20, 2023
5f748eb
Update config.yml
Janpot Dec 20, 2023
bc5663f
Merge branch 'master' into pnpm-try
Janpot Jan 4, 2024
25e8efc
Update pnpm-lock.yaml
Janpot Jan 4, 2024
4cd61c2
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Jan 4, 2024
99f6cb8
Update pnpm-lock.yaml
Janpot Jan 4, 2024
1652661
Merge remote-tracking branch 'upstream/master' into pnpm-try
Janpot Jan 4, 2024
7e6e29f
Update pnpm-lock.yaml
Janpot Jan 4, 2024
6d806c4
Update toolpadAppBuilder.ts
Janpot Jan 4, 2024
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
88 changes: 45 additions & 43 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,55 +23,51 @@ commands:
description: 'Set to true if you intend to use any browser (e.g. with playwright).'

steps:
- run:
name: View install environment
command: |
node --version
yarn --version
- restore_cache:
name: Restore yarn cache
name: Restore pnpm Package Cache
keys:
- v11-yarn-{{ checksum "yarn.lock" }}
- run:
name: Set yarn cache folder
command: |
# Keep path in sync with `save_cache` for key "v8-yarn-"
yarn config set cache-folder /tmp/yarn-cache
# Debug information
yarn cache dir
yarn cache list
- pnpm-packages-{{ checksum "pnpm-lock.yaml" }}

- when:
condition: << parameters.browsers >>
steps:
- run:
name: Install pnpm package manager
command: |
corepack enable
corepack prepare pnpm@latest-8 --activate
- run:
name: Prepare playwright hash
command: yarn --json list --pattern playwright > /tmp/playwright_info.json
command: pnpm list --json --filter playwright > /tmp/playwright_info.json
- store_artifacts:
name: Debug playwright hash
path: /tmp/playwright_info.json
- restore_cache:
name: Restore playwright cache
keys:
- v5-playwright-{{ arch }}-{{ checksum "/tmp/playwright_info.json" }}
- run:
name: View install environment
command: |
node --version
pnpm --version
- run:
name: Install js dependencies
command: yarn install
command: pnpm install
- when:
condition: << parameters.browsers >>
steps:
- run:
name: Install playwright browsers
command: yarn playwright install --with-deps
command: pnpm playwright install --with-deps
environment:
PLAYWRIGHT_BROWSERS_PATH: /tmp/pw-browsers

- save_cache:
name: Save yarn cache
key: v11-yarn-{{ checksum "yarn.lock" }}
name: Save pnpm Package Cache
key: pnpm-packages-{{ checksum "pnpm-lock.yaml" }}
paths:
# Keep path in sync with "Set yarn cache folder"
# Can't use environment variables for `save_cache` paths (tested in https://app.circleci.com/pipelines/github/mui/material-ui/37813/workflows/5b1e207f-ac8b-44e7-9ba4-d0f9a01f5c55/jobs/223370)
- /tmp/yarn-cache
- node_modules
- when:
condition: << parameters.browsers >>
steps:
Expand All @@ -94,7 +90,13 @@ jobs:
command: git add -A && git diff --exit-code --staged
- run:
name: Check for duplicated packages
command: yarn deduplicate
command: |
if [[ $(git diff --name-status master | grep pnpm.lock) == "" ]];
then
echo "no changes to dependencies detected, skipping..."
else
pnpm dedupe --check
fi

test_lint:
<<: *defaults
Expand All @@ -103,41 +105,41 @@ jobs:
- install_js
- run:
name: Eslint
command: yarn eslint
command: pnpm eslint
- run:
name: Lint JSON
command: yarn jsonlint
command: pnpm jsonlint
- run:
name: Lint Markdown
command: yarn markdownlint
command: pnpm markdownlint
test_types:
<<: *defaults
steps:
- checkout
- install_js
- run:
name: Check Typescript types
command: yarn check-types
command: pnpm check-types
test_static:
<<: *defaults
steps:
- checkout
- install_js
- run:
name: '`yarn prettier:all` changes committed?'
name: '`pnpm prettier:all` changes committed?'
command: |
yarn prettier:all
yarn check-changes
pnpm prettier:all
pnpm check-changes
- run:
name: '`yarn jsonSchemas` changes committed?'
name: '`pnpm jsonSchemas` changes committed?'
command: |
yarn jsonSchemas
yarn check-changes
pnpm jsonSchemas
pnpm check-changes
- run:
name: '`yarn docs:build:api` changes committed?'
name: '`pnpm docs:build:api` changes committed?'
command: |
yarn docs:build:api
yarn check-changes
pnpm docs:build:api
pnpm check-changes

test_unit:
<<: *defaults
Expand All @@ -148,10 +150,10 @@ jobs:
browsers: false
- run:
name: 'Build packages'
command: yarn release:build
command: pnpm release:build
- run:
name: Tests fake browser
command: yarn test
command: pnpm test

test_integration:
<<: *defaults
Expand All @@ -166,18 +168,18 @@ jobs:
steps:
- checkout
- install_js:
browsers: false
browsers: true
- run:
name: 'Build packages'
command: yarn release:build
command: pnpm release:build
- run:
name: Tests real browser
command: yarn test:integration
command: pnpm test:integration
- store_test_results:
path: test/test-results/junit.xml
- run:
name: Upload screenshots to Argos CI
command: ARGOS_PARALLEL_TOTAL=${CIRCLE_NODE_TOTAL} yarn test:argos
command: ARGOS_PARALLEL_TOTAL=${CIRCLE_NODE_TOTAL} pnpm test:argos
- store_artifacts:
path: test/test-results
destination: playwright-test-results
Expand Down
1 change: 1 addition & 0 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"installCommand": "install:codesandbox",
"buildCommand": "release:build",
"node": "18",
"packages": [
Expand Down
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.next
.yarn
pnpm-lock.yaml
/docs/export
/docs/schemas
/packages/**/dist
Expand Down
12 changes: 12 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ module.exports = {
webpack: {
config: path.join(__dirname, './eslintWebpackResolverConfig.js'),
},
exports: {},
},
},
extends: [
Expand Down Expand Up @@ -73,6 +74,13 @@ module.exports = {
skipShapeProps: true,
},
],
'import/no-unresolved': [
'error',
{
// https://github.com/import-js/eslint-plugin-import/issues/1739
ignore: ['\\.md\\?@mui/markdown$'],
},
],
'import/no-restricted-paths': [
'error',
{
Expand All @@ -95,8 +103,12 @@ module.exports = {
{
files: ['examples/**/*'],
rules: {
// We use it for demonstration purposes
'no-console': 'off',
// Personal preference
'no-underscore-dangle': 'off',
// no node_modules in examples as they are not installed
'import/no-unresolved': 'off',
},
},
{
Expand Down
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Enforce yarn

engine-strict = true
auto-install-peers = true
strict-peer-dependencies=false
Loading
Loading