refactor: deps update

WeBankFinTech · Mar 17, 2024 · ad70d29 · ad70d29
1 parent 473827e
commit ad70d29
Show file tree

Hide file tree

Showing 11 changed files with 2,952 additions and 586 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/wxa-cli/.babelrc b/packages/wxa-cli/.babelrc
@@ -4,8 +4,9 @@
             "@babel/preset-env",
             {
                 "targets": {
-                    "node": "8"
-                }
+                    "node": "14"
+                },
+                "exclude": ["proposal-dynamic-import"]
             }
         ]
     ],

diff --git a/packages/wxa-cli/package.json b/packages/wxa-cli/package.json
@@ -37,11 +37,11 @@
   "dependencies": {
     "@babel/generator": "^7.1.3",
     "@babel/parser": "^7.1.3",
-    "@babel/plugin-proposal-class-properties": "^7.2.3",
-    "@babel/plugin-proposal-decorators": "^7.2.3",
-    "@babel/plugin-transform-runtime": "^7.2.0",
-    "@babel/preset-env": "^7.2.3",
-    "@babel/runtime": "7.8.7",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.24.0",
+    "@babel/plugin-transform-runtime": "^7.24.0",
+    "@babel/preset-env": "^7.24.0",
+    "@babel/runtime": "7.24.0",
     "@babel/template": "~7.10.0",
     "@babel/traverse": "~7.9.6",
     "@babel/types": "~7.9.6",
@@ -55,18 +55,18 @@
     "dom-serializer": "^0.1.1",
     "find-cache-dir": "^1.0.0",
     "find-root": "^1.1.0",
-    "globby": "^8.0.1",
+    "globby": "^14.0.1",
     "htmlparser2": "^3.10.1",
-    "inquirer": "^6.2.0",
+    "inquirer": "^9.2.16",
     "js-base64": "^2.4.0",
-    "json5": "^2.1.1",
+    "json5": "^2.2.3",
     "mkdirp": "^0.5.1",
     "mockjs": "^1.1.0",
     "node-notifier": "^5.2.1",
-    "postcss": "^7.0.36",
-    "postcss-pxtorpx-pro": "^1.0.0",
+    "postcss": "^8.4.35",
+    "postcss-pxtorpx-pro": "^2.0.0",
     "promise.prototype.finally": "^3.1.0",
-    "shelljs": "^0.8.3",
+    "shelljs": "^0.8.5",
     "source-map": "^0.7.3",
     "tapable": "^1.0.0",
     "valid-url": "^1.0.9"

diff --git a/packages/wxa-cli/src/builder.js b/packages/wxa-cli/src/builder.js
@@ -2,7 +2,7 @@ import {readFile, applyPlugins, isFile, getHash, promiseSerial, writeFile} from
 import path from 'path';
 import fs from 'fs';
 import chokidar from 'chokidar';
-import globby from 'globby';
+// import {globby} from 'globby';
 import debugPKG from 'debug';
 
 import Schedule from './schedule';
@@ -332,9 +332,9 @@ class Builder {
                 appConfigs: appConfigs,
             });
             wxaPerformance.markEnd('wxa_optimize_code-init');
-            
+
             applyPlugins(this.scheduler.wxaConfigs.plugins, optimizer);
-            
+
             await optimizer.run(indexedMap, appConfigs, fullModuleMap);
             wxaPerformance.markEnd('wxa_optimize_code');
 
