@tarojs/helper 3.5.0-beta.0 → 3.5.0-beta.1

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;
@@ -170,7 +170,7 @@ exports.DEVICE_RATIO_NAME = 'deviceRatio';
 exports.isWindows = os.platform() === 'win32';
 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_CONFIG_FOLDER = '.taro3.5';
 exports.TARO_BASE_CONFIG = 'index.json';
 exports.OUTPUT_DIR = 'dist';
 exports.SOURCE_DIR = 'src';

package/dist/swcRegister.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectDefinConfigHeader = void 0;
+exports.InjectDefineConfigHeader = void 0;
 const Visitor_js_1 = require("@swc/core/Visitor.js");
-class InjectDefinConfigHeader extends Visitor_js_1.Visitor {
+class InjectDefineConfigHeader extends Visitor_js_1.Visitor {
     visitTsType(expression) {
         return expression;
     }
@@ -14,7 +14,7 @@ class InjectDefinConfigHeader extends Visitor_js_1.Visitor {
         return expression;
     }
 }
-exports.InjectDefinConfigHeader = InjectDefinConfigHeader;
+exports.InjectDefineConfigHeader = InjectDefineConfigHeader;
 function createSwcRegister({ only, plugin }) {
     const config = {
         only: Array.from(new Set([...only])),

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.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;
+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 child_process = require("child_process");
 const fs = require("fs-extra");
@@ -153,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);
     }
@@ -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 (0, 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(),
@@ -622,7 +622,7 @@ function readConfig(configPath) {
                 configPath,
                 filepath => importPaths.includes(filepath)
             ],
-            plugin: m => new swcRegister_1.InjectDefinConfigHeader().visitProgram(m)
+            plugin: m => new swcRegister_1.InjectDefineConfigHeader().visitProgram(m)
         });
         importPaths.concat([configPath]).forEach(item => {
             delete require.cache[item];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/helper",
-  "version": "3.5.0-beta.0",
+  "version": "3.5.0-beta.1",
   "description": "Taro Helper",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -42,7 +42,7 @@
     "@babel/runtime": "^7.14.5",
     "@swc/core": "^1.2.147",
     "@swc/register": "^0.1.10",
-    "@tarojs/taro": "3.5.0-beta.0",
+    "@tarojs/taro": "3.5.0-beta.1",
     "chalk": "3.0.0",
     "chokidar": "^3.3.1",
     "cross-spawn": "^7.0.3",
@@ -53,5 +53,5 @@
     "resolve": "^1.6.0",
     "yauzl": "2.10.0"
   },
-  "gitHead": "ee17506905a260bacd1aa6217a2376ba7bb8200f"
+  "gitHead": "ba9d945ccebb86f06edb7f845110526d92dc7b00"
 }

package/types/constants.d.ts

@@ -75,7 +75,7 @@ export declare const DEVICE_RATIO_NAME = "deviceRatio";
 export declare const isWindows: boolean;
 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_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,12 +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, { injectDefineConfigHeader } from './babelRegister';
-import createSwcRegister from './swcRegister';
+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',
@@ -26,124 +27,127 @@ export declare enum FRAMEWORK_MAP {
 }
 
 declare interface helper {
-  npm: typeof npm;
-  createSwcRegister: typeof createSwcRegister;
-  createBabelRegister: typeof createBabelRegister;
-  injectDefineConfigHeader: typeof injectDefineConfigHeader;
-  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;
-  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";
+  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.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";
-  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/utils.d.ts

@@ -31,13 +31,13 @@ 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;