fix

embroider-build · Sep 14, 2024 · dcd8752 · dcd8752
1 parent d2fd327
commit dcd8752
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/packages/core/src/virtual-content.ts b/packages/core/src/virtual-content.ts
@@ -209,20 +209,21 @@ function decodeVirtualPairComponent(
   };
 }
 
-const appJsMatchPrefix = '/embroider_appjs_match/';
-const appJsMatchPattern = /\/embroider_appjs_match\/(?<original>.+)$/;
+const appJsMatchMarker = '__embroider_appjs_match__';
+const appJsMatchPattern = /(?<from>.+)__embroider_appjs_match__(?<to>.+)$/;
 export function encodeAppJsMatch(specifier: string, fromFile: string): string {
-  return `${appJsMatchPrefix}${fromFile}::${specifier}`;
+  return `${fromFile}${appJsMatchMarker}${encodeURIComponent(specifier)}`;
 }
 
 export function decodeAppJsMatch(filename: string) {
   // Performance: avoid paying regex exec cost unless needed
-  if (!filename.includes(appJsMatchPrefix)) {
+  if (!filename.includes(appJsMatchMarker)) {
     return;
   }
   let match = appJsMatchPattern.exec(filename);
   if (match) {
-    let [from, to] = match.groups!.original.split('::');
+    let from = match.groups!.from;
+    let to = decodeURIComponent(match.groups!.to);
     console.log('from', from, to);
     return {
       filename: require.resolve(to, {

diff --git a/tests/scenarios/core-resolver-test.ts b/tests/scenarios/core-resolver-test.ts
@@ -510,7 +510,7 @@ Scenarios.fromProject(() => new Project())
           expectAudit
             .module('./app.js')
             .resolves('my-app/hello-world')
-            .to('./package.json::my-addon/_app_/hello-world.js/embroider_appjs_match');
+            .to('./package.json__embroider_appjs_match__my-addon%2F_app_%2Fhello-world.js');
         });
 
         test('app-js module in addon can still do relative imports that escape its package', async function () {
@@ -527,7 +527,7 @@ Scenarios.fromProject(() => new Project())
           });
 
           expectAudit
-            .module('./package.json::my-addon/_app_/hello-world.js/embroider_appjs_match')
+            .module('./package.json__embroider_appjs_match__my-addon%2F_app_%2Fhello-world.js')
             .resolves('../../extra.js')
             .to('./node_modules/extra.js');
         });
@@ -547,7 +547,7 @@ Scenarios.fromProject(() => new Project())
           expectAudit
             .module('./app.js')
             .resolves('my-app/templates/hello-world')
-            .to('./package.json::my-addon/_app_/templates/hello-world.hbs/embroider_appjs_match');
+            .to('./package.json__embroider_appjs_match__my-addon%2F_app_%2Ftemplates%2Fhello-world.hbs');
         });
 
         test(`relative import in addon's app tree resolves to app`, async function () {
@@ -564,7 +564,7 @@ Scenarios.fromProject(() => new Project())
           });
 
           expectAudit
-            .module('./package.json::my-addon/_app_/hello-world.js/embroider_appjs_match')
+            .module('./package.json__embroider_appjs_match__my-addon%2F_app_%2Fhello-world.js')
             .resolves('./secondary')
             .to('./secondary.js');
         });
@@ -584,7 +584,7 @@ Scenarios.fromProject(() => new Project())
           });
 
           expectAudit
-            .module('./package.json::my-addon/_app_/hello-world.js/embroider_appjs_match')
+            .module('./package.json__embroider_appjs_match__my-addon%2F_app_%2Fhello-world.js')
             .resolves('./secondary')
             .to('./secondary.js');
         });
@@ -602,7 +602,7 @@ Scenarios.fromProject(() => new Project())
           });
 
           expectAudit
-            .module('./package.json::my-addon/_app_/hello-world.js/embroider_appjs_match')
+            .module('./package.json__embroider_appjs_match__my-addon%2F_app_%2Fhello-world.js')
             .resolves('the-apps-dep')
             .to('./node_modules/the-apps-dep/index.js');
         });
@@ -621,7 +621,7 @@ Scenarios.fromProject(() => new Project())
           });
 
           expectAudit
-            .module('./package.json::my-addon/_app_/hello-world.js/embroider_appjs_match')
+            .module('./package.json__embroider_appjs_match__my-addon%2F_app_%2Fhello-world.js')
             .resolves('my-app/secondary')
             .to('./secondary.js');
         });