@@ -345,7 +345,7 @@ class Builder {
             indexedMap.forEach((mdl)=>{
                 generateTasks.push(generator.do(mdl));
             });
-            
+
             await Promise.all(generateTasks);
 
             wxaPerformance.markEnd('wxa_generate_code');
@@ -376,7 +376,7 @@ class Builder {
         entry = this.hooks.entryOption.call(entry) || entry;
         // debug('entry after hooks %O', entry);
 
-        entry = await globby(entry);
+        entry = await (await import('globby')).globby(entry);
         entry = entry.map((item)=>item.replace(/\//g, path.sep));
         debug('entry after globby %O', entry);
 

diff --git a/packages/wxa-cli/src/creator.js b/packages/wxa-cli/src/creator.js
@@ -4,7 +4,7 @@ import fs from 'fs';
 import path from 'path';
 import shell from 'shelljs';
 import https from 'https';
-import inquirer from 'inquirer';
+// import inquirer from 'inquirer';
 
 let remoteMap = new Map([
     ['github', 'https://github.com/wxajs'],
@@ -61,10 +61,10 @@ class Creator {
         try {
             // 先尝试从github、gitee远程拉取模版配置json，并询问项目名+模板类型
             let configs = await this.getRemoteConfigs();
-            options = await inquirer.prompt(getQA(JSON.parse(configs), this.cmdOptions.projectName));
+            options = await ((await import("inquirer")).default).prompt(getQA(JSON.parse(configs), this.cmdOptions.projectName));
         } catch (err) {
             // getRemoteConfigs失败后，先询问项目名，clone git模版仓库，拿到模版再配置询问模版类型
-                options = await inquirer.prompt(getQAProjectName(this.cmdOptions.projectName));
+                options = await ((await import("inquirer")).default).prompt(getQAProjectName(this.cmdOptions.projectName));
         }
         options.projectName = options.projectName || this.cmdOptions.projectName;
         this.create(options);

diff --git a/packages/wxa-cli/src/optimizer/pxtorpx.js b/packages/wxa-cli/src/optimizer/pxtorpx.js
@@ -2,13 +2,13 @@ import postcss from 'postcss';
 import pxtorpx from 'postcss-pxtorpx-pro';
 import {isEmpty} from '../utils';
 
-export default function transformPixelsToRpx(mdl, wxaConfigs) {
+export default async function transformPixelsToRpx(mdl, wxaConfigs) {
     let options = wxaConfigs.optimization.transformPxToRpx;
     options = (typeof options === 'boolean' || isEmpty(options)) ? {} : options;
 
-    let css = postcss().use(pxtorpx(options)).process(mdl.code, {from: mdl.src}).css;
+    let result = await postcss([pxtorpx(options)]).process(mdl.code, {from: mdl.src});
 
-    mdl.code = css;
+    mdl.code = result.css;
 
     return mdl;
 }
diff --git a/packages/wxa-cli/src/schedule.js b/packages/wxa-cli/src/schedule.js
@@ -1,7 +1,7 @@
 import crypto from 'crypto';
 import {unlinkSync, statSync} from 'fs';
 import path from 'path';
-import globby from 'globby';
+// import {globbySync} from 'globby';
 import debugPKG from 'debug';
 import {SyncHook} from 'tapable';
 
@@ -21,6 +21,7 @@ import {isIgnoreFile} from './helpers/pathParser';
 
 let debug = debugPKG('WXA:Schedule');
 
+let globbySync;
 class Schedule {
     constructor(loader) {
         this.current = process.cwd();
@@ -212,6 +213,8 @@ class Schedule {
 
             // if module is app.json, then add Page entry points.
             if (dep.meta && dep.meta.source === this.APP_CONFIG_PATH) {
+                if (!globbySync) globbySync = (await import('globby')).globbySync;
+
                 let oldPages = new Map(this.$pageArray.entries());
                 let newPages = this.addPageEntryPoint();
                 newPages = new Map(newPages.map((page)=>[page.src, page]));
@@ -508,7 +511,7 @@ class Schedule {
 
             debug('page %s %s', wxaPage, page);
             let dr = new DependencyResolver(this.wxaConfigs.resolve, this.meta);
-            
+
             if (/.+(png|jpg|jpeg|webp|eot|woff|woff2|ttf|file')$/.test(page)) {
                 let src = path.join(this.meta.context, page);
                 try {
@@ -548,7 +551,7 @@ class Schedule {
                     logger.error(e);
                 }
             } else {
-                let sections = globby.sync(path.join(this.meta.context, page+'.*'));
+                let sections = globbySync(path.join(this.meta.context, page+'.*'));
 
                 sections.forEach((section)=>{
                     if (isFile(section)) {

diff --git a/packages/wxa-compiler-babel/.babelrc b/packages/wxa-compiler-babel/.babelrc
@@ -3,7 +3,8 @@
         "useBuiltIns": "usage",
         "targets": {
             "node": "8"
-        }
+        },
+        "corejs": "3.0"
     }]]
 }
 
diff --git a/packages/wxa-compiler-babel/package.json b/packages/wxa-compiler-babel/package.json
@@ -29,7 +29,8 @@
     "memfs": "^2.14.2"
   },
   "dependencies": {
-    "@babel/core": "^7.1.0",
+    "@babel/core": "^7.24.0",
+    "core-js": "^3.36.0",
     "debug": "^4.0.1",
     "find-cache-dir": "^2.0.0",
     "mkdirp": "^0.5.1",

diff --git a/packages/wxa-compiler-sass/package.json b/packages/wxa-compiler-sass/package.json
@@ -29,7 +29,7 @@
         "debug": "^4.0.1"
     },
     "dependencies": {
-        "sass": "^1.43.4"
+        "sass": "^1.72.0"
     },
     "publishConfig": {
         "access": "public"