Use pnpm 8 (#1093)

ukrbublik · web-flow · commit d5e615f361a1 · 2024-07-17T18:10:22.000+03:00
* use pnpm 8 * fix-pnpm-lock-6 * Revert "6.6.3" This reverts commit 18a00c5.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.codesandbox/tasks.json b/.codesandbox/tasks.json
@@ -1,10 +1,10 @@
 {
   // These tasks will run in order when initializing your CodeSandbox project.
   "setupTasks": [
-    {
-      "name": "Install pnpm 9",
-      "command": "npm i -g pnpm@9"
-    },
+    // {
+    //   "name": "Install pnpm 9",
+    //   "command": "npm i -g pnpm@9"
+    // },
     {
       "name": "Install dependencies",
       "command": "pnpm install --frozen-lockfile"
diff --git a/.github/workflows/codecov-report.yml b/.github/workflows/codecov-report.yml
@@ -16,12 +16,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           #cache: 'pnpm'
-      - run: pnpm i
+      - run: pnpm i --frozen-lockfile
       - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - run: pnpm test
       - uses: codecov/codecov-action@v4
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -12,13 +12,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           #cache: 'pnpm'
       - name: Install packages
-        run: pnpm i
+        run: pnpm i --frozen-lockfile
       - name: Setup
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Build
diff --git a/.github/workflows/long-smoke.yml b/.github/workflows/long-smoke.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -12,12 +12,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           #cache: 'pnpm'
-      - run: pnpm i
+      - run: pnpm i --frozen-lockfile
       - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - run: pnpm lint
       - run: pnpm test
@@ -31,13 +31,13 @@ jobs:
           ref: master
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           #cache: 'pnpm'
           registry-url: https://registry.npmjs.org/
-      - run: pnpm i
+      - run: pnpm i --frozen-lockfile
       - run: pnpm -r publish --access public
         env:
           NODE_AUTH_TOKEN: ${{secrets.npm_token}}
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -12,13 +12,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'pnpm'
       - name: Install packages
-        run: pnpm i
+        run: pnpm i --frozen-lockfile
       - name: Setup
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Lint
@@ -29,13 +29,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'pnpm'
       - name: Install packages
-        run: pnpm i
+        run: pnpm i --frozen-lockfile
       - name: Setup
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Build
@@ -61,13 +61,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'pnpm'
       - name: Install packages
-        run: pnpm i
+        run: pnpm i --frozen-lockfile
       - name: Setup
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Hot
@@ -78,13 +78,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: 9
+          version: 8
       - uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'pnpm'
       - name: Install packages
-        run: pnpm i
+        run: pnpm i --frozen-lockfile
       - name: Setup
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - name: Test
diff --git a/.npmrc b/.npmrc
@@ -2,3 +2,5 @@ engine-strict=true
 include-workspace-root=false
 prefer-workspace-packages=true
 auto-install-peers=false
+registry=https://registry.npmjs.org/
+lockfile-include-tarball-url=false
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 - 6.6.3
   - Fixed `Utils.isValidTree` for prod build.
     Removed `checkTree`, `isValidTree` from `Utils.Import` and `getTreeBadFields` from `Utils.TreeUtils`. (PR #1091) (issue #1075)
+  - Use pnpm 8
 - 6.6.2
   - Fixed issue with rendering func select inside func (PR #1086) (issue #1085)
   - Added `DefaultUtils` typings to `index.d.ts` (PR #1078) (issue #1079)
diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
     "./packages/*"
   ],
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "6.6.3"
+  "version": "6.6.2"
 }
diff --git a/package.json b/package.json
@@ -84,7 +84,8 @@
     "start": "pnpm run examples",
     "test": "pnpm --filter @react-awesome-query-builder/tests run test",
     "test-debug": "pnpm --filter @react-awesome-query-builder/tests run test-debug",
-    "test-dev": "pnpm --filter @react-awesome-query-builder/tests run test-dev"
+    "test-dev": "pnpm --filter @react-awesome-query-builder/tests run test-dev",
+    "fix-pnpm-lock-6": "sed -r -i '' 's@, tarball: https://.+}@}@g' ./pnpm-lock.yaml"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.7",
@@ -111,7 +112,7 @@
   },
   "engines": {
     "node": ">=18",
-    "pnpm": ">=9"
+    "pnpm": ">=8"
   },
   "pnpm": {
     "allowedDeprecatedVersions": {
diff --git a/packages/antd/package.json b/packages/antd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/antd",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. AntDesign widgets",
   "keywords": [
     "query-builder",
diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/bootstrap",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. Bootstrap widgets",
   "keywords": [
     "query-builder",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/core",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. Core",
   "keywords": [
     "query-builder",
diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/examples",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "Local hot-reloadable demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",
diff --git a/packages/fluent/package.json b/packages/fluent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/fluent",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. Fluent 8 widgets",
   "keywords": [
     "query-builder",
diff --git a/packages/material/package.json b/packages/material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/material",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. Material-UI 4 widgets",
   "keywords": [
     "query-builder",
diff --git a/packages/mui/package.json b/packages/mui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/mui",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. MUI 5 widgets",
   "keywords": [
     "query-builder",
diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/sandbox",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "Demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",
diff --git a/packages/sandbox_next/package.json b/packages/sandbox_next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/sandbox-next",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "Demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",
diff --git a/packages/sandbox_simple/package.json b/packages/sandbox_simple/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/sandbox-simple",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "Simple demo for @react-awesome-query-builder",
   "repository": {
     "type": "git",
diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/tests",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "private": true,
   "description": "Tests for @react-awesome-query-builder",
   "repository": {
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-awesome-query-builder/ui",
-  "version": "6.6.3",
+  "version": "6.6.2",
   "description": "User-friendly query builder for React. Core React UI",
   "keywords": [
     "query-builder",
diff --git a/packages/ui/styles/styles.scss b/packages/ui/styles/styles.scss
@@ -469,13 +469,14 @@ $rule-group-actions-offset-left: 10px !default;
 
       margin-top: $rulegroup-offset;
       margin-bottom: $rulegroup-offset;
+      padding-left: $rulegroup-offset-left;
+
       .group-or-rule-container {
         margin-bottom: $rulegroup-offset;
         margin-top: $rulegroup-offset;
         padding-right: $rulegroup-offset;
       }
 
-      padding-left: $rulegroup-offset-left;
       &.one--child {
         padding-left: calc($rulegroup-offset-left / 2);
       }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`"./packages/*"`
`5`	`5`	`],`
`6`	`6`	`"$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`7`		`- "version": "6.6.3"`
	`7`	`+ "version": "6.6.2"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/antd",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"description": "User-friendly query builder for React. AntDesign widgets",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"query-builder",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/bootstrap",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"description": "User-friendly query builder for React. Bootstrap widgets",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"query-builder",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/core",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"description": "User-friendly query builder for React. Core",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"query-builder",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/examples",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"description": "Local hot-reloadable demo for @react-awesome-query-builder",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/fluent",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"description": "User-friendly query builder for React. Fluent 8 widgets",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"query-builder",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/material",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"description": "User-friendly query builder for React. Material-UI 4 widgets",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"query-builder",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/sandbox",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"description": "Demo for @react-awesome-query-builder",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/tests",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Tests for @react-awesome-query-builder",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@react-awesome-query-builder/ui",`
`3`		`- "version": "6.6.3",`
	`3`	`+ "version": "6.6.2",`
`4`	`4`	`"description": "User-friendly query builder for React. Core React UI",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"query-builder",`