Merge pull request #1 from marko-js/fix-issue-with-multiple-flags

fix: issue with multiple flags
marko-js · Nov 10, 2023 · dcdb794 · dcdb794
2 parents aa809ee + e295c47
commit dcdb794
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/.changeset/yellow-bobcats-scream.md b/.changeset/yellow-bobcats-scream.md
@@ -0,0 +1,5 @@
+---
+"arc-vite": patch
+---
+
+Fix issue when there are multiple flags.
diff --git a/src/plugins/build-ssr.ts b/src/plugins/build-ssr.ts
@@ -136,6 +136,7 @@ function partsToString(parts, base, injectAttrs) {
 
             let code = "";
             let matchCode = "";
+            let matchCodeSep = "";
             let i = 0;
 
             for (const { flags, value } of adaptiveMatches.alternates) {
@@ -145,9 +146,12 @@ function partsToString(parts, base, injectAttrs) {
               )};\n`;
 
               matchCode +=
+                matchCodeSep +
                 flags.map((flag) => `f.${flag}`).join("&&") +
                 "?" +
                 adaptedImportId;
+
+              matchCodeSep = ":";
             }
 
             const defaultId = `_${indexToId(i)}`;

diff --git a/src/plugins/build-web.ts b/src/plugins/build-web.ts
@@ -424,12 +424,16 @@ export function pluginBuildWeb({
           const defaultFlaggedAssets = flaggedAssetsForEntry
             .sort(compareFlaggedObject)
             .pop()!;
+          let matchCodeSep = "";
+
           manifestCode += `case ${JSON.stringify(entryName)}:return `;
           for (const { flags, manifest } of flaggedAssetsForEntry) {
             manifestCode +=
+              matchCodeSep +
               flags.map((flag) => `f.${flag}`).join("&&") +
               "?" +
               JSON.stringify(manifest);
+            matchCodeSep = ":";
           }
 
           manifestCode += `:${JSON.stringify(defaultFlaggedAssets.manifest)}`;