ci: migrate on yarn v4

tsedio · Mar 22, 2024 · 0c0ed88 · 0c0ed88
1 parent 96f97fc
commit 0c0ed88
Show file tree

Hide file tree

Showing 13 changed files with 28,693 additions and 21,068 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install dependencies
-        run: yarn install --frozen-lockfile --network-timeout 500000
+        run: yarn install --immutable --network-timeout 500000
       - name: Run lint
         run: yarn lint
 
@@ -42,7 +42,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install dependencies
-        run: yarn install --frozen-lockfile --network-timeout 500000
+        run: yarn install --immutable --network-timeout 500000
       - name: Run test
         run: yarn test
 
@@ -62,7 +62,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install dependencies
-        run: yarn install --frozen-lockfile --network-timeout 500000
+        run: yarn install --immutable --network-timeout 500000
       - name: Release packages
         env:
           CI: true
@@ -93,7 +93,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install --immutable
       - name: Release packages
         env:
           CI: true

diff --git a/.gitignore b/.gitignore
@@ -55,3 +55,13 @@ build
 .nyc_output
 /docs/.vuepress/dist/
 /packages/tailwind/COLORS.JSON
+
+# Yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
diff --git a/.yarn/releases/yarn-4.1.1.cjs b/.yarn/releases/yarn-4.1.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+enableGlobalCache: true
+yarnPath: .yarn/releases/yarn-4.1.1.cjs
diff --git a/lerna.json b/lerna.json
@@ -1,15 +1,5 @@
 {
   "npmClient": "yarn",
-  "useWorkspaces": true,
-  "packages": [
-    "packages/*"
-  ],
-  "version": "2.2.3",
-  "command": {
-    "bootstrap": {
-      "npmClientArgs": [
-        "--no-package-lock"
-      ]
-    }
-  }
+  "packages": ["packages/*"],
+  "version": "2.2.3"
 }
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "lint": "lerna run lint --stream",
     "lint:fix": "lerna run lint:fix --stream",
     "prettier": "prettier '**/*.{ts,js,json,md,yml,yaml}' --write",
-    "build": "monorepo build",
+    "build": "monorepo build --verbose",
     "publish": "monorepo publish --dry-run",
     "start": "lerna run start --stream --parallel",
     "start:storybook": "lerna run start:storybook --stream",
@@ -35,18 +35,18 @@
     "@formio/choices.js": "^9.0.1",
     "@types/classnames": "^2.2.11",
     "@types/react": "^18.2.8",
+    "@types/react-dnd": "3.0.2",
+    "@types/react-dnd-html5-backend": "3.0.2",
     "@types/react-dom": "^18.2.4",
     "@types/react-redux": "^7.1.25",
     "@types/react-router": "^5.1.20",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-table": "^7.7.14",
-    "@types/react-dnd": "3.0.2",
-    "@types/react-dnd-html5-backend": "3.0.2",
     "connected-react-router": "6.9.1",
     "formiojs": "^4.14.13",
     "history": "5.3.0",
-    "lerna": "5.1.8",
-    "lodash": "4.17.20",
+    "lerna": "8.1.2",
+    "lodash": "4.17.21",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-redux": "7.2.6",
@@ -65,7 +65,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^14.2.1",
-    "@tsed/monorepo-utils": "^1.22.6",
+    "@tsed/monorepo-utils": "2.1.2",
     "@types/ejs": "^3.0.5",
     "@types/jest": "27.0.2",
     "@types/lodash": "4.14.168",
@@ -126,5 +126,6 @@
         "cname": "formio.tsed.io"
       }
     ]
-  }
+  },
+  "packageManager": "yarn@4.1.1"
 }
diff --git a/packages/react-formio-container/package.json b/packages/react-formio-container/package.json
@@ -35,15 +35,12 @@
     "tooltip.js": "^1.3.3"
   },
   "devDependencies": {
-    "@tsed/react-formio": "2.2.3",
-    "@tsed/react-formio-stores": "2.2.3",
+    "@tsed/react-formio": "workspace:*",
+    "@tsed/react-formio-stores": "workspace:*",
     "@types/file-saver": "^2.0.1",
     "file-saver": "^2.0.5"
   },
   "peerDependenciesMeta": {
-    "formiojs": {
-      "optional": false
-    },
     "choices.js": {
       "optional": false
     },
@@ -56,6 +53,9 @@
     "file-saver": {
       "optional": false
     },
+    "formiojs": {
+      "optional": false
+    },
     "lodash": {
       "optional": false
     },
@@ -91,4 +91,4 @@
     }
   },
   "dependencies": {}
-}
+}
diff --git a/packages/react-formio-stores/package.json b/packages/react-formio-stores/package.json
@@ -15,8 +15,8 @@
     "watch": "microbundle watch --no-compress --format modern,cjs --jsx React.createElement --jsxFragment React.Fragment --globals react/jsx-runtime=jsx"
   },
   "dependencies": {
-    "@tsed/react-formio": "2.2.3",
-    "@tsed/redux-utils": "2.2.3",
+    "@tsed/react-formio": "workspace:*",
+    "@tsed/redux-utils": "workspace:*",
     "eventemitter2": "^6.4.3",
     "prop-types": "^15.7.2"
   },
@@ -31,7 +31,7 @@
     "tooltip.js": ">=1.3.3"
   },
   "devDependencies": {
-    "@tsed/tailwind": "2.2.3",
-    "@tsed/tailwind-formio": "2.2.3"
+    "@tsed/tailwind": "workspace:*",
+    "@tsed/tailwind-formio": "workspace:*"
   }
-}
+}
diff --git a/packages/react-formio/package.json b/packages/react-formio/package.json
@@ -32,7 +32,7 @@
     "tooltip.js": ">=1.3.3"
   },
   "devDependencies": {
-    "@tsed/tailwind": "2.2.3",
-    "@tsed/tailwind-formio": "2.2.3"
+    "@tsed/tailwind": "workspace:*",
+    "@tsed/tailwind-formio": "workspace:*"
   }
-}
+}
diff --git a/packages/redux-utils/package.json b/packages/redux-utils/package.json
@@ -16,11 +16,11 @@
     "watch": "microbundle watch --no-compress --format modern,cjs --jsx React.createElement"
   },
   "devDependencies": {
-    "@tsed/config": "2.2.3"
+    "@tsed/config": "workspace:*"
   },
   "peerDependencies": {
     "react": "^18.2.0",
     "redux": "^4.0.5"
   },
   "dependencies": {}
-}
+}
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -13,9 +13,9 @@
     "deploy": "npx gh-pages -d ./.out -t true --history false"
   },
   "dependencies": {
-    "@tsed/config": "2.2.3",
-    "@tsed/react-formio": "2.2.3",
-    "@tsed/tailwind-formio": "2.2.3"
+    "@tsed/config": "workspace:*",
+    "@tsed/react-formio": "workspace:*",
+    "@tsed/tailwind-formio": "workspace:*"
   },
   "devDependencies": {
     "@storybook/addon-essentials": "^7.0.18",
@@ -49,4 +49,4 @@
     ]
   },
   "peerDependencies": {}
-}
+}
diff --git a/packages/tailwind/package.json b/packages/tailwind/package.json
@@ -16,7 +16,6 @@
   },
   "devDependencies": {
     "rimraf": "3.0.2",
-    "tailwind": "4.0.0",
     "tailwind-config-viewer": "^1.3.1",
     "tailwindcss": "2.2.19",
     "tailwindcss-cli": "0.1.2",
@@ -37,4 +36,4 @@
   },
   "dependencies": {},
   "peerDependencies": {}
-}
+}