@tarojs/helper 3.4.8 → 3.5.0-alpha.10

package/dist/constants.js

@@ -168,9 +168,9 @@ exports.taroJsMobx = '@tarojs/mobx';
 exports.taroJsMobxCommon = '@tarojs/mobx-common';
 exports.DEVICE_RATIO_NAME = 'deviceRatio';
 exports.isWindows = os.platform() === 'win32';
-exports.DEFAULT_TEMPLATE_SRC = 'github:NervJS/taro-project-templates#v3.4';
-exports.DEFAULT_TEMPLATE_SRC_GITEE = 'direct:https://gitee.com/o2team/taro-project-templates.git#v3.4';
-exports.TARO_CONFIG_FLODER = '.taro3.4';
+exports.DEFAULT_TEMPLATE_SRC = 'github:NervJS/taro-project-templates#v3.5';
+exports.DEFAULT_TEMPLATE_SRC_GITEE = 'direct:https://gitee.com/o2team/taro-project-templates.git#v3.5';
+exports.TARO_CONFIG_FLODER = '.taro3.5';
 exports.TARO_BASE_CONFIG = 'index.json';
 exports.OUTPUT_DIR = 'dist';
 exports.SOURCE_DIR = 'src';

package/dist/index.js

@@ -8,9 +8,11 @@ const constants = require("./constants");
 const utils = require("./utils");
 const npm = require("./npm");
 const babelRegister_1 = require("./babelRegister");
+const swcRegister_1 = require("./swcRegister");
 exports.helper = Object.assign(Object.assign(Object.assign({}, constants), utils), { npm,
     createBabelRegister: babelRegister_1.default,
     injectDefineConfigHeader: babelRegister_1.injectDefineConfigHeader,
+    createSwcRegister: swcRegister_1.default,
     fs,
     chalk,
     chokidar, createDebug: id => require('debug')(id) });

package/dist/swcRegister.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InjectDefinConfigHeader = void 0;
+const Visitor_js_1 = require("@swc/core/Visitor.js");
+class InjectDefinConfigHeader extends Visitor_js_1.Visitor {
+    visitTsType(expression) {
+        return expression;
+    }
+    visitCallExpression(expression) {
+        const callee = expression.callee;
+        if (callee.type === 'Identifier' && (callee.value === 'definePageConfig' || callee.value === 'defineAppConfig')) {
+            return expression.arguments[0].expression;
+        }
+        return expression;
+    }
+}
+exports.InjectDefinConfigHeader = InjectDefinConfigHeader;
+function createSwcRegister({ only, plugin }) {
+    const config = {
+        only: Array.from(new Set([...only])),
+        jsc: {
+            parser: {
+                syntax: 'typescript',
+                decorators: true
+            },
+            transform: {
+                legacyDecorator: true
+            }
+        },
+        module: {
+            type: 'commonjs'
+        }
+    };
+    if (plugin)
+        config.plugin = plugin;
+    require('@swc/register')(config);
+}
+exports.default = createSwcRegister;

package/dist/utils.js

@@ -17,7 +17,7 @@ const child_process = require("child_process");
 const chalk = require("chalk");
 const lodash_1 = require("lodash");
 const constants_1 = require("./constants");
