fix: fixed a cross-entry wildcart import issue (#55)

Dschungelabenteuer · Sep 22, 2024 · 20b7981 · 20b7981
1 parent cb7ecfe
commit 20b7981
Show file tree

Hide file tree

Showing 37 changed files with 222 additions and 23 deletions.
diff --git a/.changeset/wicked-dingos-type.md b/.changeset/wicked-dingos-type.md
@@ -0,0 +1,6 @@
+---
+"vite-plugin-entry-shaking-debugger": patch
+"vite-plugin-entry-shaking": patch
+---
+
+Fixed cross-entry wildcard import issue
diff --git a/examples/_template_/tsconfig.node.json b/examples/_template_/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/_template_/vite.config.ts b/examples/_template_/vite.config.ts
@@ -8,7 +8,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const pathToLib = resolve(__dirname, './src/lib');
 
-export default defineConfig(async () => ({
+export default defineConfig(() => ({
   plugins: [
     EntryShakingPlugin({
       targets: [pathToLib],

diff --git a/examples/async-import/tsconfig.node.json b/examples/async-import/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/async-import/vite.config.ts b/examples/async-import/vite.config.ts
@@ -8,7 +8,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const pathToLib = resolve(__dirname, './src/lib');
 
-export default defineConfig(async () => ({
+export default defineConfig(() => ({
   plugins: [
     EntryShakingPlugin({
       targets: [pathToLib],

diff --git a/examples/code-defined-within-entry/tsconfig.node.json b/examples/code-defined-within-entry/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/code-defined-within-entry/vite.config.ts b/examples/code-defined-within-entry/vite.config.ts
@@ -10,7 +10,7 @@ const pathToMaxDepth = resolve(__dirname, './src/max-depth');
 const pathToWithImport = resolve(__dirname, './src/with-import');
 const pathToWithoutImport = resolve(__dirname, './src/without-import');
 
-export default defineConfig(async () => ({
+export default defineConfig(() => ({
   plugins: [
     EntryShakingPlugin({
       targets: [pathToMaxDepth, pathToWithImport, pathToWithoutImport],

diff --git a/examples/glob-patterns/tsconfig.node.json b/examples/glob-patterns/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/glob-patterns/vite.config.ts b/examples/glob-patterns/vite.config.ts
@@ -9,7 +9,7 @@ const __dirname = dirname(__filename);
 const pathToLib = resolve(__dirname, './src/lib');
 const pathToEntries = resolve(__dirname, './src/entries');
 
-export default defineConfig(async () => ({
+export default defineConfig(() => ({
   plugins: [
     EntryShakingPlugin({
       targets: [

diff --git a/examples/issue-28/tsconfig.node.json b/examples/issue-28/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/issue-28/vite.config.ts b/examples/issue-28/vite.config.ts
@@ -11,7 +11,7 @@ const pathToFirst = resolve(__dirname, 'src/first/');
 const pathToSecond = resolve(__dirname, 'src/second/');
 const pathToThird = resolve(__dirname, 'src/third/');
 
-export default defineConfig(async () => ({
+export default defineConfig(() => ({
   plugins: [
     EntryShakingPlugin({
       targets: ['@first/', pathToSecond, pathToThird],

diff --git a/examples/issue-53/eslint.config.js b/examples/issue-53/eslint.config.js
@@ -0,0 +1,5 @@
+import vuePreset from '@yungezeit/eslint-vue';
+
+export default [
+  ...vuePreset,
+];
diff --git a/examples/issue-53/index.html b/examples/issue-53/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>vite-plugin-entry-shaking example</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/examples/issue-53/package.json b/examples/issue-53/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "vite-plugin-entry-shaking-example-issue-53",
+  "type": "module",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "dev": "vite",
+    "build": "vue-tsc && vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "vue": "^3.5.7"
+  },
+  "devDependencies": {
+    "@types/node": "^22.5.5",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "@yungezeit/eslint-vue": "^0.0.12",
+    "sass": "^1.79.3",
+    "typescript": "^5.6.2",
+    "vite": "^5.4.7",
+    "vite-plugin-entry-shaking": "workspace:*",
+    "vue-tsc": "^2.1.6"
+  }
+}
diff --git a/examples/issue-53/src/App.vue b/examples/issue-53/src/App.vue
@@ -0,0 +1,6 @@
+<script setup lang="ts">
+</script>
+
+<template>
+  <div>Example</div>
+</template>
diff --git a/examples/issue-53/src/lib/hello/hello.ts b/examples/issue-53/src/lib/hello/hello.ts
@@ -0,0 +1,3 @@
+export function helloWorld() {
+  console.info('Hello, world!');
+}
diff --git a/examples/issue-53/src/lib/hello/index.ts b/examples/issue-53/src/lib/hello/index.ts
@@ -0,0 +1 @@
+export { helloWorld } from './hello';
diff --git a/examples/issue-53/src/lib/index.ts b/examples/issue-53/src/lib/index.ts
@@ -0,0 +1,3 @@
+import * as Hello from './hello';
+
+export { Hello };
diff --git a/examples/issue-53/src/main.ts b/examples/issue-53/src/main.ts
@@ -0,0 +1,11 @@
+import { createApp } from 'vue';
+import App from './App.vue';
+
+import { Hello } from './lib';
+
+console.info(Hello);
+
+Hello.helloWorld();
+
+const app = createApp(App);
+app.mount('#app');
diff --git a/examples/issue-53/src/vite-env.d.ts b/examples/issue-53/src/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/examples/issue-53/tsconfig.json b/examples/issue-53/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "preserve",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "paths": {
+      "@lib/*": ["./src/lib/*"]
+    }
+  },
+  "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}
diff --git a/examples/issue-53/tsconfig.node.json b/examples/issue-53/tsconfig.node.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "skipLibCheck": true,
+    "strictNullChecks": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/examples/issue-53/vite.config.ts b/examples/issue-53/vite.config.ts
@@ -0,0 +1,25 @@
+import { defineConfig } from 'vite';
+import { dirname, resolve } from 'path';
+import { fileURLToPath } from 'url';
+import vue from '@vitejs/plugin-vue';
+import EntryShakingPlugin from 'vite-plugin-entry-shaking';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const pathToLib = resolve(__dirname, './src/lib');
+const pathToHello = resolve(__dirname, './src/lib/hello');
+
+export default defineConfig(() => ({
+  plugins: [
+    EntryShakingPlugin({
+      targets: [pathToLib, pathToHello],
+      debug: true,
+    }),
+    vue(),
+  ],
+  resolve: {
+    alias: {
+      '@lib': pathToLib,
+    },
+  },
+}));
diff --git a/examples/jsx/tsconfig.node.json b/examples/jsx/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/simple/tsconfig.node.json b/examples/simple/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/simple/vite.config.ts b/examples/simple/vite.config.ts
@@ -7,7 +7,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const pathToLib = resolve(__dirname, './src/lib');
 
-export default defineConfig(async () => ({
+export default defineConfig(() => ({
   plugins: [
     EntryShakingPlugin({
       targets: [pathToLib],

diff --git a/examples/syntaxes/tsconfig.node.json b/examples/syntaxes/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/syntaxes/vite.config.ts b/examples/syntaxes/vite.config.ts
@@ -11,7 +11,7 @@ const rootDir = resolve(__dirname, '../..');
 const pathToTests = resolve(__dirname, './src/data/');
 const pathToTestCases = resolve(pathToTests, 'cases');
 
-export default defineConfig(async () => ({
+export default defineConfig(() => ({
   plugins: [
     EntryShakingPlugin({
       targets: targets.map((target) => resolve(rootDir, target)),

diff --git a/examples/vue-sfc/tsconfig.node.json b/examples/vue-sfc/tsconfig.node.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "composite": true,
     "skipLibCheck": true,
+    "strictNullChecks": true,
     "module": "ESNext",
     "moduleResolution": "bundler",
     "allowSyntheticDefaultImports": true

diff --git a/examples/vue-sfc/vite.config.ts b/examples/vue-sfc/vite.config.ts
@@ -8,7 +8,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const pathToLib = resolve(__dirname, './src/lib');
 
-export default defineConfig(async () => ({
+export default defineConfig(() => ({
   plugins: [
     EntryShakingPlugin({
       targets: [pathToLib],

diff --git a/packages/core/src/analyze-import.ts b/packages/core/src/analyze-import.ts
@@ -241,7 +241,6 @@ async function getImportReplacements(
   for (const [importedPath, importedEntities] of imports) {
     const path = normalizePath(importedPath);
     const content = await methods.resolveImportedEntities(ctx, importedEntities, entryPath, path);
-
     replacement.push(content.join('\n') as ImportStatement);
   }
 
@@ -260,7 +259,7 @@ async function resolveImportedEntities(
   imported: ImportInput[],
   entryPath: EntryPath,
   path: string,
-): Promise<ImportStatement[]> {
+): Promise<string[]> {
   // If the imported item is part of another entry point, let's resolve it from analysis.
   if (path !== entryPath && ctx.entries.has(path)) {
     return methods.resolveImportedCircularEntities(ctx, imported, path);
@@ -283,13 +282,22 @@ async function resolveImportedCircularEntities(
 ) {
   const entityMap = new Map<string, string[]>();
   const originalEntry = ctx.entries.get(path)!;
-  const wildcardImports: ImportStatement[] = [];
+  const circularStatements: string[] = [];
 
   for (const entity of imported) {
     const { originalName, alias, name, importDefault } = entity;
 
     if (importDefault && name === '*') {
-      wildcardImports.push(`import * as ${alias} from '${path}'`);
+      const reexports: string[] = [];
+      const moduleExports = ctx.entries.get(path)!.exports;
+      const imports = [...moduleExports.entries()].map(([entityName, val]): ImportInput => {
+        const name = `${alias ?? ''}${entityName}`;
+        reexports.push(`${entityName}: ${name}`);
+        return { ...val, name, alias: name };
+      });
+
+      const reimports = await resolveImportedEntities(ctx, imports, '.', path);
+      circularStatements.push(...reimports, `export const ${alias} = { ${reexports.join(', ')} }`);
       continue;
     }
 
@@ -313,7 +321,7 @@ async function resolveImportedCircularEntities(
     ([p, ents]) => `import { ${ents.join(', ')} } from '${p}'`,
   ) as ImportStatement[];
 
-  return [...formattedImports, ...wildcardImports];
+  return [...formattedImports, ...circularStatements];
 }
 
 /**

diff --git a/packages/core/tests/cases/wildcard-export/setup.ts b/packages/core/tests/cases/wildcard-export/setup.ts
@@ -1,7 +1,7 @@
 import { describe, it } from 'vitest';
 
 import type { CaseTarget } from '../../utils';
-import { resolveModule } from '../../utils';
+import { constructCircularImport, resolveModule } from '../../utils';
 import { createCaseTarget, setupCase, testCase } from '../../utils';
 
 const casePath = '@test-cases/wildcard-export';
@@ -62,7 +62,7 @@ export function testWildcardExportWithAlias(middleTarget?: CaseTarget) {
       const otherTarget = await createCaseTarget('@test-modules/named-exports');
       const { importPath, targetList } = setupCase(target, middleTarget);
       const input = `import { AliasedWildcard } from '${importPath}';\n`;
-      const output = `import * as AliasedWildcard from '${resolved}';\n`;
+      const output = constructCircularImport(resolved!, ['NamedExportOne', 'NamedExportTwo'], 'AliasedWildcard');
       await testCase([...targetList, otherTarget], input, output);
     });
 
@@ -86,7 +86,7 @@ export function testWildcardExportWithAlias(middleTarget?: CaseTarget) {
       const expectedPath = (await createCaseTarget(`${casePath}/wildcard-two`)).path;
       const { importPath, targetList } = setupCase(target, middleTarget);
       const input = `import { AliasedWildcard } from '${importPath}';\n`;
-      const output = `import * as AliasedWildcard from '${expectedPath}';\n`;
+      const output = constructCircularImport(expectedPath, ['ExportedFromWildcardTwo'], 'AliasedWildcard');
       await testCase(targetList, input, output, { maxWildcardDepth: 2 });
     });
   });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import * as Hello from './hello';

		export { Hello };