[rollup-plugin-import-meta-assets] Fix resolving and respect external rollup option

packages/rollup-plugin-import-meta-assets/src/rollup-plugin-import-meta-assets.js

@@ -161,21 +161,35 @@ ${`    default: return new Promise(function(resolve, reject) {
           if (importMetaUrlType === 'static') {
             const absoluteScriptDir = path.dirname(id);
             const relativeAssetPath = getRelativeAssetPath(node);
-            const absoluteAssetPath = path.resolve(absoluteScriptDir, relativeAssetPath);
-            const assetName = path.basename(absoluteAssetPath);
 
             try {
-              const assetContents = await fs.promises.readFile(absoluteAssetPath);
+              const resolved = await this.resolve(relativeAssetPath, id);
+              if (resolved == null) {
+                // Do not process directories, just skip
+                const absoluteAssetPath = path.resolve(absoluteScriptDir, relativeAssetPath);
+                try {
+                  if (fs.lstatSync(absoluteAssetPath).isDirectory()) {
+                    return;
+                  }
+                } catch (error) {
+                  // ignore, the file probably doesn't exists
+                }
+                this.error(`Unable to resolve "${relativeAssetPath}" from "${id}"`);
+                return;
+              }
+              if (resolved.external) {
+                return;
+              }
+
+              const assetContents = await fs.promises.readFile(resolved.id);
               const transformedAssetContents =
-                transform != null
-                  ? await transform(assetContents, absoluteAssetPath)
-                  : assetContents;
+                transform != null ? await transform(assetContents, resolved.id) : assetContents;
               if (transformedAssetContents === null) {
                 return;
               }
               const ref = this.emitFile({
                 type: 'asset',
-                name: assetName,
+                name: path.basename(resolved.id),
                 source: transformedAssetContents,
               });
               magicString.overwrite(
@@ -185,13 +199,10 @@ ${`    default: return new Promise(function(resolve, reject) {
               );
               modifiedCode = true;
             } catch (error) {
-              // Do not process directories, just skip
-              if (error.code !== 'EISDIR') {
-                if (warnOnError) {
-                  this.warn(error, node.arguments[0].start);
-                } else {
-                  this.error(error, node.arguments[0].start);
-                }
+              if (warnOnError) {
+                this.warn(error, node.arguments[0].start);
+              } else {
+                this.error(error, node.arguments[0].start);
               }
             }
           }

packages/rollup-plugin-import-meta-assets/test/integration.test.js

@@ -237,7 +237,9 @@ describe('rollup-plugin-import-meta-assets', () => {
       error = e;
     }
 
-    expect(error.message).to.match(/no such file or directory/);
+    expect(error.message).to.match(
+      /Unable to resolve "[/\\]absolute-path.svg" from ".*[/\\]bad-url-entrypoint.js"/,
+    );
   });
 
   it('bad URL example with warnOnError: true', async () => {
@@ -251,10 +253,10 @@ describe('rollup-plugin-import-meta-assets', () => {
 
     expect(consoleStub.callCount).to.equal(2);
     expect(consoleStub.getCall(0).args[0]).to.match(
-      /ENOENT: no such file or directory, open '.*[/\\]absolute-path\.svg'/,
+      /\(rollup-plugin-import-meta-assets plugin\) test[/\\]fixtures[/\\]bad-url-entrypoint\.js \(1:26\) Unable to resolve "[/\\]absolute-path\.svg" from ".*bad-url-entrypoint\.js"/,
     );
     expect(consoleStub.getCall(1).args[0]).to.match(
-      /ENOENT: no such file or directory, open '.*[/\\]missing-relative-path\.svg'/,
+      /\(rollup-plugin-import-meta-assets plugin\) test[/\\]fixtures[/\\]bad-url-entrypoint\.js \(2:26\) Unable to resolve "..[/\\]..[/\\]missing-relative-path.svg" from ".*bad-url-entrypoint\.js"/,
     );
   });
 
@@ -294,4 +296,41 @@ describe('rollup-plugin-import-meta-assets', () => {
       expectAsset(output, 'snapshots/four.svg', 'four.svg', 'assets/four-lJVunLww.svg'),
     ]);
   });
+
+  it('respects the rollup resolution', async () => {
+    const config = {
+      input: { 'simple-bundle-switched': require.resolve('./fixtures/simple-entrypoint.js') },
+      plugins: [
+        importMetaAssets(),
+        {
+          resolveId(source, importer) {
+            if (source == './one.svg') {
+              return path.resolve(path.dirname(importer), 'two.svg');
+            }
+            if (source == './two.svg') {
+              return path.resolve(path.dirname(importer), 'one.svg');
+            }
+            if (source === './three.svg') {
+              return {
+                id: source,
+                external: true,
+              };
+            }
+            return undefined;
+          },
+        },
+      ],
+    };
+
+    const bundle = await rollup.rollup(config);
+    const { output } = await bundle.generate(outputConfig);
+
+    expect(output.length).to.equal(5);
+    expectChunk(output, 'snapshots/simple-bundle-switched.js', 'simple-bundle-switched.js', [
+      expectAsset(output, 'snapshots/two.svg', 'two.svg', 'assets/two--yckvrYd.svg'),
+      expectAsset(output, 'snapshots/one.svg', 'one.svg', 'assets/one-ZInu4dBJ.svg'),
+      expectAsset(output, 'snapshots/four.svg', 'four.svg', 'assets/four-lJVunLww.svg'),
+      expectAsset(output, 'snapshots/five', 'five', 'assets/five-Z74_0e9C'),
+    ]);
+  });
 });

packages/rollup-plugin-import-meta-assets/test/snapshots/simple-bundle-switched.js

@@ -0,0 +1,13 @@
+const justUrlObject = new URL(new URL('assets/two--yckvrYd.svg', import.meta.url).href, import.meta.url);
+const href = new URL(new URL('assets/one-ZInu4dBJ.svg', import.meta.url).href, import.meta.url).href;
+const pathname = new URL('./three.svg', import.meta.url).pathname;
+const searchParams = new URL(new URL('assets/four-lJVunLww.svg', import.meta.url).href, import.meta.url).searchParams;
+const noExtension = new URL(new URL('assets/five-Z74_0e9C', import.meta.url).href, import.meta.url);
+
+console.log({
+  justUrlObject,
+  href,
+  pathname,
+  searchParams,
+  noExtension,
+});