-const babelRegister_1 = require("./babelRegister");
+const swcRegister_1 = require("./swcRegister");
 const execSync = child_process.execSync;
 function normalizePath(path) {
     return path.replace(/\\/g, '/').replace(/\/{2,}/g, '/');
@@ -255,7 +255,7 @@ function generateConstantsList(constants) {
     const res = {};
     if (constants && !isEmptyObject(constants)) {
         for (const key in constants) {
-            if (lodash_1.isPlainObject(constants[key])) {
+            if ((0, lodash_1.isPlainObject)(constants[key])) {
                 res[key] = generateConstantsList(constants[key]);
             }
             else {
@@ -315,7 +315,7 @@ function emptyDirectory(dirPath, opts = { excludes: [] }) {
 }
 exports.emptyDirectory = emptyDirectory;
 /* eslint-enable */
-const pascalCase = (str) => str.charAt(0).toUpperCase() + lodash_1.camelCase(str.substr(1));
+const pascalCase = (str) => str.charAt(0).toUpperCase() + (0, lodash_1.camelCase)(str.substr(1));
 exports.pascalCase = pascalCase;
 function getInstalledNpmPkgPath(pkgName, basedir) {
     const resolvePath = require('resolve');
@@ -336,7 +336,7 @@ function getInstalledNpmPkgVersion(pkgName, basedir) {
 }
 exports.getInstalledNpmPkgVersion = getInstalledNpmPkgVersion;
 const recursiveMerge = (src, ...args) => {
-    return lodash_1.mergeWith(src, ...args, (value, srcValue) => {
+    return (0, lodash_1.mergeWith)(src, ...args, (value, srcValue) => {
         const typeValue = typeof value;
         const typeSrcValue = typeof srcValue;
         if (typeValue !== typeSrcValue)
@@ -345,20 +345,20 @@ const recursiveMerge = (src, ...args) => {
             return value.concat(srcValue);
         }
         if (typeValue === 'object') {
-            return exports.recursiveMerge(value, srcValue);
+            return (0, exports.recursiveMerge)(value, srcValue);
         }
     });
 };
 exports.recursiveMerge = recursiveMerge;
 const mergeVisitors = (src, ...args) => {
     const validFuncs = ['exit', 'enter'];
-    return lodash_1.mergeWith(src, ...args, (value, srcValue, key, object, srcObject) => {
+    return (0, lodash_1.mergeWith)(src, ...args, (value, srcValue, key, object, srcObject) => {
         if (!object.hasOwnProperty(key) || !srcObject.hasOwnProperty(key)) {
             return undefined;
         }
         const shouldMergeToArray = validFuncs.indexOf(key) > -1;
         if (shouldMergeToArray) {
-            return lodash_1.flatMap([value, srcValue]);
+            return (0, lodash_1.flatMap)([value, srcValue]);
         }
         const [newValue, newSrcValue] = [value, srcValue].map(v => {
             if (typeof v === 'function') {
@@ -370,7 +370,7 @@ const mergeVisitors = (src, ...args) => {
                 return v;
             }
         });
-        return exports.mergeVisitors(newValue, newSrcValue);
+        return (0, exports.mergeVisitors)(newValue, newSrcValue);
     });
 };
 exports.mergeVisitors = mergeVisitors;
@@ -386,7 +386,7 @@ const applyArrayedVisitors = obj => {
             };
         }
         else if (typeof funcs === 'object') {
-            exports.applyArrayedVisitors(funcs);
+            (0, exports.applyArrayedVisitors)(funcs);
         }
     }
     return obj;
@@ -448,7 +448,7 @@ const getAllFilesInFloder = (floder, filter = []) => __awaiter(void 0, void 0, v
     yield Promise.all(list.map((item) => __awaiter(void 0, void 0, void 0, function* () {
         const itemPath = path.join(floder, item.name);
         if (item.isDirectory) {
-            const _files = yield exports.getAllFilesInFloder(itemPath, filter);
+            const _files = yield (0, exports.getAllFilesInFloder)(itemPath, filter);
             files = [...files, ..._files];
         }
         else if (item.isFile) {
@@ -615,16 +615,17 @@ function readConfig(configPath) {
     let result = {};
     if (fs.existsSync(configPath)) {
         const importPaths = constants_1.REG_SCRIPTS.test(configPath) ? analyzeImport(configPath) : [];
-        babelRegister_1.default({
+        (0, swcRegister_1.default)({
             only: [
                 configPath,
                 filepath => importPaths.includes(filepath)
-            ]
+            ],
+            plugin: m => new swcRegister_1.InjectDefinConfigHeader().visitProgram(m)
         });
         importPaths.concat([configPath]).forEach(item => {
             delete require.cache[item];
         });
-        result = exports.getModuleDefaultExport(require(configPath));
+        result = (0, exports.getModuleDefaultExport)(require(configPath));
     }
     else {
         result = readPageConfig(configPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/helper",
-  "version": "3.4.8",
+  "version": "3.5.0-alpha.10",
   "description": "Taro Helper",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -40,7 +40,9 @@
     "@babel/preset-typescript": "^7.14.5",
     "@babel/register": "^7.14.5",
     "@babel/runtime": "^7.14.5",
-    "@tarojs/taro": "3.4.8",
+    "@swc/core": "^1.2.147",
+    "@swc/register": "^0.1.10",
+    "@tarojs/taro": "3.5.0-alpha.10",
     "chalk": "3.0.0",
     "chokidar": "^3.3.1",
     "cross-spawn": "^7.0.3",
@@ -51,5 +53,5 @@
     "resolve": "^1.6.0",
     "yauzl": "2.10.0"
   },
-  "gitHead": "a025bcbb226ed3d01ed218c269a05d2e98109a46"
+  "gitHead": "8569f73a71cd11c697e66662d584c17175c7343b"
 }

package/types/constants.d.ts

@@ -73,9 +73,9 @@ export declare const taroJsMobx = "@tarojs/mobx";
 export declare const taroJsMobxCommon = "@tarojs/mobx-common";
 export declare const DEVICE_RATIO_NAME = "deviceRatio";
 export declare const isWindows: boolean;
-export declare const DEFAULT_TEMPLATE_SRC = "github:NervJS/taro-project-templates#v3.4";
-export declare const DEFAULT_TEMPLATE_SRC_GITEE = "direct:https://gitee.com/o2team/taro-project-templates.git#v3.4";
-export declare const TARO_CONFIG_FLODER = ".taro3.4";
+export declare const DEFAULT_TEMPLATE_SRC = "github:NervJS/taro-project-templates#v3.5";
+export declare const DEFAULT_TEMPLATE_SRC_GITEE = "direct:https://gitee.com/o2team/taro-project-templates.git#v3.5";
+export declare const TARO_CONFIG_FLODER = ".taro3.5";
 export declare const TARO_BASE_CONFIG = "index.json";
 export declare const OUTPUT_DIR = "dist";
 export declare const SOURCE_DIR = "src";

package/types/index.d.ts

@@ -6,6 +6,7 @@ import { processTypeEnum, IProcessTypeMap } from './constants';
 import * as utils from './utils';
 import * as npm from './npm';
 import createBabelRegister, { injectDefineConfigHeader } from './babelRegister';
+import createSwcRegister from './swcRegister';
 
 export declare enum META_TYPE {
   ENTRY = 'ENTRY',
@@ -26,6 +27,7 @@ export declare enum FRAMEWORK_MAP {
 
 declare interface helper {
   npm: typeof npm;
+  createSwcRegister: typeof createSwcRegister;
   createBabelRegister: typeof createBabelRegister;
   injectDefineConfigHeader: typeof injectDefineConfigHeader;
   fs: typeof fs;
@@ -133,9 +135,9 @@ declare interface helper {
   taroJsMobxCommon: "@tarojs/mobx-common";
   DEVICE_RATIO_NAME: "deviceRatio";
   isWindows: boolean;
-  DEFAULT_TEMPLATE_SRC: "github:NervJS/taro-project-templates#v3.1";
-  DEFAULT_TEMPLATE_SRC_GITEE: "direct:https://gitee.com/o2team/taro-project-templates.git#v3.1";
-  TARO_CONFIG_FLODER: ".taro3.1";
+  DEFAULT_TEMPLATE_SRC: "github:NervJS/taro-project-templates#v3.5";
+  DEFAULT_TEMPLATE_SRC_GITEE: "direct:https://gitee.com/o2team/taro-project-templates.git#v3.5";
+  TARO_CONFIG_FLODER: ".taro3.5";
   TARO_BASE_CONFIG: "index.json";
   OUTPUT_DIR: "dist";
   SOURCE_DIR: "src";

package/types/swcRegister.d.ts

@@ -0,0 +1,3 @@
+export default function createSwcRegister({ only }: {
+    only: any;
+}): void;