chore: use yarn3

chore: commit yarn release chore: don't use -s fix: eslint deps https://eslint.org/docs/latest/extend/shareable-configs#publishing-a-shareable-config chore: fix eslint chore: remove -s fix: lint chore: yarn 3 amends chore: dont use npm run all chore: fix securitylockfile action chore: update lockfile post rebase Revert "Delete index.js" This reverts commit e6009ec. Delete index.js chore: remove validate-https because how yarn3 works chore: remove validate-https chore: use same time of cache everywhere
nilsingwersen · Mar 24, 2023 · 0f008b4 · 0f008b4
1 parent 403c098
commit 0f008b4
Show file tree

Hide file tree

Showing 22 changed files with 33,598 additions and 23,141 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -104,3 +104,8 @@ AUTHORS text
 *.woff binary
 *.pyc binary
 *.pdf binary
+
+# yarn
+/.yarn/** linguist-vendored
+/.yarn/releases/* binary
+/.yarn/plugins/**/* binary
diff --git a/.github/actions/check-pr-status/dist/index.js b/.github/actions/check-pr-status/dist/index.js
diff --git a/.github/actions/check-pr-status/yarn.lock b/.github/actions/check-pr-status/yarn.lock
diff --git a/.github/actions/run-api-tests/script.sh b/.github/actions/run-api-tests/script.sh
@@ -10,6 +10,6 @@ export JWT_SECRET="aSecret"
 
 opts=($DB_OPTIONS)
 
-yarn run -s build:ts
-yarn run -s test:generate-app "${opts[@]}"
-yarn run -s test:api --no-generate-app
+yarn run build:ts
+yarn run test:generate-app "${opts[@]}"
+yarn run test:api --no-generate-app
diff --git a/.github/actions/security/lockfile/script.sh b/.github/actions/security/lockfile/script.sh
@@ -1,7 +1,5 @@
-yarn global add lockfile-lint
-
-lockfile-lint \
+yarn dlx lockfile-lint \
     --type $LOCKFILE_TYPE \
     --path $LOCKFILE_PATH \
     --allowed-hosts $LOCKFILE_ALLOWED_HOSTS \
-    --validate-https
+    --allowed-schemes "npm:" "workspace:" "patch:"
diff --git a/.github/workflows/adminBundleSize.yml b/.github/workflows/adminBundleSize.yml
@@ -27,7 +27,8 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: yarn
+          path: '**/node_modules'
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - uses: preactjs/compressed-size-action@v2
         with:

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -24,5 +24,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          cache: yarn
+          path: '**/node_modules'
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - uses: ./.github/actions/security/lockfile
diff --git a/.github/workflows/contributor-doc.yml b/.github/workflows/contributor-doc.yml
@@ -33,10 +33,11 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: yarn
+          path: '**/node_modules'
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install  --immutable
 
       - name: Build website
         run: yarn build

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -36,7 +36,7 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
       - uses: nrwl/nx-set-shas@v3
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --immutable
       - name: Run build:ts
         run: yarn nx run-many --target=build:ts --nx-ignore-cycles
       - name: Run lint
@@ -61,7 +61,7 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
       - uses: nrwl/nx-set-shas@v3
-      - run: yarn install --frozen-lockfile
+      - run: yarn install --immutable
       - name: Run build:ts
         run: yarn nx run-many --target=build:ts --nx-ignore-cycles
       - name: Run tests
@@ -86,7 +86,7 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
       - uses: nrwl/nx-set-shas@v3
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - name: Run test
         run: yarn nx affected --target=test:front --nx-ignore-cycles
 
@@ -106,7 +106,7 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - name: Build
         run: yarn build --projects=@strapi/admin,@strapi/helper-plugin
 
@@ -145,7 +145,7 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - uses: ./.github/actions/run-api-tests
         with:
           dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
@@ -183,7 +183,7 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - uses: ./.github/actions/run-api-tests
         with:
           dbOptions: '--dbclient=mysql --dbhost=localhost --dbport=3306 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
@@ -220,7 +220,7 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - uses: ./.github/actions/run-api-tests
         with:
           dbOptions: '--dbclient=mysql --dbhost=localhost --dbport=3306 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
@@ -242,7 +242,7 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - uses: ./.github/actions/run-api-tests
         env:
           SQLITE_PKG: ${{ matrix.sqlite_pkg }}
@@ -288,7 +288,7 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - uses: ./.github/actions/run-api-tests
         with:
           dbOptions: '--dbclient=postgres --dbhost=localhost --dbport=5432 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
@@ -330,7 +330,7 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - uses: ./.github/actions/run-api-tests
         with:
           dbOptions: '--dbclient=mysql --dbhost=localhost --dbport=3306 --dbname=strapi_test --dbusername=strapi --dbpassword=strapi'
@@ -356,7 +356,7 @@ jobs:
         with:
           path: '**/node_modules'
           key: ${{ runner.os }}-${{ matrix.node }}-${{ hashFiles('**/yarn.lock') }}
-      - run: yarn install --frozen-lockfile
+      - run: yarn install  --immutable
       - uses: ./.github/actions/run-api-tests
         env:
           SQLITE_PKG: ${{ matrix.sqlite_pkg }}

diff --git a/.gitignore b/.gitignore
@@ -137,5 +137,15 @@ schema.graphql
 .vscode/
 !.vscode/settings.json
 front-workspace.code-workspace
-.yarn
 .yarnrc
+
+############################
+# Yarn
+############################
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions