KERNEL-6540 chore: 更新依赖配置

3 years ago · 4c1e427b20
9 changed files with 15 additions and 47 deletions
--- a/src/web/babel.config.js
+++ b/src/web/babel.config.js
@ -1,29 +1 @@
-module.exports = function(api) {
-    api.cache(true);
-    const presets = [
-        [
-            '@babel/preset-env',
-            {
-                targets: {
-                    ie: 9,
-                    chrome: 47,
-                },
-            },
-        ],
-        '@babel/preset-typescript',
-    ];
-    const plugins = [
-        [
-            '@babel/plugin-proposal-decorators',
-            {
-                legacy: true,
-            },
-        ],
-        '@babel/plugin-proposal-class-properties',
-    ];
-
-    return {
-        presets,
-        plugins,
-    };
-};
+module.exports = require('@fui/babel-preset-fineui').configs.base;
--- a/src/web/index.html
+++ b/src/web/index.html
@ -6,7 +6,7 @@
    <!--核心css文件-->
    <link
      rel="preload"
-      href="./node_modules/fineui/dist/font/iconfont.woff"
+      href="./node_modules/@fui/core/dist/font/iconfont.woff"
      as="font"
      type="font/woff"
      crossorigin=""
@ -14,7 +14,7 @@
    <link
      rel="stylesheet"
      type="text/css"
-      href="./node_modules/fineui/dist/2.0/fineui.min.css"
+      href="./node_modules/@fui/core/dist/2.0/fineui.min.css"
    />
    <link
      rel="stylesheet"
@ -26,7 +26,7 @@
  <body id="body">
    <div id="wrapper"></div>
    <script src="./assets/scripts/dec.js"></script>
-    <script src="./node_modules/fineui/dist/fineui.js"></script>
+    <script src="./node_modules/@fui/core/dist/fineui.js"></script>
    <script src="./node_modules/@fui/materials/docs/materials.min.js"></script>
  </body>
 </html>
--- a/src/web/package.json
+++ b/src/web/package.json
@ -7,11 +7,12 @@
  "author": "alan",
  "license": "MIT",
  "dependencies": {
-    "@fui/materials": "^10.0.0",
+    "@fui/babel-preset-fineui": "^1.0.0",
+    "@fui/core": "^2.0.0",
+    "@fui/materials": "10.0.0-release - 10.0.0-release.99999999999999",
    "@types/jss": "9.5.8",
    "autoprefixer": "^9.6.1",
    "es6-promise": "4.2.6",
-    "fineui": "^2.0.20200628140334",
    "fork-ts-checker-webpack-plugin": "^1.5.1",
    "jss": "9.8.7",
    "jss-plugin-global": "10.0.0-alpha.7",
@ -20,15 +21,9 @@
    "optimize-css-assets-webpack-plugin": "^5.0.3"
  },
  "devDependencies": {
-    "@babel/core": "7.4.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.0",
-    "@babel/plugin-proposal-decorators": "7.4.4",
-    "@babel/polyfill": "7.4.4",
-    "@babel/preset-env": "7.4.5",
-    "@babel/preset-typescript": "7.3.3",
    "@types/jest": "24.0.11",
-    "@typescript-eslint/eslint-plugin": "1.7.0",
-    "@typescript-eslint/parser": "1.7.0",
+    "@typescript-eslint/eslint-plugin": "2.33.0",
+    "@typescript-eslint/parser": "2.33.0",
    "axios": "0.18.0",
    "babel-loader": "8.0.6",
    "body-parser": "1.18.3",
--- a/src/web/src/less/background.less
+++ b/src/web/src/less/background.less
@ -1,2 +1,2 @@
-@import "../../node_modules/fineui/src/less/image.less";
+@import "../../node_modules/@fui/core/src/less/image.less";
@import "./lib/background.less";
--- a/src/web/src/less/font.less
+++ b/src/web/src/less/font.less
@ -1,4 +1,4 @@
-@import "../../node_modules/fineui/src/less/resource/font.less";
+@import "../../node_modules/@fui/core/src/less/resource/font.less";
@import "./lib/font.less";

 .font(redis-refresh-font, @font-redis-refresh);
--- a/src/web/src/less/utils.less
+++ b/src/web/src/less/utils.less
@ -1 +1 @@
-@import '../../node_modules/fineui/src/less/visual.less';
+@import '../../node_modules/@fui/core/src/less/visual.less';
--- a/src/web/tsconfig.json
+++ b/src/web/tsconfig.json
@ -18,6 +18,7 @@
        // "noUnusedLocals": true,
        // "noUnusedParameters": true,
        // "noImplicitReturns": true,
+        "skipLibCheck": true,
        "noFallthroughCasesInSwitch": true,
        "paths": {
            "ui": ["./src/ui"],
--- a/src/web/types/globals.d.ts
+++ b/src/web/types/globals.d.ts
@ -2,7 +2,7 @@ interface Obj {
    [key: string]: any;
 }

-declare let BI: Obj & import('fineui').BI & import('fineui-materials').BI;
+declare let BI: Obj & import('@fui/core').BI & import('@fui/materials').BI;
 declare const Fix: Obj;
 declare const DecCst: Obj;
 declare const Dec: Obj;
--- a/src/web/webpack/webpack.common.js
+++ b/src/web/webpack/webpack.common.js
@ -49,7 +49,7 @@ module.exports = {
                        options: {
                            plugins: [vars({
                                variables: {
-                                    fontUrl: '../node_modules/fineui/dist/font/',
+                                    fontUrl: '../node_modules/@fui/core/dist/font/',
                                    imageUrl: '/webroot/decision/resources?path=/com/fr/web/resources/dist/images/1x',
                                    image2xUrl: '/webroot/decision/resources?path=/com/fr/web/resources/dist/images/2x',
                                }