fix(babel): fixed detection of export/import statements (fixes #1367) (…

…#1370) * fix(babel): fixed detection of export/import statements (fixes #1367) * chore: changeset
callstack · Oct 9, 2023 · e25e91f · e25e91f
1 parent a6a15b9
commit e25e91f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.changeset/lazy-owls-dream.md b/.changeset/lazy-owls-dream.md
@@ -0,0 +1,6 @@
+---
+'@linaria/babel-preset': patch
+'@linaria/shaker': patch
+---
+
+Fixed detection of export/import statements. Fixes #1367
diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md
@@ -222,7 +222,7 @@ module.exports = {
           return false;
         }
         
-        return /(?:^|\*\/|;)\s*(?:export|import)\s/m.test(code);
+        return /(?:^|\*\/|;|})\s*(?:export|import)\s/m.test(code);
       },
       action: require.resolve('@linaria/shaker'),
     }

diff --git a/examples/vite/.linariarc.mjs b/examples/vite/.linariarc.mjs
@@ -13,7 +13,7 @@ module.exports = {
                     return false;
                 }
 
-                return /(?:^|\*\/|;)\s*(?:export|import)\s/m.test(code);
+                return /(?:^|\*\/|;|})\s*(?:export|import)\s/m.test(code);
             },
             action: require.resolve('@linaria/shaker'),
         },

diff --git a/packages/babel/src/transform/helpers/loadLinariaOptions.ts b/packages/babel/src/transform/helpers/loadLinariaOptions.ts
@@ -77,7 +77,7 @@ export default function loadLinariaOptions(
           }
 
           // If a file contains `export` or `import` keywords, we assume it's an ES-module
-          return /(?:^|\*\/|;)\s*(?:export|import)\s/m.test(code);
+          return /(?:^|\*\/|;|})\s*(?:export|import)\s/m.test(code);
         },
         action: require.resolve('@linaria/shaker'),
       },

diff --git a/packages/shaker/src/plugins/__tests__/shaker-plugin.test.ts b/packages/shaker/src/plugins/__tests__/shaker-plugin.test.ts
@@ -35,7 +35,7 @@ const keep =
       configFile: false,
       filename,
       presets,
-      sourceType: /(?:^|\*\/|;)\s*(?:export|import)\s/m.test(formattedCode)
+      sourceType: /(?:^|\*\/|;|})\s*(?:export|import)\s/m.test(formattedCode)
         ? 'module'
         : 'script',
       plugins: [