chore: 升级第三方依赖 react@5.4.0 downshift@6.1.7 sortablejs@1.15.0 (#5442)

package.json

@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@types/jest": "^28.1.0",
-    "echarts": "5.3.3",
+    "echarts": "5.4.0",
     "fis-optimizer-terser": "^1.0.1",
     "fis-parser-sass": "^1.2.0",
     "fis-parser-svgr": "^1.0.0",
@@ -46,12 +46,12 @@
     "fis3-preprocessor-js-require-css": "^0.1.3",
     "fis3-preprocessor-js-require-file": "^0.1.3",
     "husky": "^8.0.0",
-    "jest": "^28.1.0",
+    "jest": "^29.0.3",
-    "jest-environment-jsdom": "^28.1.0",
+    "jest-environment-jsdom": "^29.0.3",
-    "lerna": "^5.0.0",
+    "lerna": "^5.5.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "ts-jest": "^28.0.3",
+    "ts-jest": "^29.0.2",
     "zrender": "^5.3.2"
   },
   "jest": {
@@ -85,11 +85,6 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/.rollup.cache/"
-    ],
+    ]
-    "globals": {
-      "ts-jest": {
-        "diagnostics": false
-      }
-    }
   }
 }

packages/amis-core/package.json

@@ -10,7 +10,7 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-node-resolve": "^14.1.0",
     "@rollup/plugin-typescript": "^8.3.4",
     "@testing-library/jest-dom": "^5.16.4",
     "@types/file-saver": "^2.0.1",
@@ -18,16 +18,16 @@
     "@types/jest": "^28.1.0",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",
-    "jest": "^28.1.0",
+    "jest": "^29.0.3",
-    "jest-environment-jsdom": "^28.1.0",
+    "jest-environment-jsdom": "^29.0.3",
     "moment-timezone": "^0.5.34",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.73.0",
+    "rollup": "^2.79.1",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-license": "^2.7.0",
-    "ts-jest": "^28.0.3",
+    "ts-jest": "^29.0.2",
     "typescript": "^4.6.4"
   },
   "scripts": {
@@ -76,7 +76,12 @@
       "js"
     ],
     "transform": {
-      "\\.(ts|tsx)$": "ts-jest"
+      "\\.(ts|tsx)$": [
+        "ts-jest",
+        {
+          "diagnostics": false
+        }
+      ]
     },
     "setupFiles": [
       "jest-canvas-mock"
@@ -92,12 +97,7 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/.rollup.cache/"
-    ],
+    ]
-    "globals": {
-      "ts-jest": {
-        "diagnostics": false
-      }
-    }
   },
   "gitHead": "37d23b4a8eb1c663bc38e8dd9040889ea1526ec4"
 }

packages/amis-formula/__tests__/__snapshots__/lexer.test.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`lexer:filter 1`] = `
-Array [
+[
   "<Raw> $abc is ",
   "<OpenScript> \${",
   "<Identifier> abc",
@@ -19,7 +19,7 @@ Array [
 `;
 
 exports[`lexer:simple 1`] = `
-Array [
+[
   "<Raw> expression result is ",
   "<OpenScript> \${",
   "<Identifier> a",

packages/amis-formula/package.json

@@ -41,15 +41,15 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-node-resolve": "^14.1.0",
     "@rollup/plugin-typescript": "^8.3.4",
     "@types/doctrine": "0.0.5",
     "@types/jest": "^28.1.0",
     "@types/lodash": "^4.14.175",
     "doctrine": "^3.0.0",
-    "jest": "^28.1.0",
+    "jest": "^29.0.3",
     "jest-canvas-mock": "^2.3.0",
-    "jest-environment-jsdom": "^28.1.0",
+    "jest-environment-jsdom": "^29.0.3",
     "mini-css-extract-plugin": "^2.4.5",
     "moment-timezone": "^0.5.33",
     "rimraf": "^3.0.2",
@@ -60,7 +60,7 @@
     "sass-loader": "^12.1.0",
     "style-loader": "^3.2.1",
     "stylelint": "^13.0.0",
-    "ts-jest": "^28.0.3",
+    "ts-jest": "^29.0.2",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.4.0",
     "typescript": "^4.3.5"
@@ -77,7 +77,12 @@
       "js"
     ],
     "transform": {
-      "\\.(ts|tsx)$": "ts-jest"
+      "\\.(ts|tsx)$": [
+        "ts-jest",
+        {
+          "diagnostics": false
+        }
+      ]
     },
     "setupFiles": [
       "jest-canvas-mock"
@@ -89,12 +94,7 @@
     },
     "setupFilesAfterEnv": [
       "<rootDir>/__tests__/jest.setup.js"
-    ],
+    ]
-    "globals": {
-      "ts-jest": {
-        "diagnostics": false
-      }
-    }
   },
   "gitHead": "37d23b4a8eb1c663bc38e8dd9040889ea1526ec4"
 }

packages/amis-ui/package.json

@@ -37,8 +37,8 @@
     "amis-formula": "^2.1.0",
     "classnames": "2.3.1",
     "codemirror": "^5.63.0",
-    "downshift": "6.1.7",
+    "downshift": "6.1.12",
-    "echarts": "5.3.3",
+    "echarts": "5.4.0",
     "froala-editor": "3.1.1",
     "hoist-non-react-statics": "^3.3.2",
     "jsbarcode": "^3.11.5",
@@ -53,7 +53,7 @@
     "moment": "^2.19.4",
     "monaco-editor": "0.30.1",
     "prop-types": "^15.6.1",
-    "rc-input-number": "^7.3.4",
+    "rc-input-number": "^7.3.9",
     "rc-progress": "^3.1.4",
     "react-color": "^2.19.3",
     "react-hook-form": "7.30.0",
@@ -62,7 +62,7 @@
     "react-textarea-autosize": "8.3.3",
     "react-transition-group": "4.4.2",
     "react-visibility-sensor": "5.1.1",
-    "sortablejs": "1.14.0",
+    "sortablejs": "1.15.0",
     "tinymce": "^6.1.2",
     "tslib": "^2.3.1",
     "uncontrollable": "7.2.1"
@@ -70,7 +70,7 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-node-resolve": "^14.1.0",
     "@rollup/plugin-typescript": "^8.3.4",
     "@svgr/rollup": "^6.2.1",
     "@testing-library/jest-dom": "^5.16.4",
@@ -78,21 +78,21 @@
     "@types/jest": "^28.1.0",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",
-    "autoprefixer": "^10.4.7",
+    "autoprefixer": "^10.4.12",
-    "jest": "^28.1.0",
+    "jest": "^29.0.3",
-    "jest-environment-jsdom": "^28.1.0",
+    "jest-environment-jsdom": "^29.0.3",
     "moment-timezone": "^0.5.34",
     "postcss-import": "^14.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.73.0",
+    "rollup": "^2.79.1",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-license": "^2.7.0",
     "rollup-plugin-postcss": "^4.0.2",
     "rollup-plugin-scss": "^3.0.0",
     "sass": "^1.54.9",
-    "ts-jest": "^28.0.3",
+    "ts-jest": "^29.0.2",
     "typescript": "^4.6.4"
   },
   "peerDependencies": {
@@ -112,7 +112,12 @@
       "js"
     ],
     "transform": {
-      "\\.(ts|tsx)$": "ts-jest"
+      "\\.(ts|tsx)$": [
+        "ts-jest",
+        {
+          "diagnostics": false
+        }
+      ]
     },
     "setupFiles": [
       "jest-canvas-mock"
@@ -129,12 +134,7 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/.rollup.cache/"
-    ],
+    ]
-    "globals": {
-      "ts-jest": {
-        "diagnostics": false
-      }
-    }
   },
   "gitHead": "37d23b4a8eb1c663bc38e8dd9040889ea1526ec4"
 }

packages/amis/__tests__/renderers/Form/__snapshots__/autoFill.test.tsx.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Form:options:autoFill:data 1`] = `
-Object {
+{
   "a": "a",
   "aId": 233,
   "aLabel": "OptionA",
@@ -10,7 +10,7 @@ Object {
 `;
 
 exports[`Form:options:autoFill:data 2`] = `
-Object {
+{
   "a": "b",
   "aId": "",
   "aLabel": "OptionB",
@@ -19,30 +19,30 @@ Object {
 `;
 
 exports[`Form:options:autoFill:multiple:data 1`] = `
-Object {
+{
   "a": "a",
-  "aIds": Array [
+  "aIds": [
     233,
   ],
-  "aLabels": Array [
+  "aLabels": [
     "OptionA",
   ],
-  "aValues": Array [
+  "aValues": [
     "a",
   ],
 }
 `;
 
 exports[`Form:options:autoFill:multiple:data 2`] = `
-Object {
+{
   "a": "b",
-  "aIds": Array [
+  "aIds": [
     undefined,
   ],
-  "aLabels": Array [
+  "aLabels": [
     "OptionB",
   ],
-  "aValues": Array [
+  "aValues": [
     "b",
   ],
 }

packages/amis/__tests__/renderers/Form/__snapshots__/formitem.test.tsx.snap

@@ -421,7 +421,7 @@ exports[`Renderer:FormItem:validateApi:success 1`] = `
 `;
 
 exports[`Renderer:FormItem:validateApi:success 2`] = `
-Object {
+{
   "a": "123",
 }
 `;

packages/amis/__tests__/renderers/Form/__snapshots__/index.test.tsx.snap

@@ -129,18 +129,18 @@ exports[`Renderer:Form 1`] = `
 `;
 
 exports[`Renderer:Form 2`] = `
-Object {
+{
-  "body": Object {
+  "body": {
     "a": "123",
   },
-  "config": Object {
+  "config": {
     "errorMessage": "saveFailed",
     "method": "post",
     "onFailed": [Function],
     "onSuccess": [Function],
     "successMessage": "saveSuccess",
   },
-  "data": Object {
+  "data": {
     "a": "123",
   },
   "method": "post",
@@ -837,7 +837,7 @@ exports[`Renderer:Form:onValidate 1`] = `
 `;
 
 exports[`Renderer:Form:onValidate 2`] = `
-Object {
+{
   "a": 1,
   "b": 2,
 }
@@ -1007,7 +1007,7 @@ exports[`Renderer:Form:onValidate 3`] = `
 `;
 
 exports[`Renderer:Form:onValidate 4`] = `
-Object {
+{
   "a": 1,
   "b": 2,
 }
@@ -1429,7 +1429,7 @@ exports[`Renderer:Form:valdiate 2`] = `
 `;
 
 exports[`Renderer:Form:valdiate 3`] = `
-Object {
+{
   "a": "123",
 }
 `;

packages/amis/__tests__/renderers/Form/__snapshots__/initData.test.tsx.snap

@@ -67,7 +67,7 @@ exports[`Form:initData 1`] = `
 `;
 
 exports[`Form:initData 2`] = `
-Object {
+{
   "a": "1",
   "b": "2",
 }
@@ -237,15 +237,15 @@ exports[`Form:initData:remote 1`] = `
 `;
 
 exports[`Form:initData:remote 2`] = `
-Object {
+{
-  "config": Object {
+  "config": {
     "cancelExecutor": [Function],
     "errorMessage": "fetchFailed",
     "onSuccess": [Function],
     "successMessage": undefined,
   },
   "method": "get",
-  "query": Object {
+  "query": {
     "c": "123",
   },
   "url": "/api/xxx?c=123",
@@ -253,7 +253,7 @@ Object {
 `;
 
 exports[`Form:initData:remote 3`] = `
-Object {
+{
   "a": 1,
   "b": 2,
   "c": "123",
@@ -424,4 +424,4 @@ exports[`Form:initData:without-super 1`] = `
 </div>
 `;
 
-exports[`Form:initData:without-super 2`] = `Object {}`;
+exports[`Form:initData:without-super 2`] = `{}`;

packages/amis/__tests__/renderers/Form/__snapshots__/select.test.tsx.snap

@@ -1418,7 +1418,7 @@ exports[`Renderer:select table with labelField & valueField 1`] = `
 `;
 
 exports[`Renderer:select table with labelField & valueField 2`] = `
-Object {
+{
   "a": "zhugeliang,libai",
 }
 `;

packages/amis/__tests__/renderers/Form/initData.test.tsx

@@ -99,14 +99,12 @@ test('Form:initData:super', async () => {
 
   await waitFor(() => {
     expect(onSubmit).toBeCalled();
-    expect(onSubmit.mock.calls[0][0]).toMatchInlineSnapshot(
+    expect(onSubmit.mock.calls[0][0]).toMatchInlineSnapshot(`
-      `
+      {
-    Object {
         "a": 1,
         "b": 2,
       }
-  `
+    `);
-    );
   });
 });
 

packages/amis/__tests__/renderers/__snapshots__/Page.test.tsx.snap

@@ -25,7 +25,7 @@ exports[`Renderer:Page 1`] = `
             >
               <span
                 dangerouslySetInnerHTML={
-                  Object {
+                  {
                     "__html": "This is Title",
                   }
                 }
@@ -56,7 +56,7 @@ exports[`Renderer:Page 1`] = `
             >
               <span
                 dangerouslySetInnerHTML={
-                  Object {
+                  {
                     "__html": "This is SubTitle",
                   }
                 }
@@ -72,7 +72,7 @@ exports[`Renderer:Page 1`] = `
           >
             <span
               dangerouslySetInnerHTML={
-                Object {
+                {
                   "__html": "This is toolbar",
                 }
               }
@@ -88,7 +88,7 @@ exports[`Renderer:Page 1`] = `
         >
           <span
             dangerouslySetInnerHTML={
-              Object {
+              {
                 "__html": "This is body",
               }
             }
@@ -1008,7 +1008,7 @@ exports[`Renderer:Page initApi reFetch when condition changes 1`] = `
         >
           <span
             dangerouslySetInnerHTML={
-              Object {
+              {
                 "__html": "The variable value is 1",
               }
             }
@@ -1050,7 +1050,7 @@ exports[`Renderer:Page initApi reFetch when condition changes 2`] = `
         >
           <span
             dangerouslySetInnerHTML={
-              Object {
+              {
                 "__html": "The variable value is 2",
               }
             }
@@ -1990,7 +1990,7 @@ exports[`Renderer:Page initData 1`] = `
         >
           <span
             dangerouslySetInnerHTML={
-              Object {
+              {
                 "__html": "The variable value is 1",
               }
             }
@@ -2032,7 +2032,7 @@ exports[`Renderer:Page initFetchOn trigger initApi fetch when condition becomes
         >
           <span
             dangerouslySetInnerHTML={
-              Object {
+              {
                 "__html": "The variable value is 6",
               }
             }
@@ -2063,7 +2063,7 @@ exports[`Renderer:Page location query 1`] = `
         >
           <span
             dangerouslySetInnerHTML={
-              Object {
+              {
                 "__html": "The variable value is 5",
               }
             }
@@ -2094,7 +2094,7 @@ exports[`Renderer:Page location query 2`] = `
         >
           <span
             dangerouslySetInnerHTML={
-              Object {
+              {
                 "__html": "The variable value is 6",
               }
             }

packages/amis/__tests__/stores/__snapshots__/index.test.ts.snap

@@ -1,25 +1,25 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`store:index 1`] = `
-Object {
+{
   "storeType": "RendererStore",
 }
 `;
 
 exports[`store:index 2`] = `
-Object {
+{
   "storeType": "RendererStore",
 }
 `;
 
 exports[`store:index 3`] = `
-Object {
+{
   "storeType": "RendererStore",
 }
 `;
 
 exports[`store:index 4`] = `
-Object {
+{
   "storeType": "RendererStore",
 }
 `;

packages/amis/__tests__/stores/__snapshots__/service.test.ts.snap

@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`store:ServiceStore 1`] = `
-Object {
+{
   "action": undefined,
   "busying": false,
   "checking": false,
-  "childrenIds": Array [],
+  "childrenIds": [],
-  "data": Object {},
+  "data": {},
   "dialogData": undefined,
   "dialogOpen": false,
   "disposed": false,
@@ -21,7 +21,7 @@ Object {
   "msg": "",
   "parentId": "",
   "path": "",
-  "pristine": Object {},
+  "pristine": {},
   "saving": false,
   "schema": null,
   "schemaKey": "",
@@ -31,13 +31,13 @@ Object {
 `;
 
 exports[`store:ServiceStore fetchInitData failed 1`] = `
-Array [
+[
-  Object {
+  {
     "action": undefined,
     "busying": false,
     "checking": false,
-    "childrenIds": Array [],
+    "childrenIds": [],
-    "data": Object {},
+    "data": {},
     "dialogData": undefined,
     "dialogOpen": false,
     "disposed": false,
@@ -52,19 +52,19 @@ Array [
     "msg": "",
     "parentId": "",
     "path": "",
-    "pristine": Object {},
+    "pristine": {},
     "saving": false,
     "schema": null,
     "schemaKey": "",
     "storeType": "ServiceStore",
     "updatedAt": 0,
   },
-  Object {
+  {
     "action": undefined,
     "busying": false,
     "checking": false,
-    "childrenIds": Array [],
+    "childrenIds": [],
-    "data": Object {},
+    "data": {},
     "dialogData": undefined,
     "dialogOpen": false,
     "disposed": false,
@@ -79,7 +79,7 @@ Array [
     "msg": "",
     "parentId": "",
     "path": "",
-    "pristine": Object {},
+    "pristine": {},
     "saving": false,
     "schema": null,
     "schemaKey": "",
@@ -90,13 +90,13 @@ Array [
 `;
 
 exports[`store:ServiceStore fetchInitData success 1`] = `
-Array [
+[
-  Object {
+  {
     "action": undefined,
     "busying": false,
     "checking": false,
-    "childrenIds": Array [],
+    "childrenIds": [],
-    "data": Object {},
+    "data": {},
     "dialogData": undefined,
     "dialogOpen": false,
     "disposed": false,
@@ -111,18 +111,18 @@ Array [
     "msg": "",
     "parentId": "",
     "path": "",
-    "pristine": Object {},
+    "pristine": {},
     "saving": false,
     "schema": null,
     "schemaKey": "",
     "storeType": "ServiceStore",
   },
-  Object {
+  {
     "action": undefined,
     "busying": false,
     "checking": false,
-    "childrenIds": Array [],
+    "childrenIds": [],
-    "data": Object {
+    "data": {
       "a": 1,
       "b": 2,
     },
@@ -140,7 +140,7 @@ Array [
     "msg": "",
     "parentId": "",
     "path": "",
-    "pristine": Object {
+    "pristine": {
       "a": 1,
       "b": 2,
     },

packages/amis/package.json

@@ -45,8 +45,8 @@
     "attr-accept": "2.2.2",
     "blueimp-canvastoblob": "2.1.0",
     "classnames": "2.3.1",
-    "downshift": "6.1.7",
+    "downshift": "6.1.12",
-    "echarts": "5.3.3",
+    "echarts": "5.4.0",
     "echarts-stat": "^1.2.0",
     "exceljs": "^4.3.0",
     "file-saver": "^2.0.2",
@@ -71,7 +71,7 @@
     "react-dropzone": "^11.4.2",
     "react-json-view": "1.21.3",
     "react-transition-group": "4.4.2",
-    "sortablejs": "1.14.0",
+    "sortablejs": "1.15.0",
     "tslib": "^2.3.1",
     "video-react": "0.15.0"
   },
@@ -79,7 +79,7 @@
     "@fortawesome/fontawesome-free": "^6.1.1",
     "@rollup/plugin-commonjs": "^22.0.2",
     "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-node-resolve": "^14.1.0",
     "@rollup/plugin-typescript": "^8.3.4",
     "@svgr/rollup": "^6.2.1",
     "@testing-library/jest-dom": "^5.16.4",
@@ -118,9 +118,9 @@
     "glob": "^7.2.0",
     "history": "^4.7.2",
     "husky": "^7.0.4",
-    "jest": "^28.1.0",
+    "jest": "^29.0.3",
     "jest-canvas-mock": "^2.3.0",
-    "jest-environment-jsdom": "^28.1.0",
+    "jest-environment-jsdom": "^29.0.3",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.1",
     "lint-staged": "^12.3.3",
@@ -140,10 +140,10 @@
     "react-router-dom": "5.3.0",
     "react-test-renderer": "^18.0.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.73.0",
+    "rollup": "^2.79.1",
     "rollup-plugin-auto-external": "^2.0.0",
     "rollup-plugin-license": "^2.7.0",
-    "ts-jest": "^28.0.3",
+    "ts-jest": "^29.0.2",
     "ts-json-schema-generator": "0.96.0",
     "ts-node": "^10.5.0",
     "typescript": "^4.6.4"
@@ -192,7 +192,12 @@
       "js"
     ],
     "transform": {
-      "\\.(ts|tsx)$": "ts-jest"
+      "\\.(ts|tsx)$": [
+        "ts-jest",
+        {
+          "diagnostics": false
+        }
+      ]
     },
     "setupFiles": [
       "jest-canvas-mock"
@@ -210,12 +215,7 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "/.rollup.cache/"
-    ],
+    ]
-    "globals": {
-      "ts-jest": {
-        "diagnostics": false
-      }
-    }
   },
   "peerDependencies": {
     "amis-core": "*",