From 8c77949ac07d847f548458ccfaa8fa8d83ab0d7e Mon Sep 17 00:00:00 2001
From: Danny Gleckler <daniel.gleckler@d2l.com>
Date: Fri, 18 Oct 2024 15:22:56 -0400
Subject: [PATCH 1/6] Normalize paths at runtime to match glob results

---
 .../src/dynamic-import-to-glob.js             |   9 ++
 packages/dynamic-import-vars/src/index.js     |  18 ++-
 ...llup-plugin-dynamic-import-vars.test.js.md | 125 ++++++++++++------
 ...up-plugin-dynamic-import-vars.test.js.snap | Bin 1006 -> 1152 bytes
 .../test/src/dynamic-import-to-glob.test.mjs  |  19 ++-
 5 files changed, 124 insertions(+), 47 deletions(-)

diff --git a/packages/dynamic-import-vars/src/dynamic-import-to-glob.js b/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
index de63b90b1..004c0394c 100644
--- a/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
+++ b/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
@@ -125,3 +125,12 @@ export function dynamicImportToGlob(node, sourceString) {
 
   return glob;
 }
+
+export const normalizePath = (p) =>
+  p
+    // remove any ./ inside the path
+    .replace(/\/\.\//g, '/')
+    // remove dir/ + ../ pairs
+    .replace(/([^/.][^/]*\/)(([^/.][^/]*\/)(\.\.\/))?(\.\.\/)/g, '')
+    // remove unnecessary leading ./
+    .replace(/^(\.\/)+(?=\.\.\/)/g, '');
diff --git a/packages/dynamic-import-vars/src/index.js b/packages/dynamic-import-vars/src/index.js
index 3351a1582..0526aafb7 100644
--- a/packages/dynamic-import-vars/src/index.js
+++ b/packages/dynamic-import-vars/src/index.js
@@ -7,7 +7,16 @@ import { generate } from 'astring';
 
 import { createFilter } from '@rollup/pluginutils';
 
-import { dynamicImportToGlob, VariableDynamicImportError } from './dynamic-import-to-glob';
+import {
+  dynamicImportToGlob,
+  VariableDynamicImportError,
+  normalizePath
+} from './dynamic-import-to-glob';
+
+const normalizePathString = normalizePath
+  .toString()
+  .substring(6)
+  .replace(/\n {2}/g, '\n    ');
 
 function dynamicImportVariables({ include, exclude, warnOnError, errorWhenNoFilesFound } = {}) {
   const filter = createFilter(include, exclude);
@@ -72,13 +81,14 @@ function dynamicImportVariables({ include, exclude, warnOnError, errorWhenNoFile
             // will turn these into chunks automatically
             ms.prepend(
               `function __variableDynamicImportRuntime${dynamicImportIndex}__(path) {
-  switch (path) {
+  const normalPath = path${normalizePathString};
+  switch (normalPath) {
 ${paths
   .map((p) => `    case '${p}': return import('${p}'${importArg ? `, ${importArg}` : ''});`)
   .join('\n')}
 ${`    default: return new Promise(function(resolve, reject) {
       (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(
-        reject.bind(null, new Error("Unknown variable dynamic import: " + path))
+        reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))
       );
     })\n`}   }
  }\n\n`
@@ -122,4 +132,4 @@ ${`    default: return new Promise(function(resolve, reject) {
 }
 
 export default dynamicImportVariables;
-export { dynamicImportToGlob, VariableDynamicImportError };
+export { dynamicImportToGlob, VariableDynamicImportError, normalizePath };
diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
index 0889053e5..2363f7a4d 100644
--- a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
+++ b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
@@ -9,12 +9,19 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
@@ -32,15 +39,22 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
-        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-jrfqlYMu.js');␊
+        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-qW3pa8f7.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
@@ -58,12 +72,19 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case '../module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case '../module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
@@ -81,14 +102,21 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
@@ -106,12 +134,19 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case './root-module-a.js': return import('./root-module-a-lF5i40jF.js');␊
         case './root-module-b.js': return import('./root-module-b-F1yin99u.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
@@ -129,39 +164,60 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime2__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
-        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-jrfqlYMu.js');␊
+        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-qW3pa8f7.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
      }␊
     ␊
     function __variableDynamicImportRuntime1__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
      }␊
     ␊
     function __variableDynamicImportRuntime0__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
@@ -217,12 +273,19 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      switch (path) {␊
+      const normalPath = path␊
+        // remove any ./ inside the path␊
+        .replace(/\\/\\.\\//g, '/')␊
+        // remove dir/ + ../ pairs␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        // remove unnecessary leading ./␊
+        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
+            reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
           );␊
         })␊
        }␊
@@ -234,25 +297,3 @@ Generated by [AVA](https://avajs.dev).
     ␊
     export { importModule };␊
     `
-
-## no files in dir
-
-> Snapshot 1
-
-    `function __variableDynamicImportRuntime0__(path) {␊
-      switch (path) {␊
-    ␊
-        default: return new Promise(function(resolve, reject) {␊
-          (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
-            reject.bind(null, new Error("Unknown variable dynamic import: " + path))␊
-          );␊
-        })␊
-       }␊
-     }␊
-    ␊
-    function importModule(name) {␊
-      return __variableDynamicImportRuntime0__(\`./module-dir-c/${name}.js\`);␊
-    }␊
-    ␊
-    export { importModule };␊
-    `
diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap
index 8ee67b5d83ef2e95272bfbecccf13a9140b5b0e2..d793029ac0e0b26c5557d2f6145fb0ee62b8a004 100644
GIT binary patch
literal 1152
zcmV-`1b_QMRzV<BZeeh9Xm4~Nb~6eC0B8^bFDM%?J0uSnQ-g!$OkwFy5V_2J)<4bs
zQ(mwl1RskC00000000B+T1{`;Mi6!C6a|=5Z$(dozyQfwBqJql6C0|LAW_;wil9wf
z7jbMaxg%+9a+ls++EN^%=%qkVptt^j^!N22^iq(bY*D5n+4*SNQYWpr`(|f2Z}@ho
z7hOLT!M=L_2WqB6+*6GALIlbrQ=G)AFSPpk1*JrjAD4e!Uix4u`&@c|>BIM)Eq4<h
zXeK!9>>Luwh#%tJAtw<FzKUWY^*0IEEW&F$J623|--crYAP`(>;6g?ud`NU3+K^o|
z002A>Bu3&8f$$-?9x$#LMbLdbo#aZ4LlU6nZFyVnmgn^vV0xxKg+Q6~U=>`~gP1U>
zrq)`Iw>|gC<8ANBCtIFvO%1o)4B56f#@})yXKW;#V}ME#IfM`iWxNNjH)Uzt$`Mwr
zjdmGq-2hNWOb30iPUA6(5<ox{g6VpZph<`hWzr$z0dbn{o-)@!qD~|SmWSIqolTsk
z(`5<&_OmZL+05M5Jj~WS%$9S2F%5>BhZC3-yCezq$vTcl@KB0~DYV83Vo6jYJj4b_
z+`~YReFU)dFh<dZg9H<Nzyc{WQTxztx4|5*HeqA>`Wh(Ik645v(Y94!L4of2j8lsz
zVc5ubb5BYkt*hVheJ+kTj8hfpC|3(l*WfCwPUNL+7qEq&X+BO3NDbp8@kdJ^<N>lc
ziE!ju5sLY=*qyo;E5{i~>h7ssd)-J40|(g(I4)U&bloTj8%0T|Sv;bwI?LJ1zn3`s
z%jKH0HD{|Z{qew`w@=?`I@b^AQ}X?d`wL^v*{AQcoSmD!cyPbTDlk>zXMkRp4Rj*W
zN#Y|SsdBRXngLuj)j9a#dQ5J1Kd;MIMfsvkHsE44Y~`3TnV!FT#l_vph@TgW3eoXf
zset`di;lNYz}`p&t7XSKBs*SJcO-#`;t&TJvjU=#lWb!Z`r}cFzV~YVQR|O?kN&8O
z%!D}jnnZXpfv|F%YlPj2Tazn>3^CnJcVRUnV|xC>Pv$aZ5(6#dutGaLD;1xp)(&r@
z_(&nNGv@yc+Lh)wVdqnJ<Jw+T)tQ{=F97B{o#v47Tep&$#;>hKF&W@<lXURWX^W!d
zO+~lj%JULopI%vzu&tV~wOaVc)k58^c(ax4<u#yL*MR?U4X6{pR;zX5|4$M>2#HeA
z5hC|vhJbx-Z`m@dsbS22y1Wd=)qUiaHM(v?`->AYiV)pU^el7a2U4>E#k6%Jwby4z
z^^O$LT_!Kom2WNBmG21As4_aK-kVgQ;--e6Pk0Z<+8uPCXi$BTgcP{Y;A1g^o{{yN
zf0b1IpG&2%5T|L*jKXcJ<n|(@nRWKLGYiVh+7FXA)*SUCCVnPPD<7Vks66%DE=Tju
zL>vzS!T|?Cm{5c+3-RpfXY+6}Oqco#p5O{cUinS(;Nz*|84#sVW;>`jsn!1lsUKGL
S!|EORFUa3<Rm{o8B>({1Pb~oe

literal 1006
zcmV<K0}=c|RzV<BZeeh9Xm4~Nb~6eC02;$c0Ci-#R!gw^2_XY&H2c}(W%}WdAB1Gp
z*S~#_XdjCR00000000B+S<P<KKoIVa5U4k9h|>sFvLoV@lpjH>f<O@9P=xqXIVEd*
z(rmifb#~WnLX-nn-U42OH{e-#11_u`huW<}(h{Vqb(9>|nf>N}XJ-Ai=`!K%sW0D9
zQ_ZlgDBooWK9y8)5~!BY>ho9MCz^a*>Mk!_UWh)6mlm!rxl7HEdzuOk_4+=Ml(-C^
z_BrWL?`0<tQojkgrX9RhuiF99tr84Y0Mr51UJFuB06d})tjbzP_#s2baCgXfL7Zx(
zt*i}@s6)wt#?ba5wIOhtG~{pZy{JW$rOg>I*Qa5wJ6#NXufMaO!t}98LZ<)h<9GnC
zrRY$F_ShJ<L?zfhmJLxGJw4VDz}Ec$MH9LqhPX{VDKt@gu(h=X)_AuCkB<Jo0Sfgy
zV@DC{lAT~df?jbc_iY|BR*t24CZ&+}jrV+yivtd0w}3zLOQPup+<==9d!Up6CK?Xo
z^>D>}SN^znv}rpwjcssnq*G#q>CSH)@xtmL0vQ^^HVj+C3475F7-TrXaC0RI%TC8w
zod%=8RL3K8d60=rwtV3tGY8WhFWhNz8Up8b*Z)L5+<87T<`g*%fm6S~8}y!6X%40e
z-3V~4Nqc5LI$>}?q_3RF_7i~fNS(H9cG<`6ut?HOk{Z(*R;S9;)q&YOJb8`=iC>}=
zjit^hAUcz#IQIhbU-GmlA!nk5{A&#fJ<%~0qz9hh9?{52Bv?)@*~kRx&7zi^)ml=d
zQhd<AGI?;i!+v!TpZATFQ{vM<LL4@R4I`DcW(`l?u0_fk9Agn7`#E*M&7|1d`419O
z2<?ocd_r(#XdG6%OYhuj=jB$K(47Iyb!yc<<qsYdUCBH~hqP%=9E!bbhoeJAkDMvu
z%4Q}k%U5O$%k|>qFQ$ldlCOV{^y;~Z^uoR8x`n-1?)4Z^3Ti^c8cZm;bGxsLxEiL@
zPl~_6RCEiuZIAvh!PdiAMl+fjmtcj7UE3PzfxcCSgv?ZY^UH58YR0=ysXW!q$NG#n
zAI8GvJf`V>qv{J(+|uB+2;aqVw*k6EG?;cHWIk}A!Nr8aKh}us{L1tpKNm7)F<E3y
zw8CRMqxLN6GO1g8G6~9x#)7nCt<jv2dTiLl%R?5qecI!!HJ_yH*!2hp?0GEo5t@|Y
z@qTS*KW(PP){H%8qR2nrN%yWFX(+)YA<9UCoZhl{cXF|g<g@ecL~t=mAfP<|z24%F
cOl*E%oJ(vLPM??4y%RY7H>qZ&1<@S<05II`QUCw|

diff --git a/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs b/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
index 17f50124c..dd477023e 100644
--- a/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
+++ b/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
@@ -2,8 +2,9 @@
 
 import { parse } from 'acorn';
 import test from 'ava';
+import { posix } from 'node:path';
 
-import { dynamicImportToGlob, VariableDynamicImportError } from 'current-package';
+import { dynamicImportToGlob, normalizePath, VariableDynamicImportError } from 'current-package';
 
 test('template literal with variable filename', (t) => {
   const ast = parse('import(`./foo/${bar}.js`);', {
@@ -286,3 +287,19 @@ test('escapes []', (t) => {
   const glob = dynamicImportToGlob(ast.body[0].expression.source);
   t.is(glob, './*/\\[foo\\].js');
 });
+
+
+[
+  './../foo/./../foo.js',
+  './../../a/foo.js',
+  './föö/../bar/.././../foo.js',
+  './../فو/bar/../../foo.js',
+  '../foo/../foo.js',
+  './../foo/../bar/.././../foo.js',
+  './../foo/bar/.././../foo.js'
+].forEach((p) => {
+  test(`normalizePath - ${p}`, (t) => {
+    const normalPath = normalizePath(p);
+    t.is(posix.normalize(p), normalPath);
+  });
+});

From 9b6d4bcb8e16e6b178313525e423daa84c7b19bb Mon Sep 17 00:00:00 2001
From: Danny Gleckler <daniel.gleckler@d2l.com>
Date: Fri, 18 Oct 2024 15:28:59 -0400
Subject: [PATCH 2/6] Adjust after prettier

---
 packages/dynamic-import-vars/src/index.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/dynamic-import-vars/src/index.js b/packages/dynamic-import-vars/src/index.js
index 0526aafb7..daad3e8d9 100644
--- a/packages/dynamic-import-vars/src/index.js
+++ b/packages/dynamic-import-vars/src/index.js
@@ -13,10 +13,7 @@ import {
   normalizePath
 } from './dynamic-import-to-glob';
 
-const normalizePathString = normalizePath
-  .toString()
-  .substring(6)
-  .replace(/\n {2}/g, '\n    ');
+const normalizePathString = normalizePath.toString().substring(10);
 
 function dynamicImportVariables({ include, exclude, warnOnError, errorWhenNoFilesFound } = {}) {
   const filter = createFilter(include, exclude);

From c5aff1924766300c56bf5ba682bbdbf3cde3b95b Mon Sep 17 00:00:00 2001
From: Danny Gleckler <daniel.gleckler@d2l.com>
Date: Fri, 18 Oct 2024 16:11:34 -0400
Subject: [PATCH 3/6] Handle nesting better

---
 .../src/dynamic-import-to-glob.js             |   2 +-
 ...llup-plugin-dynamic-import-vars.test.js.md |  22 +++++++++---------
 ...up-plugin-dynamic-import-vars.test.js.snap | Bin 1152 -> 1163 bytes
 .../test/src/dynamic-import-to-glob.test.mjs  |   3 ++-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/packages/dynamic-import-vars/src/dynamic-import-to-glob.js b/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
index 004c0394c..90dfbb26d 100644
--- a/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
+++ b/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
@@ -131,6 +131,6 @@ export const normalizePath = (p) =>
     // remove any ./ inside the path
     .replace(/\/\.\//g, '/')
     // remove dir/ + ../ pairs
-    .replace(/([^/.][^/]*\/)(([^/.][^/]*\/)(\.\.\/))?(\.\.\/)/g, '')
+    .replace(/([^/.][^/]*\/)(([^/.][^/]*\/)(([^/.][^/]*\/)(\.\.\/))*?(\.\.\/))*?(\.\.\/)/g, '')
     // remove unnecessary leading ./
     .replace(/^(\.\/)+(?=\.\.\/)/g, '');
diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
index 2363f7a4d..2a103535f 100644
--- a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
+++ b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
@@ -13,7 +13,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
@@ -43,7 +43,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
@@ -51,7 +51,7 @@ Generated by [AVA](https://avajs.dev).
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
-        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-qW3pa8f7.js');␊
+        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-gQ8U7UtJ.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
             reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
@@ -76,7 +76,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
@@ -106,7 +106,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
@@ -138,7 +138,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
@@ -168,7 +168,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
@@ -176,7 +176,7 @@ Generated by [AVA](https://avajs.dev).
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
-        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-qW3pa8f7.js');␊
+        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-gQ8U7UtJ.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
             reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
@@ -190,7 +190,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
@@ -209,7 +209,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
@@ -277,7 +277,7 @@ Generated by [AVA](https://avajs.dev).
         // remove any ./ inside the path␊
         .replace(/\\/\\.\\//g, '/')␊
         // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))?(\\.\\.\\/)/g, '')␊
+        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
         // remove unnecessary leading ./␊
         .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
       switch (normalPath) {␊
diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap
index d793029ac0e0b26c5557d2f6145fb0ee62b8a004..35bbebf7c101227935159def83d6db0a8bcf0e09 100644
GIT binary patch
literal 1163
zcmV;61a$jBRzV<BZeeh9Xm4~Nb~6eC08le^wdinGEVU?C@h6WN<o{IS3(*%&zIGC{
zccnyLTOW%E00000000B+TFY+RMih1G6a|=7cSTnhK>(7mNJeVfCN@+fL8`O`Qlt+T
zF5=i4l2_8$<P1GCw51wcbk}}CfbQHyf$sVr{eyl(|Dc<K6lIe#Wywy07%jCD#hEj6
z@60(occ|l@8*pz={`@N{ssh}Vl=TAyp9(4&iR6GQ`Qx$g6GgsX{%v{bou%}1?d_#^
z-+Hm!i<ze=XRxz#Km;XjfR9Fugw*>yjJQx=$4t=>@9gXt5m5sZjx+#|GpT@a5t863
zQ3Gg0dQ$@ca2yaA@&g3IMqoQYnWR2~8sKRoTVNCr4-IF_*|N7Br{4hG(ak9Yp9%+7
zz_uNT2o-Xwukmc#v7bNNcAnqfa!lj=%Pl({$TV-SSA5OJKQnyH7<wor5hDnY_>}d*
zcBUq=ZDa^5#(KL9wx$8dL#n(17^kTkClJ6R5<$0}ko$3fmQRI6CKtqN+PhL;1%WCS
z3~06z#%XI}HLV_v**713)=67tW6i^C&BJV2`xyD&X!D?e>0^(?fja5O@DQE~9#V<M
zWbYUPB@Yg;0Rnf?Q<E403^j_7_h3K97@ts2a7E-EwA*daC%tu8pT55e64kdfL>?>C
z$gv<tw_VD7gT+D6$Y%4Y5L_5HH`pHIhYTjW82s@z&Ldrgo3K*YvZk5C=5Z$3b)rF{
zX(yZ*cYTs2$Y3PIab$Ta<};={wHCLIQjo;nm0fd9OEe9KX%9FmjReV>mUB4_<3Q19
z%w~C(&e#7a(fRm#P3M}<=h3+W)16$n^XBPVP3wbw{|EBj-Ny@K&Y7ocwXB_c{b=~O
zNh>gA?52QDj}BEV(2Ao&B7AA3TW<z%Ra2|~)xC|6H`EukvQ;RXPelVRCvUfod@7QQ
z3tN=0PO1r+j#OBc-%Hx|OKnx&thT)tajVVB6*4O?>sDfqhf#pTlyn|Z$VfV|3fIC*
z%<k5%rFJd<3D;8VPr*`rNkY7wt+;iRIg4&#X)>RYA|~CW3o9v4lZ#hVX~;em=qWBn
z6^`RYNtb@A9mgBiCBeC}Cekp2k)<|P(D{(wy|Y^-NX3Tk0${GyX^tqne?P7n{>qL+
ziV40je~0g#9*2~osW=(A@mGn<f8JP-%dMKrwa2*19-}@PdA%ZczC1K*dH8?IL(PfW
z{??qRIpGCFO6YK&#WBMXzp__^>8OdO&3`7H2V<)NGQ$|(H=+H>2~T-|cEJ0FK8^!@
zy#aZ%H7zmMW_bUO;Nc@GF7@7^wcvY$4(E-kL5t-;)8{CeuD}}**2hUP0BS%K$N`T7
z9~f8QV&1|(QzvZxQz{ewUMi)9SWSIq79JR-uoofCtYYfnEGRua>L@O(K0f;>{7kG?
zc6mBPWf}FLoXv-YJnnmh0S>(&_7QqCz_aDl=0Pz{*9Hrggn1w@{Th7u{#3mOL`oFt
d3@S>$`adr9bF6-jUH$*K{0nS3MAx|{006(GCsP0b

literal 1152
zcmV-`1b_QMRzV<BZeeh9Xm4~Nb~6eC0B8^bFDM%?J0uSnQ-g!$OkwFy5V_2J)<4bs
zQ(mwl1RskC00000000B+T1{`;Mi6!C6a|=5Z$(dozyQfwBqJql6C0|LAW_;wil9wf
z7jbMaxg%+9a+ls++EN^%=%qkVptt^j^!N22^iq(bY*D5n+4*SNQYWpr`(|f2Z}@ho
z7hOLT!M=L_2WqB6+*6GALIlbrQ=G)AFSPpk1*JrjAD4e!Uix4u`&@c|>BIM)Eq4<h
zXeK!9>>Luwh#%tJAtw<FzKUWY^*0IEEW&F$J623|--crYAP`(>;6g?ud`NU3+K^o|
z002A>Bu3&8f$$-?9x$#LMbLdbo#aZ4LlU6nZFyVnmgn^vV0xxKg+Q6~U=>`~gP1U>
zrq)`Iw>|gC<8ANBCtIFvO%1o)4B56f#@})yXKW;#V}ME#IfM`iWxNNjH)Uzt$`Mwr
zjdmGq-2hNWOb30iPUA6(5<ox{g6VpZph<`hWzr$z0dbn{o-)@!qD~|SmWSIqolTsk
z(`5<&_OmZL+05M5Jj~WS%$9S2F%5>BhZC3-yCezq$vTcl@KB0~DYV83Vo6jYJj4b_
z+`~YReFU)dFh<dZg9H<Nzyc{WQTxztx4|5*HeqA>`Wh(Ik645v(Y94!L4of2j8lsz
zVc5ubb5BYkt*hVheJ+kTj8hfpC|3(l*WfCwPUNL+7qEq&X+BO3NDbp8@kdJ^<N>lc
ziE!ju5sLY=*qyo;E5{i~>h7ssd)-J40|(g(I4)U&bloTj8%0T|Sv;bwI?LJ1zn3`s
z%jKH0HD{|Z{qew`w@=?`I@b^AQ}X?d`wL^v*{AQcoSmD!cyPbTDlk>zXMkRp4Rj*W
zN#Y|SsdBRXngLuj)j9a#dQ5J1Kd;MIMfsvkHsE44Y~`3TnV!FT#l_vph@TgW3eoXf
zset`di;lNYz}`p&t7XSKBs*SJcO-#`;t&TJvjU=#lWb!Z`r}cFzV~YVQR|O?kN&8O
z%!D}jnnZXpfv|F%YlPj2Tazn>3^CnJcVRUnV|xC>Pv$aZ5(6#dutGaLD;1xp)(&r@
z_(&nNGv@yc+Lh)wVdqnJ<Jw+T)tQ{=F97B{o#v47Tep&$#;>hKF&W@<lXURWX^W!d
zO+~lj%JULopI%vzu&tV~wOaVc)k58^c(ax4<u#yL*MR?U4X6{pR;zX5|4$M>2#HeA
z5hC|vhJbx-Z`m@dsbS22y1Wd=)qUiaHM(v?`->AYiV)pU^el7a2U4>E#k6%Jwby4z
z^^O$LT_!Kom2WNBmG21As4_aK-kVgQ;--e6Pk0Z<+8uPCXi$BTgcP{Y;A1g^o{{yN
zf0b1IpG&2%5T|L*jKXcJ<n|(@nRWKLGYiVh+7FXA)*SUCCVnPPD<7Vks66%DE=Tju
zL>vzS!T|?Cm{5c+3-RpfXY+6}Oqco#p5O{cUinS(;Nz*|84#sVW;>`jsn!1lsUKGL
S!|EORFUa3<Rm{o8B>({1Pb~oe

diff --git a/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs b/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
index dd477023e..b6d304602 100644
--- a/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
+++ b/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
@@ -296,7 +296,8 @@ test('escapes []', (t) => {
   './../فو/bar/../../foo.js',
   '../foo/../foo.js',
   './../foo/../bar/.././../foo.js',
-  './../foo/bar/.././../foo.js'
+  './../foo/bar/.././../foo.js',
+  './foo/bar/baz/../qux/../../../../foo.js'
 ].forEach((p) => {
   test(`normalizePath - ${p}`, (t) => {
     const normalPath = normalizePath(p);

From 943df50c947041cca9c89b11a1c636e03dce8515 Mon Sep 17 00:00:00 2001
From: Danny Gleckler <daniel.gleckler@d2l.com>
Date: Fri, 18 Oct 2024 16:20:44 -0400
Subject: [PATCH 4/6] Fix lint

---
 .../dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs b/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
index b6d304602..1fdc7642e 100644
--- a/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
+++ b/packages/dynamic-import-vars/test/src/dynamic-import-to-glob.test.mjs
@@ -288,7 +288,6 @@ test('escapes []', (t) => {
   t.is(glob, './*/\\[foo\\].js');
 });
 
-
 [
   './../foo/./../foo.js',
   './../../a/foo.js',

From 16b1fd7e63e75e40e89d3bf7265a5d6b22bd0f81 Mon Sep 17 00:00:00 2001
From: Danny Gleckler <daniel.gleckler@d2l.com>
Date: Fri, 18 Oct 2024 17:11:16 -0400
Subject: [PATCH 5/6] Account for minification

---
 .../src/dynamic-import-to-glob.js             |  19 +-
 packages/dynamic-import-vars/src/index.js     |   4 +-
 ...llup-plugin-dynamic-import-vars.test.js.md | 166 +++++++++++-------
 ...up-plugin-dynamic-import-vars.test.js.snap | Bin 1163 -> 1195 bytes
 4 files changed, 114 insertions(+), 75 deletions(-)

diff --git a/packages/dynamic-import-vars/src/dynamic-import-to-glob.js b/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
index 90dfbb26d..2697d27ee 100644
--- a/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
+++ b/packages/dynamic-import-vars/src/dynamic-import-to-glob.js
@@ -126,11 +126,14 @@ export function dynamicImportToGlob(node, sourceString) {
   return glob;
 }
 
-export const normalizePath = (p) =>
-  p
-    // remove any ./ inside the path
-    .replace(/\/\.\//g, '/')
-    // remove dir/ + ../ pairs
-    .replace(/([^/.][^/]*\/)(([^/.][^/]*\/)(([^/.][^/]*\/)(\.\.\/))*?(\.\.\/))*?(\.\.\/)/g, '')
-    // remove unnecessary leading ./
-    .replace(/^(\.\/)+(?=\.\.\/)/g, '');
+export function normalizePath(p) {
+  return (
+    p
+      // remove any ./ inside the path
+      .replace(/\/\.\//g, '/')
+      // remove dir/ + ../ pairs
+      .replace(/([^/.][^/]*\/)(([^/.][^/]*\/)(([^/.][^/]*\/)(\.\.\/))*?(\.\.\/))*?(\.\.\/)/g, '')
+      // remove unnecessary leading ./
+      .replace(/^(\.\/)+(?=\.\.\/)/g, '')
+  );
+}
diff --git a/packages/dynamic-import-vars/src/index.js b/packages/dynamic-import-vars/src/index.js
index daad3e8d9..d13549897 100644
--- a/packages/dynamic-import-vars/src/index.js
+++ b/packages/dynamic-import-vars/src/index.js
@@ -13,7 +13,7 @@ import {
   normalizePath
 } from './dynamic-import-to-glob';
 
-const normalizePathString = normalizePath.toString().substring(10);
+const normalizePathString = normalizePath.toString().replace(/\n/g, '\n  ');
 
 function dynamicImportVariables({ include, exclude, warnOnError, errorWhenNoFilesFound } = {}) {
   const filter = createFilter(include, exclude);
@@ -78,7 +78,7 @@ function dynamicImportVariables({ include, exclude, warnOnError, errorWhenNoFile
             // will turn these into chunks automatically
             ms.prepend(
               `function __variableDynamicImportRuntime${dynamicImportIndex}__(path) {
-  const normalPath = path${normalizePathString};
+  path = (${normalizePathString})(path);
   switch (normalPath) {
 ${paths
   .map((p) => `    case '${p}': return import('${p}'${importArg ? `, ${importArg}` : ''});`)
diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
index 2a103535f..496447938 100644
--- a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
+++ b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
@@ -9,13 +9,17 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
@@ -39,19 +43,23 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
-        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-gQ8U7UtJ.js');␊
+        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-3kYiIOy5.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
             reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
@@ -72,13 +80,17 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case '../module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case '../module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
@@ -102,13 +114,17 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
@@ -134,13 +150,17 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case './root-module-a.js': return import('./root-module-a-lF5i40jF.js');␊
         case './root-module-b.js': return import('./root-module-b-F1yin99u.js');␊
@@ -164,19 +184,23 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime2__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
-        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-gQ8U7UtJ.js');␊
+        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-3kYiIOy5.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
             reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
@@ -186,13 +210,17 @@ Generated by [AVA](https://avajs.dev).
      }␊
     ␊
     function __variableDynamicImportRuntime1__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
@@ -205,13 +233,17 @@ Generated by [AVA](https://avajs.dev).
      }␊
     ␊
     function __variableDynamicImportRuntime0__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
@@ -273,13 +305,17 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      const normalPath = path␊
-        // remove any ./ inside the path␊
-        .replace(/\\/\\.\\//g, '/')␊
-        // remove dir/ + ../ pairs␊
-        .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
-        // remove unnecessary leading ./␊
-        .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '');␊
+      path = (function normalizePath(p) {␊
+        return (␊
+          p␊
+            // remove any ./ inside the path␊
+            .replace(/\\/\\.\\//g, '/')␊
+            // remove dir/ + ../ pairs␊
+            .replace(/([^/.][^/]*\\/)(([^/.][^/]*\\/)(([^/.][^/]*\\/)(\\.\\.\\/))*?(\\.\\.\\/))*?(\\.\\.\\/)/g, '')␊
+            // remove unnecessary leading ./␊
+            .replace(/^(\\.\\/)+(?=\\.\\.\\/)/g, '')␊
+        );␊
+      })(path);␊
       switch (normalPath) {␊
         case './module-dir-a/module-a-1.js': return import('./module-a-1-fiunS6HF.js');␊
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap
index 35bbebf7c101227935159def83d6db0a8bcf0e09..cd8622916dc35f28875b2f2193f8ca6680f2c075 100644
GIT binary patch
literal 1195
zcmV;c1XTM$RzV<BZeeh9Xm4~Nb~6eC04xVa5V52my^8qjS|WSQJ4HKsdy#|>VhS~}
z*iDL|*&mAt00000000B+TFY+RMih1G6a|QEx+}W62m+9dMKV&7qOqYG2~wq5q&512
zgE+Q_<drlwIYZA3Z7Bv9UG_85ZTki7XY>yObk|LR?z$;RN-}9vmh3n|Vo)1#q?t4K
zp?i4lP%pb~z`b4h^Dn5V3UEhK)(a4PDyU>6l6|h^PcMC+DDrgipT&ib7Sh+14;McE
z;MHO`W}c#)!PeG35tO(AJ{&R<QtxpXaiPAAnW7=y+S)QAqWUHrY5?gKw85AxW?Y0M
zpf7NZsJ;>9vj7CDSTHcM0YEf*2XGt^81j7t!iHcwK$)aIg6d-iKAC6>i~{1J;cPe?
z_J-s18lXG6S%KtJ;lL8uwgVBNLRMfH&o&+V`Lj*u`OOW-G)^CG*y)C*d2_YmGP9%7
zjF>U>P)Z_(5Fqg>>w)c57_(_)NK3|Qy8_f)(Et)N4|;kn52*6`VC11*o8$t(BN9Qk
zosj!+fR;~%MaBbSHSHa#FOO3}v!ohFvx(KTx-@3refCu+otf=53$rx~vt{jJ<a@*Q
z{Q{<sT@nXsvX0>atO*`ciIZQFAyD#Q9~&TW2R$|R5x`Kx2zeLwVvO+#^#oT$?n1lW
z27SC*ht=cXFM~w&Jq?k^$}}cv$kA<=GT&fv5HvDtz7&EB<N6P5m+=Dz<AMM`uZWSS
z%Wxf*ppb|0&tT+dl8qA$5>1;_NWSz*79fL>5OdE)p_pBK+sATo<1htD>>asnu4sv-
z;UHZBhozk$S<yzc5QcG}Xp|F!Jjo1K|0^-W-&bp9sF~p{F+&BWJ07^R>~yWBb$ic$
zL4LgRXl~3IcDh!}+WNc~4IVXV1*VMM6wv9?fr<rMadbe0FRe5sQ-G_cTDNzf(#PKn
z@75$)L6SZd4LBcD-Z=EBNY2iY(I`79V`OYoA)x*((d1vXfVwm^`9^rMmQe4IgnC^K
z6?;640vv$HnMV{dk{VW_rG77w#ILoMx-=wFYpDy;QZ<zogwEF_#Pf-r8;6<R*)F6e
zQ$HzUvYl+hQd-H$+1tg`WuFT46c@t^9rUV1aevl2=<-mU;9OZ_mYGuAr8!p6xl8Zd
z+Nt8U;zV~2FxTodhm_sB7uRHQVMj;B0H2u(2A>=q9hJPPI7PblM~N1GyEZ2+v}#&-
z=V_r<KJ_Wm`@ol{GflH*nwn|qW0*HpUbVij%d0N0vzM0_5GkR<dFICy$$w$bi_={b
zO`CnEJPpQHePo7_e{Vwji_AukGsy$A1Ku<A+z<5i28^byXo<NprMc+{9zLYvTu**l
zb3Xa$aNelewAk-7eU6gp3cNmHJsfvCp!!6C?DIJAfpG;cj%N5L8lm-LPtzAlVIfvi
zpBjbxM#=4Yie_53_+T28o*oMo6RYRvM1_xu)yjrPTU7Rm_sh|IP>AE6M;PG13t}Ik
zO9MRFFRt$w!*r!TXU{uw<hB13G5GXYLkmPo6sZLjy>0#9srr^!-xA-?1F&=Q#Q%|5
Jl7(C;006daI4A%B

literal 1163
zcmV;61a$jBRzV<BZeeh9Xm4~Nb~6eC08le^wdinGEVU?C@h6WN<o{IS3(*%&zIGC{
zccnyLTOW%E00000000B+TFY+RMih1G6a|=7cSTnhK>(7mNJeVfCN@+fL8`O`Qlt+T
zF5=i4l2_8$<P1GCw51wcbk}}CfbQHyf$sVr{eyl(|Dc<K6lIe#Wywy07%jCD#hEj6
z@60(occ|l@8*pz={`@N{ssh}Vl=TAyp9(4&iR6GQ`Qx$g6GgsX{%v{bou%}1?d_#^
z-+Hm!i<ze=XRxz#Km;XjfR9Fugw*>yjJQx=$4t=>@9gXt5m5sZjx+#|GpT@a5t863
zQ3Gg0dQ$@ca2yaA@&g3IMqoQYnWR2~8sKRoTVNCr4-IF_*|N7Br{4hG(ak9Yp9%+7
zz_uNT2o-Xwukmc#v7bNNcAnqfa!lj=%Pl({$TV-SSA5OJKQnyH7<wor5hDnY_>}d*
zcBUq=ZDa^5#(KL9wx$8dL#n(17^kTkClJ6R5<$0}ko$3fmQRI6CKtqN+PhL;1%WCS
z3~06z#%XI}HLV_v**713)=67tW6i^C&BJV2`xyD&X!D?e>0^(?fja5O@DQE~9#V<M
zWbYUPB@Yg;0Rnf?Q<E403^j_7_h3K97@ts2a7E-EwA*daC%tu8pT55e64kdfL>?>C
z$gv<tw_VD7gT+D6$Y%4Y5L_5HH`pHIhYTjW82s@z&Ldrgo3K*YvZk5C=5Z$3b)rF{
zX(yZ*cYTs2$Y3PIab$Ta<};={wHCLIQjo;nm0fd9OEe9KX%9FmjReV>mUB4_<3Q19
z%w~C(&e#7a(fRm#P3M}<=h3+W)16$n^XBPVP3wbw{|EBj-Ny@K&Y7ocwXB_c{b=~O
zNh>gA?52QDj}BEV(2Ao&B7AA3TW<z%Ra2|~)xC|6H`EukvQ;RXPelVRCvUfod@7QQ
z3tN=0PO1r+j#OBc-%Hx|OKnx&thT)tajVVB6*4O?>sDfqhf#pTlyn|Z$VfV|3fIC*
z%<k5%rFJd<3D;8VPr*`rNkY7wt+;iRIg4&#X)>RYA|~CW3o9v4lZ#hVX~;em=qWBn
z6^`RYNtb@A9mgBiCBeC}Cekp2k)<|P(D{(wy|Y^-NX3Tk0${GyX^tqne?P7n{>qL+
ziV40je~0g#9*2~osW=(A@mGn<f8JP-%dMKrwa2*19-}@PdA%ZczC1K*dH8?IL(PfW
z{??qRIpGCFO6YK&#WBMXzp__^>8OdO&3`7H2V<)NGQ$|(H=+H>2~T-|cEJ0FK8^!@
zy#aZ%H7zmMW_bUO;Nc@GF7@7^wcvY$4(E-kL5t-;)8{CeuD}}**2hUP0BS%K$N`T7
z9~f8QV&1|(QzvZxQz{ewUMi)9SWSIq79JR-uoofCtYYfnEGRua>L@O(K0f;>{7kG?
zc6mBPWf}FLoXv-YJnnmh0S>(&_7QqCz_aDl=0Pz{*9Hrggn1w@{Th7u{#3mOL`oFt
d3@S>$`adr9bF6-jUH$*K{0nS3MAx|{006(GCsP0b


From b60fe9ef4eec9cc4c449b4c202c8b4fc1ab94da1 Mon Sep 17 00:00:00 2001
From: Danny Gleckler <daniel.gleckler@d2l.com>
Date: Fri, 18 Oct 2024 17:59:56 -0400
Subject: [PATCH 6/6] Fix variable name

---
 packages/dynamic-import-vars/src/index.js     |   2 +-
 ...llup-plugin-dynamic-import-vars.test.js.md |  22 +++++++++---------
 ...up-plugin-dynamic-import-vars.test.js.snap | Bin 1195 -> 1204 bytes
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/dynamic-import-vars/src/index.js b/packages/dynamic-import-vars/src/index.js
index d13549897..c7152cfd8 100644
--- a/packages/dynamic-import-vars/src/index.js
+++ b/packages/dynamic-import-vars/src/index.js
@@ -78,7 +78,7 @@ function dynamicImportVariables({ include, exclude, warnOnError, errorWhenNoFile
             // will turn these into chunks automatically
             ms.prepend(
               `function __variableDynamicImportRuntime${dynamicImportIndex}__(path) {
-  path = (${normalizePathString})(path);
+  const normalPath = (${normalizePathString})(path);
   switch (normalPath) {
 ${paths
   .map((p) => `    case '${p}': return import('${p}'${importArg ? `, ${importArg}` : ''});`)
diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
index 496447938..df1ff0319 100644
--- a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
+++ b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
@@ -43,7 +43,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
@@ -59,7 +59,7 @@ Generated by [AVA](https://avajs.dev).
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
-        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-3kYiIOy5.js');␊
+        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-ULPK6OKR.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
             reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
@@ -80,7 +80,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
@@ -114,7 +114,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
@@ -150,7 +150,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
@@ -184,7 +184,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime2__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
@@ -200,7 +200,7 @@ Generated by [AVA](https://avajs.dev).
         case './module-dir-a/module-a-2.js': return import('./module-a-2-qepdcyXv.js');␊
         case './module-dir-b/module-b-1.js': return import('./module-b-1-3qdzaV4G.js');␊
         case './module-dir-b/module-b-2.js': return import('./module-b-2-_8gpxG1i.js');␊
-        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-3kYiIOy5.js');␊
+        case './sub-dir/fixture-upwards-path.js': return import('./fixture-upwards-path-ULPK6OKR.js');␊
         default: return new Promise(function(resolve, reject) {␊
           (typeof queueMicrotask === 'function' ? queueMicrotask : setTimeout)(␊
             reject.bind(null, new Error("Unknown variable dynamic import: " + normalPath))␊
@@ -210,7 +210,7 @@ Generated by [AVA](https://avajs.dev).
      }␊
     ␊
     function __variableDynamicImportRuntime1__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
@@ -233,7 +233,7 @@ Generated by [AVA](https://avajs.dev).
      }␊
     ␊
     function __variableDynamicImportRuntime0__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
@@ -305,7 +305,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `function __variableDynamicImportRuntime0__(path) {␊
-      path = (function normalizePath(p) {␊
+      const normalPath = (function normalizePath(p) {␊
         return (␊
           p␊
             // remove any ./ inside the path␊
diff --git a/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap b/packages/dynamic-import-vars/test/snapshots/rollup-plugin-dynamic-import-vars.test.js.snap
index cd8622916dc35f28875b2f2193f8ca6680f2c075..1ab24197b226ce656081aeb72d63d176b0a47b5f 100644
GIT binary patch
literal 1204
zcmV;l1WWrtRzV<BZeeh9Xm4~Nb~6eC03j==E(4S982m_WX!aCa91M(vqA-3f`u#1`
zc_*vfP9KX100000000B+n$2$8Mi9rHIza#;m)?q=27v*Ru}DU08Z<UkBSEUPNYff=
zQ@Ds@dr6L@waHz2cWFy8c<8Z@k-kLVpy$3pUZ4ojTY;iLK~j=Mo3iAOe%PQc(u%wP
z-PzInIJ4B7wi|G7NB;N|Dyjn9mXvh@1fL2j8Hr?<EBV74-zSQEKmXVK+|9Z4b?wI7
z`|rJ*Z^z72lrz}e+#`Y#H^9ezMndX+5k_37=P^?>#JiiDMnqKCgaZx0<4h`GT!bW8
zC8`TeFh)Z8*Yq`}SBxkh0U%Jtf`O4W0HVP=fa8F`knbT7)(6`G$|Us>R2Lzga@5fl
z7zM;b!&!IM?RCfL)IfK1vqZ_K!huDwZ3iMkg)Gr9UT!${tCt(jt2^tCX`I|#x6=tt
z^Ug}i$7~&?%ZM3652Ylc4*?RNvJTiz$znE)Oli?rX_knZ%Njsp<_<_d%YCZ6E*OU%
z81Ax1B!X@`A@}0|EuRXD3>(C%+uKrK8oGjJ4mJ*Z6RU2uY0SR4|9LCznawp#voTGx
zVeMk%d;PV&F-;%aBo5SQ9K(HB6+EO8N53RPpya_G)<EDkdTMARfT8*k@;2<o7~?bQ
z39g9Tfo8J_`f#)kD@U&{fkgE!4UxynG)8X7)oqtD-(YbN)UwrlCIlD8?H6o^@qGrv
z-~d05j)A31a2poKBEcN~3<h>4Sv%1n(X>&7<U^lj8)PsNVs6=BE2anH))8MU9Hb(N
zy)C!QWi8P(?4={%pfD38%h~`DVHgLBMmZ$paZ22{S)jxp*DFd?l=u%QQKIP%8}77q
zx>nu#XxD#DzPtBiX3Z(<bghQ9`AH}0J*m?YO&PnXpwp&36$`ZDXrBmQTB%DW2$yxW
zUVORw^#0dRpI5*v0j5ty4bDc*g#(|8<n+9Z2Hr`Dk<sQjGOy1SkokL+SY1hE{v*t+
zQmg+_YIWY+D)x971=vet*&_-WNf%ZEj9&`C__@llt|Tz39P5H|tO{#m3D8$0#Iq$q
z3kO*qv^D0MEGtSCldWV67Sl*hPG3@{Ci_&Nr?}{s96Y@%;O=deA6-q{3C@)@B+i6D
zFZ8j3*2nbT-R&~Yjdyfs5Ob|oy-(SL2XO_C3p;8W-{4bYq4&YzQB%R1l2fN!ZwrX{
z_127tXjF)}REVfDqUzM?GO+Vx>eMUhRMe@CZT^i=t7?EM)T&TBU#NKjkrG;*XLd{|
z3oh&#bUJIIY18kZC&}2Vi_9?c>n1cm9fdy+&<=RV&~rP`*K087wyY)Q@`M7YC3yIl
ziZeYyYRvcqsl|D%Y|`<XsP1!=OjqD_3G3jnA_CPV3S^hZfe(x;aB<MXKUOTQ{aL7$
zew!<73$g0@#9er36wIC_XeL#Zk0wd!=`qr{WA*%8Y3yraHL~X66s5J~!{Tl}8r#QR
zk1)WV7sNh7n+ABird-<_-==Hb8SCPKA?N;|MeoBSMK2I3QKTy<seh~gW>vSx>h^f~
S56sTUjK2YjnBOqSDF6T*;YLFM

literal 1195
zcmV;c1XTM$RzV<BZeeh9Xm4~Nb~6eC04xVa5V52my^8qjS|WSQJ4HKsdy#|>VhS~}
z*iDL|*&mAt00000000B+TFY+RMih1G6a|QEx+}W62m+9dMKV&7qOqYG2~wq5q&512
zgE+Q_<drlwIYZA3Z7Bv9UG_85ZTki7XY>yObk|LR?z$;RN-}9vmh3n|Vo)1#q?t4K
zp?i4lP%pb~z`b4h^Dn5V3UEhK)(a4PDyU>6l6|h^PcMC+DDrgipT&ib7Sh+14;McE
z;MHO`W}c#)!PeG35tO(AJ{&R<QtxpXaiPAAnW7=y+S)QAqWUHrY5?gKw85AxW?Y0M
zpf7NZsJ;>9vj7CDSTHcM0YEf*2XGt^81j7t!iHcwK$)aIg6d-iKAC6>i~{1J;cPe?
z_J-s18lXG6S%KtJ;lL8uwgVBNLRMfH&o&+V`Lj*u`OOW-G)^CG*y)C*d2_YmGP9%7
zjF>U>P)Z_(5Fqg>>w)c57_(_)NK3|Qy8_f)(Et)N4|;kn52*6`VC11*o8$t(BN9Qk
zosj!+fR;~%MaBbSHSHa#FOO3}v!ohFvx(KTx-@3refCu+otf=53$rx~vt{jJ<a@*Q
z{Q{<sT@nXsvX0>atO*`ciIZQFAyD#Q9~&TW2R$|R5x`Kx2zeLwVvO+#^#oT$?n1lW
z27SC*ht=cXFM~w&Jq?k^$}}cv$kA<=GT&fv5HvDtz7&EB<N6P5m+=Dz<AMM`uZWSS
z%Wxf*ppb|0&tT+dl8qA$5>1;_NWSz*79fL>5OdE)p_pBK+sATo<1htD>>asnu4sv-
z;UHZBhozk$S<yzc5QcG}Xp|F!Jjo1K|0^-W-&bp9sF~p{F+&BWJ07^R>~yWBb$ic$
zL4LgRXl~3IcDh!}+WNc~4IVXV1*VMM6wv9?fr<rMadbe0FRe5sQ-G_cTDNzf(#PKn
z@75$)L6SZd4LBcD-Z=EBNY2iY(I`79V`OYoA)x*((d1vXfVwm^`9^rMmQe4IgnC^K
z6?;640vv$HnMV{dk{VW_rG77w#ILoMx-=wFYpDy;QZ<zogwEF_#Pf-r8;6<R*)F6e
zQ$HzUvYl+hQd-H$+1tg`WuFT46c@t^9rUV1aevl2=<-mU;9OZ_mYGuAr8!p6xl8Zd
z+Nt8U;zV~2FxTodhm_sB7uRHQVMj;B0H2u(2A>=q9hJPPI7PblM~N1GyEZ2+v}#&-
z=V_r<KJ_Wm`@ol{GflH*nwn|qW0*HpUbVij%d0N0vzM0_5GkR<dFICy$$w$bi_={b
zO`CnEJPpQHePo7_e{Vwji_AukGsy$A1Ku<A+z<5i28^byXo<NprMc+{9zLYvTu**l
zb3Xa$aNelewAk-7eU6gp3cNmHJsfvCp!!6C?DIJAfpG;cj%N5L8lm-LPtzAlVIfvi
zpBjbxM#=4Yie_53_+T28o*oMo6RYRvM1_xu)yjrPTU7Rm_sh|IP>AE6M;PG13t}Ik
zO9MRFFRt$w!*r!TXU{uw<hB13G5GXYLkmPo6sZLjy>0#9srr^!-xA-?1F&=Q#Q%|5
Jl7(C;006daI4A%B