Skip to content

Commit

Permalink
Yarn 4 (adobe#6215)
Browse files Browse the repository at this point in the history
  • Loading branch information
snowystinger authored Jul 24, 2024
1 parent f0aa6aa commit 976604a
Show file tree
Hide file tree
Showing 136 changed files with 44,538 additions and 24,322 deletions.
59 changes: 28 additions & 31 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ jobs:
executor: rsp-large
steps:
- checkout
- restore_cache:
keys:
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-

- run:
name: Write npmrc
Expand All @@ -69,12 +64,7 @@ jobs:
- run:
name: build
command: |
yarn --pure-lockfile --cache-folder ~/.cache/yarn
- save_cache:
paths:
- ~/.cache/yarn
key: rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
yarn --immutable
- save_cache:
paths:
Expand All @@ -85,16 +75,18 @@ jobs:
executor: rsp-large
steps:
- checkout
- restore_cache:
keys:
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-

- run:
name: Write npmrc
command: |
if [ $NPM_PASSWORD ]; then
cp .circleci/.npmrc .npmrc
fi
- run:
name: build
command: |
yarn install --pure-lockfile --cache-folder ~/.cache/yarn && yarn install-16 --cache-folder ~/.cache/yarn
yarn install --immutable && yarn install-16
- save_cache:
paths:
Expand All @@ -105,16 +97,18 @@ jobs:
executor: rsp-large
steps:
- checkout
- restore_cache:
keys:
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-

- run:
name: Write npmrc
command: |
if [ $NPM_PASSWORD ]; then
cp .circleci/.npmrc .npmrc
fi
- run:
name: build
command: |
yarn install --pure-lockfile --cache-folder ~/.cache/yarn && yarn install-17 --cache-folder ~/.cache/yarn
yarn install --immutable && yarn install-17
- save_cache:
paths:
Expand All @@ -125,16 +119,18 @@ jobs:
executor: rsp-large
steps:
- checkout
- restore_cache:
keys:
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-{{ .Branch }}-
- rsp-yarn-{{ .Environment.CACHE_VERSION }}-

- run:
name: Write npmrc
command: |
if [ $NPM_PASSWORD ]; then
cp .circleci/.npmrc .npmrc
fi
- run:
name: build
command: |
yarn install --pure-lockfile --cache-folder ~/.cache/yarn && yarn install-19 --cache-folder ~/.cache/yarn
yarn install --immutable && yarn install-19
- save_cache:
paths:
Expand Down Expand Up @@ -292,7 +288,7 @@ jobs:
name: test
command: |
make build
yarn lerna run prepublishOnly
yarn workspaces foreach --all -pt run prepublishOnly
node --loader ./scripts/esm-support/loader.mjs ./scripts/esm-support/testESM.mjs
lint:
Expand Down Expand Up @@ -350,7 +346,7 @@ jobs:
command: |
yarn test:parcel
mkdir -p dist
yarn --silent compare:apis --isCI --branch-api-dir="/tmp/dist/branch-api" --base-api-dir="/tmp/dist/base-api" | tee dist/ts-diff.txt
yarn compare:apis --isCI --branch-api-dir="/tmp/dist/branch-api" --base-api-dir="/tmp/dist/base-api" | tee dist/ts-diff.txt
- persist_to_workspace:
root: dist
Expand Down Expand Up @@ -479,6 +475,7 @@ jobs:
steps:
- attach_workspace:
at: /tmp/dist

- run:
name: deploy
command: |
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ build-storybook.log
coverage
dist
junit.xml
.yarn/install-state.gz
node_modules
npm-debug.log
public
storybook-static
test-reports.xml
storage
packages/dev/storybook-builder-parcel/iframe.html
packages/dev/storybook-builder-parcel/preview.js
894 changes: 894 additions & 0 deletions .yarn/releases/yarn-4.2.2.cjs

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
nodeLinker: node-modules

packageExtensions:
"@parcel/node-resolver-core@*":
peerDependencies:
"@parcel/core": ^2.12.0

unsafeHttpWhitelist:
- localhost

yarnPath: .yarn/releases/yarn-4.2.2.cjs
1 change: 0 additions & 1 deletion .yvmrc

This file was deleted.

11 changes: 8 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ run_chromatic:
clean:
yarn clean:icons
rm -rf dist public src/dist
rm -rf storage

clean_all:
$(MAKE) clean
Expand All @@ -26,10 +27,14 @@ clean_node_modules:
rm -rf node_modules
rm -rf packages/*/*/node_modules
rm -rf examples/*/node_modules
rm -rf starters/*/node_modules

clean_dist:
rm -rf packages/*/*/dist
rm -rf packages/{react-aria,react-aria-components,react-stately}/dist
rm -rf packages/{react-aria,react-aria-components,react-stately}/i18n
rm -rf packages/@adobe/react-spectrum/i18n
rm -rf packages/@react-aria/i18n/server

clean_parcel:
rm -rf .parcel-cache
Expand Down Expand Up @@ -96,7 +101,7 @@ publish-nightly: build

build:
parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/react-aria-components --no-optimize --config .parcelrc-build
yarn lerna run prepublishOnly
yarn workspaces foreach --all -pt run prepublishOnly
for pkg in packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/@adobe/react-spectrum/ packages/react-aria/ packages/react-stately/ packages/react-aria-components/; \
do node scripts/buildEsm.js $$pkg; \
done
Expand All @@ -118,7 +123,7 @@ check-examples:

starter:
node scripts/extractStarter.mjs
cd starters/docs && yarn && yarn tsc
cd starters/docs && yarn --no-immutable && yarn tsc

starter-zip: starter
cp LICENSE starters/docs/.
Expand All @@ -129,7 +134,7 @@ starter-zip: starter

tailwind-starter:
cp LICENSE starters/tailwind/.
cd starters/tailwind && yarn && yarn tsc
cd starters/tailwind && yarn --no-immutable && yarn tsc
cd starters/tailwind && zip -r react-aria-tailwind-starter.zip . -x .gitignore .DS_Store "node_modules/*" "storybook-static/*"
mv starters/tailwind/react-aria-tailwind-starter.zip dist/production/docs/react-aria-tailwind-starter.$$(git rev-parse --short HEAD).zip
cd starters/tailwind && yarn build-storybook
Expand Down
894 changes: 894 additions & 0 deletions examples/next-app/.yarn/releases/yarn-4.2.2.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions examples/next-app/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.2.2.cjs
1 change: 1 addition & 0 deletions examples/next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"name": "next-app",
"version": "0.1.0",
"private": true,
"packageManager": "[email protected]",
"scripts": {
"dev": "next dev",
"build": "next build",
Expand Down
Empty file added examples/next-app/yarn.lock
Empty file.
894 changes: 894 additions & 0 deletions examples/rac-spectrum-tailwind/.yarn/releases/yarn-4.2.2.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions examples/rac-spectrum-tailwind/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.2.2.cjs
4 changes: 3 additions & 1 deletion examples/rac-spectrum-tailwind/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"name": "rac-spectrum-tailwind-example",
"private": true,
"packageManager": "[email protected]",
"scripts": {
"start": "parcel src/index.html",
"build": "parcel build src/index.html",
"install-17": "yarn add -W react@^17 react-dom@^17"
},
"dependencies": {
"@adobe/react-spectrum": "^3.28.0",
"@react-spectrum/provider": "^3.9.7",
"@spectrum-icons/illustrations": "^3.6.3",
"@spectrum-icons/workflow": "^4.2.2",
"@spectrum-icons/workflow": "^4.2.12",
"parcel": "2.0.0-dev.1599",
"postcss": "^8.2.1",
"react": "^18.2.0",
Expand Down
Empty file.
Loading

0 comments on commit 976604a

Please sign in to comment.