@tarojs/helper 3.5.0-canary.0 → 3.5.0-theta.1

package/dist/babelRegister.js

@@ -1,6 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectDefineConfigHeader = void 0;
 const path = require("path");
+/**
+ * Inject `defineAppConfig` and `definePageConfig`
+ * require header at the top of a config file,
+ * without the need to specifically require them
+ * if they are used
+*/
+function injectDefineConfigHeader(babel) {
+    const appConfig = 'function defineAppConfig(config) { return config }';
+    const pageConfig = 'function definePageConfig(config) { return config }';
+    const prependHeader = (nodePath, header) => {
+        const parsedHeader = babel.parse(header, { filename: '' }).program.body[0];
+        nodePath.node.body.unshift(parsedHeader);
+    };
+    const enterHandler = (nodePath) => {
+        const { scope, node } = nodePath;
+        scope.traverse(node, {
+            CallExpression(p) {
+                const callee = p.node.callee;
+                // @ts-ignore
+                switch (callee.name) {
+                    case 'defineAppConfig':
+                        return prependHeader(nodePath, appConfig);
+                    case 'definePageConfig':
+                        return prependHeader(nodePath, pageConfig);
+                }
+            }
+        });
+    };
+    return {
+        visitor: {
+            Program: { enter: enterHandler }
+        }
+    };
+}
+exports.injectDefineConfigHeader = injectDefineConfigHeader;
 function createBabelRegister({ only }) {
     require('@babel/register')({
         only: Array.from(new Set([...only])),
@@ -9,6 +45,7 @@ function createBabelRegister({ only }) {
             require.resolve('@babel/preset-typescript')
         ],
         plugins: [
+            injectDefineConfigHeader,
             [require.resolve('@babel/plugin-proposal-decorators'), {
                     legacy: true
                 }],

package/dist/constants.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TARO_BASE_CONFIG = exports.TARO_CONFIG_FLODER = exports.DEFAULT_TEMPLATE_SRC_GITEE = exports.DEFAULT_TEMPLATE_SRC = exports.isWindows = exports.DEVICE_RATIO_NAME = exports.taroJsMobxCommon = exports.taroJsMobx = exports.taroJsRedux = exports.taroJsFramework = exports.taroJsQuickAppComponents = exports.taroJsComponents = exports.META_TYPE = exports.UPDATE_PACKAGE_LIST = exports.FILE_PROCESSOR_MAP = exports.DEVICE_RATIO = exports.PROJECT_CONFIG = exports.NODE_MODULES_REG = exports.NODE_MODULES = exports.CSS_IMPORT_REG = exports.REG_URL = exports.REG_WXML_IMPORT = exports.REG_TEMPLATE = exports.REG_UX = exports.REG_JSON = exports.REG_FONT = exports.REG_IMAGE = exports.REG_MEDIA = exports.REG_CSS = exports.REG_STYLE = exports.REG_STYLUS = exports.REG_LESS = exports.REG_SASS_SCSS = exports.REG_SASS_SASS = exports.REG_SASS = exports.REG_VUE = exports.REG_SCRIPTS = exports.REG_TYPESCRIPT = exports.REG_SCRIPT = exports.REG_JS = exports.VUE_EXT = exports.SCRIPT_EXT = exports.UX_EXT = exports.TS_EXT = exports.JS_EXT = exports.SCSS_EXT = exports.CSS_EXT = exports.processTypeMap = exports.processTypeEnum = exports.PLATFORMS = void 0;
+exports.TARO_BASE_CONFIG = exports.TARO_CONFIG_FOLDER = exports.DEFAULT_TEMPLATE_SRC_GITEE = exports.DEFAULT_TEMPLATE_SRC = exports.isWindows = exports.DEVICE_RATIO_NAME = exports.taroJsMobxCommon = exports.taroJsMobx = exports.taroJsRedux = exports.taroJsFramework = exports.taroJsQuickAppComponents = exports.taroJsComponents = exports.META_TYPE = exports.UPDATE_PACKAGE_LIST = exports.FILE_PROCESSOR_MAP = exports.DEVICE_RATIO = exports.PROJECT_CONFIG = exports.NODE_MODULES_REG = exports.NODE_MODULES = exports.CSS_IMPORT_REG = exports.REG_URL = exports.REG_WXML_IMPORT = exports.REG_TEMPLATE = exports.REG_UX = exports.REG_JSON = exports.REG_FONT = exports.REG_IMAGE = exports.REG_MEDIA = exports.REG_CSS = exports.REG_STYLE = exports.REG_STYLUS = exports.REG_LESS = exports.REG_SASS_SCSS = exports.REG_SASS_SASS = exports.REG_SASS = exports.REG_VUE = exports.REG_SCRIPTS = exports.REG_TYPESCRIPT = exports.REG_SCRIPT = exports.REG_JS = exports.VUE_EXT = exports.SCRIPT_EXT = exports.UX_EXT = exports.TS_EXT = exports.JS_EXT = exports.SCSS_EXT = exports.CSS_EXT = exports.processTypeMap = exports.processTypeEnum = exports.PLATFORMS = void 0;
 exports.FRAMEWORK_EXT_MAP = exports.FRAMEWORK_MAP = exports.ENTRY = exports.NPM_DIR = exports.TEMP_DIR = exports.SOURCE_DIR = exports.OUTPUT_DIR = void 0;
-const os = require("os");
 const chalk = require("chalk");
+const os = require("os");
 // eslint-disable-next-line dot-notation
 exports.PLATFORMS = global['PLATFORMS'] = global['PLATFORMS'] || {};
 var processTypeEnum;
@@ -126,10 +126,13 @@ exports.UPDATE_PACKAGE_LIST = [
     '@tarojs/cli',
     '@tarojs/components',
     '@tarojs/taro-h5',
+    '@tarojs/taro-rn',
+    '@tarojs/rn-runner',
     '@tarojs/helper',
     '@tarojs/taro-loader',
     '@tarojs/mini-runner',
     '@tarojs/react',
+    '@tarojs/plugin-framework-react',
     '@tarojs/router',
     '@tarojs/runner-utils',
     '@tarojs/runtime',
@@ -143,6 +146,7 @@ exports.UPDATE_PACKAGE_LIST = [
     '@tarojs/plugin-platform-tt',
     '@tarojs/plugin-platform-qq',
     '@tarojs/plugin-platform-jd',
+    '@tarojs/plugin-html',
     'nervjs',
     'nerv-devtools'
 ];
@@ -164,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_FOLDER = '.taro3.5';
 exports.TARO_BASE_CONFIG = 'index.json';
 exports.OUTPUT_DIR = 'dist';
 exports.SOURCE_DIR = 'src';

package/dist/index.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.helper = void 0;
-const fs = require("fs-extra");
 const chalk = require("chalk");
 const chokidar = require("chokidar");
-const debug_1 = require("debug");
+const fs = require("fs-extra");
+const babelRegister_1 = require("./babelRegister");
 const constants = require("./constants");
-const utils = require("./utils");
 const npm = require("./npm");
-const babelRegister_1 = require("./babelRegister");
+const swcRegister_1 = require("./swcRegister");
+const utils = require("./utils");
 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: debug_1.default });
+    chokidar, createDebug: id => require('debug')(id) });
 exports.default = exports.helper;

package/dist/npm.js

@@ -10,8 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNpmPkg = exports.getNpmPkgSync = exports.callPluginSync = exports.callPlugin = exports.installNpmPkg = exports.resolveNpmSync = exports.resolveNpm = exports.taroPluginPrefix = void 0;
-const resolvePath = require("resolve");
-const spawn = require("cross-spawn");
 const chalk = require("chalk");
 const Util = require("./utils");
 const PEERS = /UNMET PEER DEPENDENCY ([a-z\-0-9.]+)@(.+)/gm;
@@ -23,6 +21,7 @@ const defaultInstallOptions = {
 };
 exports.taroPluginPrefix = '@tarojs/plugin-';
 function resolveNpm(pluginName, root) {
+    const resolvePath = require('resolve');
     if (!npmCached[pluginName]) {
         return new Promise((resolve, reject) => {
             resolvePath(`${pluginName}`, { basedir: root }, (err, res) => {
@@ -38,6 +37,7 @@ function resolveNpm(pluginName, root) {
 }
 exports.resolveNpm = resolveNpm;
 function resolveNpmSync(pluginName, root) {
+    const resolvePath = require('resolve');
     try {
         if (!npmCached[pluginName]) {
             const res = resolvePath.sync(pluginName, { basedir: root });
@@ -103,6 +103,7 @@ function installNpmPkg(pkgList, options) {
             args.push('--save');
         }
     }
+    const spawn = require('cross-spawn');
     const output = spawn.sync(installer, args, {
         stdio: ['ignore', 'pipe', 'inherit']
     });

package/dist/swcRegister.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InjectDefineConfigHeader = void 0;
+const Visitor_js_1 = require("@swc/core/Visitor.js");
+class InjectDefineConfigHeader 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.InjectDefineConfigHeader = InjectDefineConfigHeader;
+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

@@ -9,18 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readConfig = exports.removeHeadSlash = exports.getModuleDefaultExport = exports.addPlatforms = exports.extnameExpRegOf = exports.readDirWithFileTypes = exports.getAllFilesInFloder = exports.unzip = exports.applyArrayedVisitors = exports.mergeVisitors = exports.recursiveMerge = exports.getInstalledNpmPkgVersion = exports.getInstalledNpmPkgPath = exports.pascalCase = exports.emptyDirectory = exports.cssImports = exports.generateConstantsList = exports.generateEnvList = exports.resolveScriptPath = exports.resolveMainFilePath = exports.isEmptyObject = exports.shouldUseCnpm = exports.shouldUseYarn = exports.getSystemUsername = exports.getConfig = exports.getTaroPath = exports.getUserHomeDir = exports.recursiveFindNodeModules = exports.printLog = exports.resolveStylePath = exports.promoteRelativePath = exports.replaceAliasPath = exports.isAliasPath = exports.isQuickAppPkg = exports.isNpmPkg = exports.isNodeModule = exports.normalizePath = void 0;
-const fs = require("fs-extra");
-const path = require("path");
-const os = require("os");
-const stream_1 = require("stream");
-const child_process = require("child_process");
+exports.readConfig = exports.readPageConfig = exports.removeHeadSlash = exports.getModuleDefaultExport = exports.addPlatforms = exports.extnameExpRegOf = exports.readDirWithFileTypes = exports.getAllFilesInFolder = exports.unzip = exports.applyArrayedVisitors = exports.mergeVisitors = exports.recursiveMerge = exports.getInstalledNpmPkgVersion = exports.getInstalledNpmPkgPath = exports.pascalCase = exports.emptyDirectory = exports.cssImports = exports.generateConstantsList = exports.generateEnvList = exports.resolveScriptPath = exports.resolveMainFilePath = exports.isEmptyObject = exports.shouldUseCnpm = exports.shouldUseYarn = exports.getSystemUsername = exports.getConfig = exports.getTaroPath = exports.getUserHomeDir = exports.recursiveFindNodeModules = exports.printLog = exports.resolveStylePath = exports.promoteRelativePath = exports.replaceAliasPath = exports.isAliasPath = exports.isQuickAppPkg = exports.isNpmPkg = exports.isNodeModule = exports.normalizePath = void 0;
 const chalk = require("chalk");
-const findWorkspaceRoot = require("find-yarn-workspace-root");
+const child_process = require("child_process");
+const fs = require("fs-extra");
 const lodash_1 = require("lodash");
-const yauzl = require("yauzl");
+const os = require("os");
+const path = require("path");
 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, '/');
@@ -119,6 +116,7 @@ function printLog(type, tag, filePath) {
 }
 exports.printLog = printLog;
 function recursiveFindNodeModules(filePath, lastFindPath) {
+    const findWorkspaceRoot = require('find-yarn-workspace-root');
     if (lastFindPath && (normalizePath(filePath) === normalizePath(lastFindPath))) {
         return filePath;
     }
@@ -155,7 +153,7 @@ function getUserHomeDir() {
 }
 exports.getUserHomeDir = getUserHomeDir;
 function getTaroPath() {
-    const taroPath = path.join(getUserHomeDir(), constants_1.TARO_CONFIG_FLODER);
+    const taroPath = path.join(getUserHomeDir(), constants_1.TARO_CONFIG_FOLDER);
     if (!fs.existsSync(taroPath)) {
         fs.ensureDirSync(taroPath);
     }
@@ -257,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 {
@@ -317,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');
@@ -338,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)
@@ -347,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') {
@@ -372,7 +370,7 @@ const mergeVisitors = (src, ...args) => {
                 return v;
             }
         });
-        return exports.mergeVisitors(newValue, newSrcValue);
+        return (0, exports.mergeVisitors)(newValue, newSrcValue);
     });
 };
 exports.mergeVisitors = mergeVisitors;
@@ -388,13 +386,15 @@ const applyArrayedVisitors = obj => {
             };
         }
         else if (typeof funcs === 'object') {
-            exports.applyArrayedVisitors(funcs);
+            (0, exports.applyArrayedVisitors)(funcs);
         }
     }
     return obj;
 };
 exports.applyArrayedVisitors = applyArrayedVisitors;
 function unzip(zipPath) {
+    const Transform = require('stream').Transform;
+    const yauzl = require('yauzl');
     return new Promise((resolve, reject) => {
         yauzl.open(zipPath, { lazyEntries: true }, (err, zipfile) => {
             if (err || !zipfile)
@@ -419,7 +419,7 @@ function unzip(zipPath) {
                     zipfile.openReadStream(entry, (err, readStream) => {
                         if (err || !readStream)
                             throw err;
-                        const filter = new stream_1.Transform();
+                        const filter = new Transform();
                         filter._transform = function (chunk, _encoding, cb) {
                             cb(undefined, chunk);
                         };
@@ -442,13 +442,13 @@ function unzip(zipPath) {
     });
 }
 exports.unzip = unzip;
-const getAllFilesInFloder = (floder, filter = []) => __awaiter(void 0, void 0, void 0, function* () {
+const getAllFilesInFolder = (folder, filter = []) => __awaiter(void 0, void 0, void 0, function* () {
     let files = [];
-    const list = readDirWithFileTypes(floder);
+    const list = readDirWithFileTypes(folder);
     yield Promise.all(list.map((item) => __awaiter(void 0, void 0, void 0, function* () {
-        const itemPath = path.join(floder, item.name);
+        const itemPath = path.join(folder, item.name);
         if (item.isDirectory) {
-            const _files = yield exports.getAllFilesInFloder(itemPath, filter);
+            const _files = yield (0, exports.getAllFilesInFolder)(itemPath, filter);
             files = [...files, ..._files];
         }
         else if (item.isFile) {
@@ -458,11 +458,11 @@ const getAllFilesInFloder = (floder, filter = []) => __awaiter(void 0, void 0, v
     })));
     return files;
 });
-exports.getAllFilesInFloder = getAllFilesInFloder;
-function readDirWithFileTypes(floder) {
-    const list = fs.readdirSync(floder);
+exports.getAllFilesInFolder = getAllFilesInFolder;
+function readDirWithFileTypes(folder) {
+    const list = fs.readdirSync(folder);
     const res = list.map(name => {
-        const stat = fs.statSync(path.join(floder, name));
+        const stat = fs.statSync(path.join(folder, name));
         return {
             name,
             isDirectory: stat.isDirectory(),
@@ -489,14 +489,148 @@ function removeHeadSlash(str) {
     return str.replace(/^(\/|\\)/, '');
 }
 exports.removeHeadSlash = removeHeadSlash;
+function analyzeImport(filePath) {
+    const parser = require('@babel/parser');
+    const traverse = require('@babel/traverse').default;
+    const code = fs.readFileSync(filePath).toString();
+    let importPaths = [];
+    filePath = path.dirname(filePath);
+    const ast = parser.parse(code, {
+        sourceType: 'module',
+        plugins: [
+            'typescript',
+            'classProperties',
+            'objectRestSpread',
+            'optionalChaining'
+        ]
+    });
+    traverse(ast, {
+        ImportDeclaration({ node }) {
+            const list = [];
+            const source = node.source.value;
+            if (path.extname(source)) {
+                const importPath = path.resolve(filePath, source);
+                list.push(importPath);
+            }
+            else {
+                ['.js', '.ts', '.json'].forEach(ext => {
+                    const importPath = path.resolve(filePath, source + ext);
+                    list.push(importPath);
+                });
+            }
+            const dep = list.find(importPath => fs.existsSync(importPath));
+            if (!dep)
+                return;
+            importPaths.push(dep);
+            if (path.extname(dep) !== '.json') {
+                importPaths = importPaths.concat(analyzeImport(dep));
+            }
+        }
+    });
+    return importPaths;
+}
+// converts ast nodes to js object
+function exprToObject(node) {
+    const types = ['BooleanLiteral', 'StringLiteral', 'NumericLiteral'];
+    if (types.includes(node.type)) {
+        return node.value;
+    }
+    if (node.name === 'undefined' && !node.value) {
+        return undefined;
+    }
+    if (node.type === 'NullLiteral') {
+        return null;
+    }
+    if (node.type === 'ObjectExpression') {
+        return genProps(node.properties);
+    }
+    if (node.type === 'ArrayExpression') {
+        return node.elements.reduce((acc, el) => [
+            ...acc,
+            ...(el.type === 'SpreadElement'
+                ? exprToObject(el.argument)
+                : [exprToObject(el)])
+        ], []);
+    }
+}
+// converts ObjectExpressions to js object
+function genProps(props) {
+    return props.reduce((acc, prop) => {
+        if (prop.type === 'SpreadElement') {
+            return Object.assign(Object.assign({}, acc), exprToObject(prop.argument));
+        }
+        else if (prop.type !== 'ObjectMethod') {
+            const v = exprToObject(prop.value);
+            if (v !== undefined) {
+                return Object.assign(Object.assign({}, acc), { [prop.key.name || prop.key.value]: v });
+            }
+        }
+        return acc;
+    }, {});
+}
+// read page config from a sfc file instead of the regular config file
+function readSFCPageConfig(configPath) {
+    if (!fs.existsSync(configPath))
+        return {};
+    const sfcSource = fs.readFileSync(configPath, 'utf8');
+    const dpcReg = /definePageConfig\(\{[\w\W]+?\}\)/g;
+    const matches = sfcSource.match(dpcReg);
+    let result = {};
+    if (matches && matches.length === 1) {
+        const callExprHandler = (p) => {
+            const { callee } = p.node;
+            if (!callee.name)
+                return;
+            if (callee.name && callee.name !== 'definePageConfig')
+                return;
+            const configNode = p.node.arguments[0];
+            result = exprToObject(configNode);
+            p.stop();
+        };
+        const configSource = matches[0];
+        const babel = require('@babel/core');
+        const ast = babel.parse(configSource, { filename: '' });
+        babel.traverse(ast.program, { CallExpression: callExprHandler });
+    }
+    return result;
+}
+function readPageConfig(configPath) {
+    let result = {};
+    const extNames = ['.js', '.jsx', '.ts', '.tsx', '.vue'];
+    // check source file extension
+    extNames.some(ext => {
+        const tempPath = configPath.replace('.config', ext);
+        if (fs.existsSync(tempPath)) {
+            try {
+                result = readSFCPageConfig(tempPath);
+            }
+            catch (error) {
+                result = {};
+            }
+            return true;
+        }
+    });
+    return result;
+}
+exports.readPageConfig = readPageConfig;
 function readConfig(configPath) {
     let result = {};
     if (fs.existsSync(configPath)) {
-        babelRegister_1.default({
-            only: [configPath]
+        const importPaths = constants_1.REG_SCRIPTS.test(configPath) ? analyzeImport(configPath) : [];
+        (0, swcRegister_1.default)({
+            only: [
+                configPath,
+                filepath => importPaths.includes(filepath)
+            ],
+            plugin: m => new swcRegister_1.InjectDefineConfigHeader().visitProgram(m)
+        });
+        importPaths.concat([configPath]).forEach(item => {
+            delete require.cache[item];
         });
-        delete require.cache[configPath];
-        result = exports.getModuleDefaultExport(require(configPath));
+        result = (0, exports.getModuleDefaultExport)(require(configPath));
+    }
+    else {
+        result = readPageConfig(configPath);
     }
     return result;
 }

package/index.js

@@ -1,2 +1,3 @@
 module.exports = require('./dist/index.js').default
+
 module.exports.default = module.exports

package/package.json

@@ -1,18 +1,9 @@
 {
   "name": "@tarojs/helper",
-  "version": "3.5.0-canary.0",
+  "version": "3.5.0-theta.1",
   "description": "Taro Helper",
   "main": "index.js",
   "types": "types/index.d.ts",
-  "scripts": {
-    "build": "run-s clean prod",
-    "dev": "tsc -w",
-    "prod": "tsc",
-    "clean": "rimraf dist",
-    "prepack": "npm run build",
-    "test": "jest",
-    "test:dev": "jest --watch"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/NervJS/taro.git"
@@ -40,7 +31,8 @@
     "@babel/preset-typescript": "^7.14.5",
     "@babel/register": "^7.14.5",
     "@babel/runtime": "^7.14.5",
-    "@tarojs/taro": "3.5.0-canary.0",
+    "@swc/core": "^1.2.204",
+    "@swc/register": "^0.1.10",
     "chalk": "3.0.0",
     "chokidar": "^3.3.1",
     "cross-spawn": "^7.0.3",
@@ -48,8 +40,15 @@
     "find-yarn-workspace-root": "2.0.0",
     "fs-extra": "^8.0.1",
     "lodash": "^4.17.21",
-    "resolve": "^1.6.0",
+    "resolve": "^1.22.0",
     "yauzl": "2.10.0"
   },
-  "gitHead": "a0222bc41bc05b0e34413d6db3de963d777a5015"
-}
+  "scripts": {
+    "build": "run-s clean prod",
+    "dev": "tsc -w",
+    "prod": "tsc",
+    "clean": "rimraf dist",
+    "test": "jest",
+    "test:dev": "jest --watch"
+  }
+}

package/types/babelRegister.d.ts

@@ -1,3 +1,6 @@
+import type { PluginItem } from '@babel/core'
+
 export default function createBabelRegister({ only }: {
     only: any;
 }): void;
+export function injectDefineConfigHeader (babel: any): PluginItem;

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_FOLDER = ".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

@@ -1,11 +1,13 @@
-import fs from 'fs-extra';
-import * as chokidar from 'chokidar';
-import createDebug from 'debug';
-import chalk from 'chalk';
-import { processTypeEnum, IProcessTypeMap } from './constants';
-import * as utils from './utils';
-import * as npm from './npm';
-import createBabelRegister from './babelRegister';
+import fs from 'fs-extra'
+import * as chokidar from 'chokidar'
+import createDebug from 'debug'
+import chalk from 'chalk'
+
+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',
@@ -25,121 +27,127 @@ export declare enum FRAMEWORK_MAP {
 }
 
 declare interface helper {
-  npm: typeof npm;
-  createBabelRegister: typeof createBabelRegister;
-  fs: typeof fs;
-  chokidar: typeof chokidar;
-  chalk: typeof chalk;
+  npm: typeof npm
+  createSwcRegister: typeof createSwcRegister
+  createBabelRegister: typeof createBabelRegister
+  injectDefineConfigHeader: typeof injectDefineConfigHeader
+  fs: typeof fs
+  chokidar: typeof chokidar
+  chalk: typeof chalk
   createDebug: createDebug.Debug & {
-    debug: createDebug.Debug;
-    default: createDebug.Debug;
-  };
-  normalizePath(path: string): string;
-  isNpmPkg(name: string): boolean;
-  isQuickAppPkg(name: string): boolean;
-  isAliasPath(name: string, pathAlias?: object): boolean;
-  replaceAliasPath(filePath: string, name: string, pathAlias?: object): string;
-  promoteRelativePath(fPath: string): string;
-  resolveStylePath(p: string): string;
-  printLog(type: processTypeEnum, tag: string, filePath?: string | undefined): void;
-  recursiveFindNodeModules(filePath: string): string;
-  getUserHomeDir(): string;
-  getTaroPath(): string;
-  getConfig(): object;
-  getSystemUsername(): string;
-  shouldUseYarn(): boolean;
-  shouldUseCnpm(): boolean;
-  isEmptyObject(obj: any): boolean;
-  resolveScriptPath(p: string): string;
+    debug: createDebug.Debug
+    default: createDebug.Debug
+  }
+  normalizePath(path: string): string
+  isNpmPkg(name: string): boolean
+  isQuickAppPkg(name: string): boolean
+  isAliasPath(name: string, pathAlias?: object): boolean
+  replaceAliasPath(filePath: string, name: string, pathAlias?: object): string
+  promoteRelativePath(fPath: string): string
+  resolveStylePath(p: string): string
+  printLog(type: processTypeEnum, tag: string, filePath?: string | undefined): void
+  recursiveFindNodeModules(filePath: string): string
+  getUserHomeDir(): string
+  getTaroPath(): string
+  getConfig(): object
+  getSystemUsername(): string
+  shouldUseYarn(): boolean
+  shouldUseCnpm(): boolean
+  isEmptyObject(obj: any): boolean
+  resolveScriptPath(p: string): string
   resolveMainFilePath(p: string, extArrs?: string[]): string
-  generateEnvList(env: object): object;
-  generateConstantsList(constants: object): object;
-  cssImports(content: string): string[];
-  emptyDirectory(dirPath: string, opts?: {
-    excludes: string[];
-  }): void;
-  getInstalledNpmPkgPath(pkgName: string, basedir: string): string | null;
-  getInstalledNpmPkgVersion(pkgName: string, basedir: string): string | null;
-  unzip(zipPath: any): Promise<unknown>;
-  getBabelConfig(babel: any): any;
-  readDirWithFileTypes(floder: string): utils.FileStat[];
-  extnameExpRegOf(filePath: string): RegExp;
-  addPlatforms(platform: string): void;
-  isNodeModule: (filename: string) => boolean;
-  pascalCase: (str: string) => string;
-  recursiveMerge: <T = any>(src: Partial<T>, ...args: (Partial<T> | undefined)[]) => any;
-  mergeVisitors: (src: any, ...args: any[]) => any;
-  applyArrayedVisitors: (obj: any) => any;
-  getAllFilesInFloder: (floder: string, filter?: string[]) => Promise<string[]>;
-  getModuleDefaultExport: (exports: any) => any;
-  removeHeadSlash: (str: string) => string;
-  readConfig: (configPath: string) => any;
-  PLATFORMS: any;
-  processTypeEnum: typeof processTypeEnum;
-  processTypeMap: IProcessTypeMap;
-  CSS_EXT: string[];
-  SCSS_EXT: string[];
-  JS_EXT: string[];
-  TS_EXT: string[];
-  UX_EXT: string[];
-  SCRIPT_EXT: string[];
-  VUE_EXT: string[];
-  REG_JS: RegExp;
-  REG_SCRIPT: RegExp;
-  REG_TYPESCRIPT: RegExp;
-  REG_SCRIPTS: RegExp;
-  REG_VUE: RegExp;
-  REG_SASS: RegExp;
-  REG_SASS_SASS: RegExp;
-  REG_SASS_SCSS: RegExp;
-  REG_LESS: RegExp;
-  REG_STYLUS: RegExp;
-  REG_STYLE: RegExp;
-  REG_CSS: RegExp;
-  REG_MEDIA: RegExp;
-  REG_IMAGE: RegExp;
-  REG_FONT: RegExp;
-  REG_JSON: RegExp;
-  REG_UX: RegExp;
-  REG_TEMPLATE: RegExp;
-  REG_WXML_IMPORT: RegExp;
-  REG_URL: RegExp;
-  CSS_IMPORT_REG: RegExp;
-  NODE_MODULES: "node_modules";
-  NODE_MODULES_REG: RegExp;
-  PROJECT_CONFIG: "config/index";
+  generateEnvList(env: object): object
+  generateConstantsList(constants: object): object
+  cssImports(content: string): string[]
+  emptyDirectory(
+    dirPath: string,
+    opts?: {
+      excludes: string[]
+    }
+  ): void
+  getInstalledNpmPkgPath(pkgName: string, basedir: string): string | null
+  getInstalledNpmPkgVersion(pkgName: string, basedir: string): string | null
+  unzip(zipPath: any): Promise<unknown>
+  getBabelConfig(babel: any): any
+  readDirWithFileTypes(folder: string): utils.FileStat[]
+  extnameExpRegOf(filePath: string): RegExp
+  addPlatforms(platform: string): void
+  isNodeModule: (filename: string) => boolean
+  pascalCase: (str: string) => string
+  recursiveMerge: <T = any>(src: Partial<T>, ...args: (Partial<T> | undefined)[]) => any
+  mergeVisitors: (src: any, ...args: any[]) => any
+  applyArrayedVisitors: (obj: any) => any
+  getAllFilesInFolder: (folder: string, filter?: string[]) => Promise<string[]>
+  getModuleDefaultExport: (exports: any) => any
+  removeHeadSlash: (str: string) => string
+  readConfig: (configPath: string) => any
+  readPageConfig: (configPath: string) => any
+  PLATFORMS: any
+  processTypeEnum: typeof processTypeEnum
+  processTypeMap: IProcessTypeMap
+  CSS_EXT: string[]
+  SCSS_EXT: string[]
+  JS_EXT: string[]
+  TS_EXT: string[]
+  UX_EXT: string[]
+  SCRIPT_EXT: string[]
+  VUE_EXT: string[]
+  REG_JS: RegExp
+  REG_SCRIPT: RegExp
+  REG_TYPESCRIPT: RegExp
+  REG_SCRIPTS: RegExp
+  REG_VUE: RegExp
+  REG_SASS: RegExp
+  REG_SASS_SASS: RegExp
+  REG_SASS_SCSS: RegExp
+  REG_LESS: RegExp
+  REG_STYLUS: RegExp
+  REG_STYLE: RegExp
+  REG_CSS: RegExp
+  REG_MEDIA: RegExp
+  REG_IMAGE: RegExp
+  REG_FONT: RegExp
+  REG_JSON: RegExp
+  REG_UX: RegExp
+  REG_TEMPLATE: RegExp
+  REG_WXML_IMPORT: RegExp
+  REG_URL: RegExp
+  CSS_IMPORT_REG: RegExp
+  NODE_MODULES: 'node_modules'
+  NODE_MODULES_REG: RegExp
+  PROJECT_CONFIG: 'config/index'
   DEVICE_RATIO: {
-    640: number;
-    750: number;
-    828: number;
-  };
+    640: number
+    750: number
+    828: number
+  }
   FILE_PROCESSOR_MAP: {
-    '.js': string;
-    '.scss': string;
-    '.sass': string;
-    '.less': string;
-    '.styl': string;
-  };
-  META_TYPE: typeof META_TYPE;
-  FRAMEWORK_MAP: typeof FRAMEWORK_MAP;
-  UPDATE_PACKAGE_LIST: string[];
-  taroJsComponents: "@tarojs/components";
-  taroJsQuickAppComponents: "@tarojs/components-qa";
-  taroJsFramework: "@tarojs/taro";
-  taroJsRedux: "@tarojs/redux";
-  taroJsMobx: "@tarojs/mobx";
-  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";
-  TARO_BASE_CONFIG: "index.json";
-  OUTPUT_DIR: "dist";
-  SOURCE_DIR: "src";
-  TEMP_DIR: ".temp";
-  NPM_DIR: "npm";
-  ENTRY: "app";
+    '.js': string
+    '.scss': string
+    '.sass': string
+    '.less': string
+    '.styl': string
+  }
+  META_TYPE: typeof META_TYPE
+  FRAMEWORK_MAP: typeof FRAMEWORK_MAP
+  UPDATE_PACKAGE_LIST: string[]
+  taroJsComponents: '@tarojs/components'
+  taroJsQuickAppComponents: '@tarojs/components-qa'
+  taroJsFramework: '@tarojs/taro'
+  taroJsRedux: '@tarojs/redux'
+  taroJsMobx: '@tarojs/mobx'
+  taroJsMobxCommon: '@tarojs/mobx-common'
+  DEVICE_RATIO_NAME: 'deviceRatio'
+  isWindows: boolean
+  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_FOLDER: '.taro3.5'
+  TARO_BASE_CONFIG: 'index.json'
+  OUTPUT_DIR: 'dist'
+  SOURCE_DIR: 'src'
+  TEMP_DIR: '.temp'
+  NPM_DIR: 'npm'
+  ENTRY: 'app'
   FRAMEWORK_EXT_MAP: Record<FRAMEWORK_MAP, string[]>
 }
 declare const helper: helper

package/types/swcRegister.d.ts

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

package/types/utils.d.ts

@@ -31,15 +31,16 @@ export declare const mergeVisitors: (src: any, ...args: any[]) => any;
 export declare const applyArrayedVisitors: (obj: any) => any;
 export declare function unzip(zipPath: any): Promise<unknown>;
 export declare function getBabelConfig(babel: any): any;
-export declare const getAllFilesInFloder: (floder: string, filter?: string[]) => Promise<string[]>;
+export declare const getAllFilesInFolder: (folder: string, filter?: string[]) => Promise<string[]>;
 export interface FileStat {
     name: string;
     isDirectory: boolean;
     isFile: boolean;
 }
-export declare function readDirWithFileTypes(floder: string): FileStat[];
+export declare function readDirWithFileTypes(folder: string): FileStat[];
 export declare function extnameExpRegOf(filePath: string): RegExp;
 export declare function addPlatforms(platform: string): void;
 export declare const getModuleDefaultExport: (exports: any) => any;
 export declare const removeHeadSlash: (str: string) => string;
 export declare const readConfig: (configPath: string) => any;
+export declare const readPageConfig: (configPath: string) => any;