Merge pull request #1972 from embroider-build/public-assets-hide-path…

…-2nd Hide base path from public URL of rollup-public-assets
embroider-build · Jun 11, 2024 · 788cd18 · 788cd18
2 parents 4d74274 + 210f14c
commit 788cd18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/addon-dev/src/rollup-public-assets.ts b/packages/addon-dev/src/rollup-public-assets.ts
@@ -51,7 +51,7 @@ export default function publicAssets(
       });
       const publicAssets: Record<string, string> = filenames.reduce(
         (acc: Record<string, string>, v): Record<string, string> => {
-          const namespace = opts?.namespace ?? join(pkg.name, path);
+          const namespace = opts?.namespace ?? pkg.name;
 
           acc[`./${path}/${v}`] = resolve('/' + join(namespace, v));
           return acc;

diff --git a/tests/scenarios/v2-addon-dev-test.ts b/tests/scenarios/v2-addon-dev-test.ts
@@ -393,7 +393,7 @@ export { SingleFileComponent as default };
           let expectNoNamespaceFile = expectFilesAt(inDependency(app, 'v2-addon-no-namespace').dir, { qunit: assert });
 
           expectFile('package.json').json('ember-addon.public-assets').deepEquals({
-            './public/thing.txt': '/v2-addon/public/thing.txt',
+            './public/thing.txt': '/v2-addon/thing.txt',
           });
           expectNoNamespaceFile('package.json').json('ember-addon.public-assets').deepEquals({
             './public/other.txt': '/other.txt',