@tarojs/helper 3.3.17 → 3.4.0-beta.2

package/dist/babelRegister.js

@@ -1,6 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 = 'const { defineAppConfig } = require("@tarojs/helper")';
+    const pageConfig = 'const { definePageConfig } = require("@tarojs/helper")';
+    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 }
+        }
+    };
+}
 function createBabelRegister({ only }) {
     require('@babel/register')({
         only: Array.from(new Set([...only])),
@@ -9,10 +43,10 @@ function createBabelRegister({ only }) {
             require.resolve('@babel/preset-typescript')
         ],
         plugins: [
+            injectDefineConfigHeader,
             [require.resolve('@babel/plugin-proposal-decorators'), {
                     legacy: true
                 }],
-            require.resolve('@babel/plugin-proposal-class-properties'),
             require.resolve('@babel/plugin-proposal-object-rest-spread'),
             [require.resolve('@babel/plugin-transform-runtime'), {
                     corejs: false,

package/dist/constants.js

@@ -164,9 +164,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.1';
-exports.DEFAULT_TEMPLATE_SRC_GITEE = 'direct:https://gitee.com/o2team/taro-project-templates.git#v3.1';
-exports.TARO_CONFIG_FLODER = '.taro3.1';
+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.TARO_BASE_CONFIG = 'index.json';
 exports.OUTPUT_DIR = 'dist';
 exports.SOURCE_DIR = 'src';

package/dist/utils.js

@@ -9,12 +9,14 @@ 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;
+exports.readConfig = exports.definePageConfig = exports.defineAppConfig = 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");
+const parser = require("@babel/parser");
+const traverse_1 = require("@babel/traverse");
 const chalk = require("chalk");
 const findWorkspaceRoot = require("find-yarn-workspace-root");
 const lodash_1 = require("lodash");
@@ -57,7 +59,7 @@ function replaceAliasPath(filePath, name, pathAlias = {}) {
         return promoteRelativePath(path.relative(filePath, fs.realpathSync(resolveScriptPath(pathAlias[name]))));
     }
     const reg = new RegExp(`^(${prefixs.join('|')})/(.*)`);
-    name = name.replace(reg, function (m, $1, $2) {
+    name = name.replace(reg, function (_m, $1, $2) {
         return promoteRelativePath(path.relative(filePath, path.join(pathAlias[$1], $2)));
     });
     return name;
@@ -397,7 +399,7 @@ exports.applyArrayedVisitors = applyArrayedVisitors;
 function unzip(zipPath) {
     return new Promise((resolve, reject) => {
         yauzl.open(zipPath, { lazyEntries: true }, (err, zipfile) => {
-            if (err)
+            if (err || !zipfile)
                 throw err;
             zipfile.on('close', () => {
                 fs.removeSync(zipPath);
@@ -417,10 +419,10 @@ function unzip(zipPath) {
                 }
                 else {
                     zipfile.openReadStream(entry, (err, readStream) => {
-                        if (err)
+                        if (err || !readStream)
                             throw err;
                         const filter = new stream_1.Transform();
-                        filter._transform = function (chunk, encoding, cb) {
+                        filter._transform = function (chunk, _encoding, cb) {
                             cb(undefined, chunk);
                         };
                         filter._flush = function (cb) {
@@ -489,15 +491,146 @@ function removeHeadSlash(str) {
     return str.replace(/^(\/|\\)/, '');
 }
 exports.removeHeadSlash = removeHeadSlash;
+function defineAppConfig(config) {
+    return config;
+}
+exports.defineAppConfig = defineAppConfig;
+function definePageConfig(config) {
+    return config;
+}
+exports.definePageConfig = definePageConfig;
+function analyzeImport(filePath) {
+    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_1.default(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);
+            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 readConfig(configPath) {
     let result = {};
     if (fs.existsSync(configPath)) {
+        const importPaths = analyzeImport(configPath);
         babelRegister_1.default({
-            only: [configPath]
+            only: [
+                configPath,
+                filepath => importPaths.includes(filepath)
+            ]
+        });
+        importPaths.concat([configPath]).forEach(item => {
+            delete require.cache[item];
         });
-        delete require.cache[configPath];
         result = exports.getModuleDefaultExport(require(configPath));
     }
+    else {
+        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.readConfig = readConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/helper",
-  "version": "3.3.17",
+  "version": "3.4.0-beta.2",
   "description": "Taro Helper",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -32,25 +32,24 @@
   },
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
-    "@babel/core": "^7.11.1",
-    "@babel/plugin-proposal-class-properties": "7.10.4",
-    "@babel/plugin-proposal-decorators": "7.10.5",
-    "@babel/plugin-proposal-object-rest-spread": "7.14.7",
-    "@babel/plugin-transform-runtime": "7.11.0",
-    "@babel/preset-env": "^7.11.0",
-    "@babel/preset-typescript": "7.12.17",
-    "@babel/register": "7.14.5",
-    "@babel/runtime": "^7.9.2",
-    "@tarojs/taro": "3.3.17",
+    "@babel/core": "^7.14.5",
+    "@babel/plugin-proposal-decorators": "^7.14.5",
+    "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
+    "@babel/plugin-transform-runtime": "^7.14.5",
+    "@babel/preset-env": "^7.14.5",
+    "@babel/preset-typescript": "^7.14.5",
+    "@babel/register": "^7.14.5",
+    "@babel/runtime": "^7.14.5",
+    "@tarojs/taro": "3.4.0-beta.2",
     "chalk": "3.0.0",
-    "chokidar": "3.3.1",
-    "cross-spawn": "7.0.3",
+    "chokidar": "^3.3.1",
+    "cross-spawn": "^7.0.3",
     "debug": "4.1.1",
     "find-yarn-workspace-root": "2.0.0",
-    "fs-extra": "8.1.0",
-    "lodash": "4.17.21",
-    "resolve": "1.15.1",
+    "fs-extra": "^8.0.1",
+    "lodash": "^4.17.21",
+    "resolve": "^1.6.0",
     "yauzl": "2.10.0"
   },
-  "gitHead": "3f3ce5f66d370b1982a30e4a5f2c8eb383652063"
+  "gitHead": "ac3eb29f11aec15d25e061775d9e970efabc2c98"
 }

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";
-export declare const DEFAULT_TEMPLATE_SRC_GITEE = "direct:https://gitee.com/o2team/taro-project-templates.git#v3";
-export declare const TARO_CONFIG_FLODER = ".taro3";
+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 TARO_BASE_CONFIG = "index.json";
 export declare const OUTPUT_DIR = "dist";
 export declare const SOURCE_DIR = "src";