@tarojs/helper 2.2.17 → 2.2.19

package/dist/utils.js

@@ -46,14 +46,14 @@ function isAliasPath(name, pathAlias = {}) {
     return prefixs.includes(name) || (new RegExp(`^(${prefixs.join('|')})/`).test(name));
 }
 exports.isAliasPath = isAliasPath;
-function replaceAliasPath(filePath, name, pathAlias = {}) {
+function replaceAliasPath(filePath, name, pathAlias = {}, env) {
     // 后续的 path.join 在遇到符号链接时将会解析为真实路径，如果
     // 这里的 filePath 没有做同样的处理，可能会导致 import 指向
     // 源代码文件，导致文件被意外修改
     filePath = fs.realpathSync(filePath);
     const prefixs = Object.keys(pathAlias);
     if (prefixs.includes(name)) {
-        return promoteRelativePath(path.relative(filePath, fs.realpathSync(resolveScriptPath(pathAlias[name]))));
+        return promoteRelativePath(path.relative(filePath, fs.realpathSync(resolveScriptPath(pathAlias[name], env))));
     }
     const reg = new RegExp(`^(${prefixs.join('|')})/(.*)`);
     name = name.replace(reg, function (m, $1, $2) {
@@ -207,9 +207,13 @@ function isEmptyObject(obj) {
     return true;
 }
 exports.isEmptyObject = isEmptyObject;
-function resolveScriptPath(p) {
+function resolveScriptPath(p, env) {
     const realPath = p;
-    const taroEnv = process.env.TARO_ENV;
+    let taroEnv = env || process.env.TARO_ENV || '';
+    // Note: H5 在拷贝文件时做了处理，不需要额外的转换
+    if (['h5'].includes(taroEnv)) {
+        taroEnv = '';
+    }
     const SCRIPT_EXT = constants_1.JS_EXT.concat(constants_1.TS_EXT);
     for (let i = 0; i < SCRIPT_EXT.length; i++) {
         const item = SCRIPT_EXT[i];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/helper",
-  "version": "2.2.17",
+  "version": "2.2.19",
   "description": "Taro Helper",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -44,7 +44,7 @@
     "@babel/preset-typescript": "7.9.0",
     "@babel/register": "7.9.0",
     "@babel/runtime": "7.9.2",
-    "@tarojs/taro": "2.2.17",
+    "@tarojs/taro": "2.2.19",
     "babel-plugin-transform-react-jsx": "^6.24.1",
     "chalk": "3.0.0",
     "chokidar": "3.3.1",
@@ -64,5 +64,5 @@
     "ts-jest": "25.2.1",
     "typescript": "^3.4.5"
   },
-  "gitHead": "fda556eb8205ed58fd6594dc5dca7e5100d759a5"
+  "gitHead": "64d57843cb01f25d9dc738ad26765e7c52cae8e6"
 }

package/src/utils.ts

@@ -49,7 +49,7 @@ export function isAliasPath (name: string, pathAlias: object = {}): boolean {
   return prefixs.includes(name) || (new RegExp(`^(${prefixs.join('|')})/`).test(name))
 }
 
-export function replaceAliasPath (filePath: string, name: string, pathAlias: object = {}) {
+export function replaceAliasPath (filePath: string, name: string, pathAlias: object = {}, env?: string) {
   // 后续的 path.join 在遇到符号链接时将会解析为真实路径，如果
   // 这里的 filePath 没有做同样的处理，可能会导致 import 指向
   // 源代码文件，导致文件被意外修改
@@ -57,7 +57,7 @@ export function replaceAliasPath (filePath: string, name: string, pathAlias: obj
 
   const prefixs = Object.keys(pathAlias)
   if (prefixs.includes(name)) {
-    return promoteRelativePath(path.relative(filePath, fs.realpathSync(resolveScriptPath(pathAlias[name]))))
+    return promoteRelativePath(path.relative(filePath, fs.realpathSync(resolveScriptPath(pathAlias[name], env))))
   }
   const reg = new RegExp(`^(${prefixs.join('|')})/(.*)`)
   name = name.replace(reg, function (m, $1, $2) {
@@ -212,9 +212,13 @@ export function isEmptyObject (obj: any): boolean {
   return true
 }
 
-export function resolveScriptPath (p: string): string {
+export function resolveScriptPath (p: string, env?: string): string {
   const realPath = p
-  const taroEnv = process.env.TARO_ENV
+  let taroEnv = env || process.env.TARO_ENV || ''
+  // Note: H5 在拷贝文件时做了处理，不需要额外的转换
+  if (['h5'].includes(taroEnv)) {
+    taroEnv = ''
+  }
   const SCRIPT_EXT = JS_EXT.concat(TS_EXT)
   for (let i = 0; i < SCRIPT_EXT.length; i++) {
     const item = SCRIPT_EXT[i]

package/types/index.d.ts

@@ -29,7 +29,7 @@ declare interface helper {
   isNpmPkg(name: string): boolean;
   isQuickAppPkg(name: string): boolean;
   isAliasPath(name: string, pathAlias?: object): boolean;
-  replaceAliasPath(filePath: string, name: string, pathAlias?: object): string;
+  replaceAliasPath(filePath: string, name: string, pathAlias?: object, env?: string): string;
   promoteRelativePath(fPath: string): string;
   resolveStylePath(p: string): string;
   printLog(type: processTypeEnum, tag: string, filePath?: string | undefined): void;
@@ -41,7 +41,7 @@ declare interface helper {
   shouldUseYarn(): boolean;
   shouldUseCnpm(): boolean;
   isEmptyObject(obj: any): boolean;
-  resolveScriptPath(p: string): string;
+  resolveScriptPath(p: string, env?: string): string;
   generateEnvList(env: object): object;
   generateConstantsList(constants: object): object;
   cssImports(content: string): string[];

package/types/utils.d.ts

@@ -4,7 +4,7 @@ export declare const isNodeModule: (filename: string) => boolean;
 export declare function isNpmPkg(name: string): boolean;
 export declare function isQuickAppPkg(name: string): boolean;
 export declare function isAliasPath(name: string, pathAlias?: object): boolean;
-export declare function replaceAliasPath(filePath: string, name: string, pathAlias?: object): string;
+export declare function replaceAliasPath(filePath: string, name: string, pathAlias?: object, env?: string): string;
 export declare function promoteRelativePath(fPath: string): string;
 export declare function resolveStylePath(p: string): string;
 export declare function printLog(type: processTypeEnum, tag: string, filePath?: string): void;
@@ -16,7 +16,7 @@ export declare function getSystemUsername(): string;
 export declare function shouldUseYarn(): boolean;
 export declare function shouldUseCnpm(): boolean;
 export declare function isEmptyObject(obj: any): boolean;
-export declare function resolveScriptPath(p: string): string;
+export declare function resolveScriptPath(p: string, env?: string): string;
 export declare function generateEnvList(env: object): object;
 export declare function generateConstantsList(constants: object): object;
 export declare function cssImports(content: string): string[];