From 43cbc64c6092861e3ac6bb180c78096b89657081 Mon Sep 17 00:00:00 2001 From: Arnaud Weyts Date: Thu, 10 Oct 2024 11:47:06 +0200 Subject: [PATCH 1/3] test(babel-plugin-transform-vite-meta-glob): it should use import instead of require --- .../src/__tests__/__snapshots__/index.ts.snap | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/babel-plugin-transform-vite-meta-glob/src/__tests__/__snapshots__/index.ts.snap b/packages/babel-plugin-transform-vite-meta-glob/src/__tests__/__snapshots__/index.ts.snap index 416a6ac..906568c 100644 --- a/packages/babel-plugin-transform-vite-meta-glob/src/__tests__/__snapshots__/index.ts.snap +++ b/packages/babel-plugin-transform-vite-meta-glob/src/__tests__/__snapshots__/index.ts.snap @@ -6,9 +6,9 @@ const modules = import.meta.glob("./fixtures/**/*", { eager: true }) ↓ ↓ ↓ ↓ ↓ ↓ -const __glob__0_0 = require('./fixtures/file1.ts') -const __glob__0_1 = require('./fixtures/file2.ts') -const __glob__0_2 = require('./fixtures/file3.ts') +import __glob__0_0 from './fixtures/file1.ts' +import __glob__0_1 from './fixtures/file2.ts' +import __glob__0_2 from './fixtures/file3.ts' const modules = { './fixtures/file1.ts': __glob__0_0, './fixtures/file2.ts': __glob__0_1, @@ -113,8 +113,8 @@ const modules = import.meta.glob("./fixtures/**/*{1,3}*", { eager: true }) ↓ ↓ ↓ ↓ ↓ ↓ -const __glob__0_0 = require('./fixtures/file1.ts') -const __glob__0_1 = require('./fixtures/file3.ts') +import __glob__0_0 from './fixtures/file1.ts' +import __glob__0_1 from './fixtures/file3.ts' const modules = { './fixtures/file1.ts': __glob__0_0, './fixtures/file3.ts': __glob__0_1 From 959bdf1147bf30f95dd33b53e347f0ba937d5055 Mon Sep 17 00:00:00 2001 From: Arnaud Weyts Date: Thu, 10 Oct 2024 11:47:55 +0200 Subject: [PATCH 2/3] fix(babel-plugin-transform-vite-meta-glob): it should use import instead of require --- .../babel-plugin-transform-vite-meta-glob/src/index.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/babel-plugin-transform-vite-meta-glob/src/index.ts b/packages/babel-plugin-transform-vite-meta-glob/src/index.ts index cdecac6..2c579d3 100644 --- a/packages/babel-plugin-transform-vite-meta-glob/src/index.ts +++ b/packages/babel-plugin-transform-vite-meta-glob/src/index.ts @@ -96,12 +96,7 @@ export default function viteMetaGlobBabelPlugin({ const imports = globPaths.map((globPath, idx) => { const modulePath = t.stringLiteral(globPath) - return t.variableDeclaration('const', [ - t.variableDeclarator( - identifiers[idx], - t.callExpression(t.identifier('require'), [modulePath]) - ) - ]) + return t.importDeclaration([t.importDefaultSpecifier(identifiers[idx])], modulePath) }) const variable = t.variableDeclaration('const', [ From bf3b4dea178050800356aeb26259f4560b7776af Mon Sep 17 00:00:00 2001 From: Arnaud Weyts Date: Thu, 10 Oct 2024 11:53:51 +0200 Subject: [PATCH 3/3] docs(babel-plugin-transform-vite-meta-glob): update docs to reflect the correct format --- packages/babel-plugin-transform-vite-meta-glob/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/babel-plugin-transform-vite-meta-glob/README.md b/packages/babel-plugin-transform-vite-meta-glob/README.md index 83d576b..1b842fa 100644 --- a/packages/babel-plugin-transform-vite-meta-glob/README.md +++ b/packages/babel-plugin-transform-vite-meta-glob/README.md @@ -49,9 +49,9 @@ const modules = { } // eager -import * as __glob__0_0 from './path/to/files/file1.js' -import * as __glob__0_1 from './path/to/files/file2.js' -import * as __glob__0_2 from './path/to/files/file3.js' +import __glob__0_0 from './path/to/files/file1.js' +import __glob__0_1 from './path/to/files/file2.js' +import __glob__0_2 from './path/to/files/file3.js' const eagerModules = { './path/to/files/file1.js': __glob__0_1, './path/to/files/file2.js': __glob__0_2,