fix: only replace imports once

eik-lib · Dec 29, 2020 · 3c52867 · 3c52867
1 parent 567ca3e
commit 3c52867
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/plugin.js b/src/plugin.js
@@ -85,6 +85,8 @@ module.exports = ({ path, urls, imports } = {}) => {
         prepare() {
             // Avoid parsing things more than necessary
             const processed = new WeakMap();
+            // Only replace once per url
+            const replaced = new Set();
             // Eagerly start resolving
             const mapFetch = populateImportMap({ path, urls, imports });
             // Reused replace logic
@@ -107,9 +109,12 @@ module.exports = ({ path, urls, imports } = {}) => {
                 // Webpack interop
                 key = key.replace(/^~/, '');
 
-                if (mapping.has(key)) {
+                if (replaced.has(key)) {
+                    decl.remove();
+                } else if (mapping.has(key)) {
                     // eslint-disable-next-line no-param-reassign
                     decl.params = `'${mapping.get(key)}'`;
+                    replaced.add(key);
                 }
 
                 // Cache we've processed this

diff --git a/tap-snapshots/test-plugin.js-TAP.test.js b/tap-snapshots/test-plugin.js-TAP.test.js
@@ -8,8 +8,6 @@
 exports[`test/plugin.js TAP plugin() - advanced module - should replace normalize.css with CDN URL > advanced example 1`] = `
 
   @import 'https://unpkg.com/normalize.css@8/normalize.css';
-  @import 'https://unpkg.com/normalize.css@8/normalize.css';
-  @import 'https://unpkg.com/normalize.css@8/normalize.css';
 
 `
 
@@ -28,8 +26,5 @@ exports[`test/plugin.js TAP plugin() - simple module - should replace normalize.
 exports[`test/plugin.js TAP plugin() - webpack module - should replace normalize.css with CDN URL > webpack example 1`] = `
 
   @import 'https://unpkg.com/normalize.css@8/normalize.css';
-  @import 'https://unpkg.com/normalize.css@8/normalize.css';
-  @import 'https://unpkg.com/normalize.css@8/normalize.css';
-  @import 'https://unpkg.com/normalize.css@8/normalize.css';
 
 `