@tarojs/helper 3.4.0-beta.3 → 3.5.0-canary.1

package/dist/babelRegister.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.injectDefineConfigHeader = void 0;
 const path = require("path");
 /**
  * Inject `defineAppConfig` and `definePageConfig`
@@ -8,8 +9,8 @@ const path = require("path");
  * if they are used
 */
 function injectDefineConfigHeader(babel) {
-    const appConfig = 'const { defineAppConfig } = require("@tarojs/helper")';
-    const pageConfig = 'const { definePageConfig } = require("@tarojs/helper")';
+    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);
@@ -35,6 +36,7 @@ function injectDefineConfigHeader(babel) {
         }
     };
 }
+exports.injectDefineConfigHeader = injectDefineConfigHeader;
 function createBabelRegister({ only }) {
     require('@babel/register')({
         only: Array.from(new Set([...only])),

package/dist/index.js

@@ -11,6 +11,7 @@ const npm = require("./npm");
 const babelRegister_1 = require("./babelRegister");
 exports.helper = Object.assign(Object.assign(Object.assign({}, constants), utils), { npm,
     createBabelRegister: babelRegister_1.default,
+    injectDefineConfigHeader: babelRegister_1.injectDefineConfigHeader,
     fs,
     chalk,
     chokidar,

package/dist/utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.readConfig = exports.readPageConfig = 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");
@@ -491,14 +491,6 @@ 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 = [];
@@ -600,6 +592,25 @@ function readSFCPageConfig(configPath) {
     }
     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)) {
@@ -616,20 +627,7 @@ function readConfig(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;
-            }
-        });
+        result = readPageConfig(configPath);
     }
     return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/helper",
-  "version": "3.4.0-beta.3",
+  "version": "3.5.0-canary.1",
   "description": "Taro Helper",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -40,7 +40,7 @@
     "@babel/preset-typescript": "^7.14.5",
     "@babel/register": "^7.14.5",
     "@babel/runtime": "^7.14.5",
-    "@tarojs/taro": "3.4.0-beta.3",
+    "@tarojs/taro": "3.5.0-canary.1",
     "chalk": "3.0.0",
     "chokidar": "^3.3.1",
     "cross-spawn": "^7.0.3",
@@ -51,5 +51,5 @@
     "resolve": "^1.6.0",
     "yauzl": "2.10.0"
   },
-  "gitHead": "2ef7e8c10c9e5784e98bb1ad3a803d5fd6a46c8b"
+  "gitHead": "c61624d2f763e6d31e67d6cf9c564efc8b0d0887"
 }

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/index.d.ts

@@ -5,7 +5,7 @@ import chalk from 'chalk';
 import { processTypeEnum, IProcessTypeMap } from './constants';
 import * as utils from './utils';
 import * as npm from './npm';
-import createBabelRegister from './babelRegister';
+import createBabelRegister, { injectDefineConfigHeader } from './babelRegister';
 
 export declare enum META_TYPE {
   ENTRY = 'ENTRY',
@@ -27,6 +27,7 @@ export declare enum FRAMEWORK_MAP {
 declare interface helper {
   npm: typeof npm;
   createBabelRegister: typeof createBabelRegister;
+  injectDefineConfigHeader: typeof injectDefineConfigHeader;
   fs: typeof fs;
   chokidar: typeof chokidar;
   chalk: typeof chalk;
@@ -74,6 +75,7 @@ declare interface helper {
   getModuleDefaultExport: (exports: any) => any;
   removeHeadSlash: (str: string) => string;
   readConfig: (configPath: string) => any;
+  readPageConfig: (configPath: string) => any;
   PLATFORMS: any;
   processTypeEnum: typeof processTypeEnum;
   processTypeMap: IProcessTypeMap;

package/types/utils.d.ts

@@ -43,3 +43,4 @@ 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;