sprintfix: 国际化翻译校正 & vue升级至2.7.x (closed #1445)

TencentBlueKing · Jul 12, 2023 · a8a29a8 · a8a29a8
1 parent 415cf66
commit a8a29a8
Show file tree

Hide file tree

Showing 36 changed files with 2,038 additions and 659 deletions.
diff --git a/frontend/build/tsconfig.json b/frontend/build/tsconfig.json
@@ -3,8 +3,15 @@
     "node_modules"
   ],
   "include": [
-    "./*.ts"
+    "./*.ts",
+    "src/**/*.js",  //src为本地开发目录
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
   ],
+  "vueCompilerOptions": {
+    "target": 2.7
+  },
   "compilerOptions": {
     "esModuleInterop": true, 
     // 启用装饰器

diff --git a/frontend/build/webpack.base.conf.ts b/frontend/build/webpack.base.conf.ts
@@ -7,6 +7,7 @@ import ProgressBarPlugin from 'progress-bar-webpack-plugin'
 import VueLoaderPlugin from 'vue-loader/lib/plugin'
 import chalk from 'chalk'
 import os from 'os'
+import NodePolyfillPlugin from "node-polyfill-webpack-plugin"
 
 const isProd = process.env.NODE_ENV === 'production'
 
@@ -32,6 +33,10 @@ const baseConfig: webpack.Configuration = {
       vue$: 'vue/dist/vue.esm.js',
       '@': resolve('src'),
       '@static': resolve('static'),
+    },
+    fallback: {
+      fs: false,
+      crypto: require.resolve("crypto-browserify")
     }
   },
 
@@ -57,6 +62,10 @@ const baseConfig: webpack.Configuration = {
         use: {
           loader: 'vue-loader',
           options: {
+            loaders: {
+              ts: 'ts-loader',
+              tsx: 'babel-loader!ts-loader',
+            },
             transformAssetUrls: {
               video: 'src',
               source: 'src',
@@ -161,6 +170,7 @@ const baseConfig: webpack.Configuration = {
   },
 
   plugins: [
+    new NodePolyfillPlugin(),
     new VueLoaderPlugin(),
     // moment 优化，只提取本地包
     new webpack.ContextReplacementPlugin(/moment\/locale$/, /zh-cn/),

diff --git a/frontend/build/webpack.dev.conf.ts b/frontend/build/webpack.dev.conf.ts
@@ -123,13 +123,14 @@ const webpackConfig = merge(baseConf, {
                       'style-loader',
                       {
                           loader: 'css-loader',
-                          options: {
-                              importLoaders: 1
-                          }
+                        //   options: {
+                        //       importLoaders: 2
+                        //   }
                       },
                       {
                           loader: 'postcss-loader',
                           options: {
+                            // importLoaders: 2,
                               postcssOptions: {
                                   config: path.resolve(__dirname, '..', 'postcss.config.js')
                               }
@@ -146,7 +147,7 @@ const webpackConfig = merge(baseConf, {
                       {
                           loader: 'css-loader',
                           options: {
-                              importLoaders: 1
+                            //   importLoaders: 1
                           }
                       },
                       // Compiles Sass to CSS

diff --git a/frontend/build/webpack.prod.conf.ts b/frontend/build/webpack.prod.conf.ts
@@ -115,9 +115,10 @@ const prodConf = merge(baseConf, {
                     MiniCssExtractPlugin.loader,
                     {
                         loader: 'css-loader',
-                        options: {
-                            importLoaders: 1
-                        }
+                        // 升级vue2.7时被注释
+                        // options: {
+                        //     importLoaders: 1
+                        // }
                     },
                     {
                         loader: 'postcss-loader',
@@ -136,9 +137,9 @@ const prodConf = merge(baseConf, {
                     // Translates CSS into CommonJS
                     {
                         loader: 'css-loader',
-                        options: {
-                            importLoaders: 1
-                        }
+                        // options: {
+                        //     importLoaders: 1
+                        // }
                     },
                     // Compiles Sass to CSS
                     'sass-loader'