fix: avoid using this.load api unless necessary

marko-js · Nov 20, 2023 · 161b0c1 · 161b0c1
1 parent 798c045
commit 161b0c1
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/.changeset/curvy-bags-invent.md b/.changeset/curvy-bags-invent.md
@@ -0,0 +1,5 @@
+---
+"arc-vite": patch
+---
+
+Avoid using `this.load` unless the ast has not already been parsed for a module.
diff --git a/src/plugins/build-ssr.ts b/src/plugins/build-ssr.ts
@@ -82,6 +82,10 @@ export function pluginBuildSSR({
           const matches = await getVirtualMatches(this, flagSets, resolved);
           if (matches) {
             const { id } = resolved;
+            if (!this.getModuleInfo(id)?.ast) {
+              await this.load(resolved);
+            }
+
             adaptiveMatchesForId.set(id, matches);
             return { id: encodeArcProxyId(id) };
           }
@@ -131,22 +135,22 @@ function partsToString(parts, base, injectAttrs) {
         id = decodeArcProxyId(id);
         const adaptiveMatches = adaptiveMatchesForId.get(id);
         if (adaptiveMatches) {
-          const info = await this.load({ id });
-          if (info) {
-            if (isCssFile(id)) {
-              let code = "";
-              for (const { value } of adaptiveMatches.alternates) {
-                code += `import ${JSON.stringify(value)};\n`;
-              }
+          if (isCssFile(id)) {
+            let code = "";
+            for (const { value } of adaptiveMatches.alternates) {
+              code += `import ${JSON.stringify(value)};\n`;
+            }
 
-              code += `import ${JSON.stringify(adaptiveMatches.default)};\n`;
+            code += `import ${JSON.stringify(adaptiveMatches.default)};\n`;
 
-              return {
-                code,
-                moduleSideEffects: "no-treeshake",
-              };
-            }
+            return {
+              code,
+              moduleSideEffects: "no-treeshake",
+            };
+          }
 
+          const info = this.getModuleInfo(id);
+          if (info) {
             let code = "";
             let matchCode = "";
             let matchCodeSep = "";

diff --git a/src/plugins/build-web.ts b/src/plugins/build-web.ts
@@ -91,6 +91,11 @@ export function pluginBuildWeb({
             const matches = await getVirtualMatches(this, flagSets, resolved);
             if (matches) {
               const { id } = resolved;
+
+              if (!this.getModuleInfo(id)?.ast) {
+                await this.load(resolved);
+              }
+
               adaptiveMatchesForId.set(id, matches);
 
               const adaptiveImportsForImporter =
@@ -212,10 +217,11 @@ export function pluginBuildWeb({
               importer,
               resolvedAdaptiveImports,
             ] of adaptiveImporters) {
-              const info = await this.load({ id: importer });
+              const ast = (this.getModuleInfo(importer)?.ast ||
+                (await this.load({ id: importer }))
+                  .ast) as unknown as estree.Program;
 
-              for (const child of (info.ast as unknown as estree.Program)
-                .body) {
+              for (const child of ast.body) {
                 if (child.type === "ImportDeclaration") {
                   const id = resolvedAdaptiveImports.get(
                     child.source.value as string,
@@ -289,7 +295,12 @@ export function pluginBuildWeb({
 
         if (isArcProxyId(id)) {
           id = decodeArcProxyId(id);
-          const info = await this.load({ id });
+
+          if (isCssFile(id)) {
+            return { code: "" };
+          }
+
+          const info = this.getModuleInfo(id);
           if (info) {
             let code = "";
             let syntheticNamedExports: boolean | string = false;