fix: update deps regexp to exclude lasso style deps

marko-js · Jun 4, 2020 · 55b6786 · 55b6786
1 parent 66bd849
commit 55b6786
Showing 1 changed file with 80 additions and 79 deletions.
diff --git a/src/transform/create-transform.ts b/src/transform/create-transform.ts
@@ -6,96 +6,97 @@ import ConcatMap from "concat-with-sourcemaps";
 import { Transformer } from "@jest/transform";
 const THIS_FILE = fs.readFileSync(__filename);
 
-export = ({ browser }: { browser: boolean }) => ({
-  getCacheKey(fileData, filename, configString, { instrument, rootDir }) {
-    return crypto
-      .createHash("md5")
-      .update(THIS_FILE)
-      .update("\0", "utf8")
-      .update(configString)
-      .update("\0", "utf8")
-      .update(fileData)
-      .update("\0", "utf8")
-      .update(path.relative(rootDir, filename))
-      .update("\0", "utf8")
-      .update(instrument ? "instrument" : "")
-      .update("\0", "utf8")
-      .update(process.env.NODE_ENV || "")
-      .digest("hex");
-  },
-  process(src, filename, config) {
-    const result = compiler[
-      (browser || config.browser) &&
-      compiler.compileForBrowser /** Only Marko 4 supports compileForBrowser, otherwise use compile */
-        ? "compileForBrowser"
-        : "compile"
-    ](src, filename, {
-      writeVersionComment: false,
-      requireTemplates: true,
-      writeToDisk: false,
-      sourceOnly: false,
-      sourceMaps: true
-    });
+export = ({ browser }: { browser: boolean }) =>
+  ({
+    getCacheKey(fileData, filename, configString, { instrument, rootDir }) {
+      return crypto
+        .createHash("md5")
+        .update(THIS_FILE)
+        .update("\0", "utf8")
+        .update(configString)
+        .update("\0", "utf8")
+        .update(fileData)
+        .update("\0", "utf8")
+        .update(path.relative(rootDir, filename))
+        .update("\0", "utf8")
+        .update(instrument ? "instrument" : "")
+        .update("\0", "utf8")
+        .update(process.env.NODE_ENV || "")
+        .digest("hex");
+    },
+    process(src, filename, config) {
+      const result = compiler[
+        (browser || config.browser) &&
+        compiler.compileForBrowser /** Only Marko 4 supports compileForBrowser, otherwise use compile */
+          ? "compileForBrowser"
+          : "compile"
+      ](src, filename, {
+        writeVersionComment: false,
+        requireTemplates: true,
+        writeToDisk: false,
+        sourceOnly: false,
+        sourceMaps: true
+      });
 
-    let code = typeof result === "string" ? result : result.code; // Marko 3 does not support sourceOnly: false
-    let map = result.map;
-    const deps = result.meta && result.meta.deps;
+      let code = typeof result === "string" ? result : result.code; // Marko 3 does not support sourceOnly: false
+      let map = result.map;
+      const deps = result.meta && result.meta.deps;
 
-    if (deps) {
-      const concatMap = new ConcatMap(true, "", ";");
-      const acceptPathReg = new RegExp(
-        `^[^.]+$|${config.transform
-          .map(([reg], i) => `(?<_${i}>${reg})`)
-          .join("|")}|\\.(?:${config.moduleFileExtensions.join("|")})$`
-      );
+      if (deps) {
+        const concatMap = new ConcatMap(true, "", ";");
+        const acceptPathReg = new RegExp(
+          `^(?:[./]*[^:.]*|[^:]+(?:${config.transform
+            .map(([reg], i) => `(?<_${i}>${reg})`)
+            .join("|")}|\\.(?:${config.moduleFileExtensions.join("|")})))$`
+        );
 
-      for (let dep of deps) {
-        if (typeof dep !== "string") {
-          if (dep.virtualPath) {
-            const acceptedMatch = acceptPathReg.exec(dep.virtualPath);
-            let depCode = dep.code;
+        for (let dep of deps) {
+          if (typeof dep !== "string") {
+            if (dep.virtualPath) {
+              const acceptedMatch = acceptPathReg.exec(dep.virtualPath);
+              let depCode = dep.code;
 
-            if (!acceptedMatch) {
-              return;
-            }
+              if (!acceptedMatch) {
+                return;
+              }
 
-            for (const key in acceptedMatch.groups) {
-              if (acceptedMatch.groups[key] !== undefined) {
-                const transformResult = require(config.transform[
-                  key.slice(1)
-                ][1]).process(depCode, dep.virtualPath, config);
-                depCode = transformResult.code || transformResult; // TODO: support sourcemaps for this.
+              for (const key in acceptedMatch.groups) {
+                if (acceptedMatch.groups[key] !== undefined) {
+                  const transformResult = require(config.transform[
+                    key.slice(1)
+                  ][1]).process(depCode, dep.virtualPath, config);
+                  depCode = transformResult.code || transformResult; // TODO: support sourcemaps for this.
+                }
               }
+
+              concatMap.add(
+                dep.virtualPath,
+                `((module, exports) => {${depCode}})({ exports: {} })`
+              );
+              continue;
+            } else {
+              dep = dep.path;
             }
+          }
 
-            concatMap.add(
-              dep.virtualPath,
-              `((module, exports) => {${depCode}})({ exports: {} })`
-            );
-            continue;
-          } else {
-            dep = dep.path;
+          if (acceptPathReg.test(dep)) {
+            concatMap.add(null, `require(${JSON.stringify(dep)})`);
           }
         }
 
-        if (acceptPathReg.test(dep)) {
-          concatMap.add(null, `require(${JSON.stringify(dep)})`);
-        }
+        concatMap.add(filename, code, map);
+        code = concatMap.content.toString("utf-8");
+        map = concatMap.sourceMap;
       }
 
-      concatMap.add(filename, code, map);
-      code = concatMap.content.toString("utf-8");
-      map = concatMap.sourceMap;
-    }
-
-    if (!map) {
-      return code;
-    }
+      if (!map) {
+        return code;
+      }
 
-    return {
-      code,
-      map
-    };
-  },
-  canInstrument: false
-} as Transformer);
+      return {
+        code,
+        map
+      };
+    },
+    canInstrument: false
+  } as Transformer);