From 940b8e3ec423f1e8ec453d30b1673c6214eb85a5 Mon Sep 17 00:00:00 2001 From: Sachin Raja Date: Tue, 10 May 2022 16:26:02 -0700 Subject: [PATCH 1/3] refactor(lib): remove format prefixes for cjs and esm --- packages/vite/src/node/__tests__/build.spec.ts | 16 ++++++++-------- packages/vite/src/node/build.ts | 4 ++++ playground/lib/__tests__/lib.spec.ts | 2 +- playground/lib/index.dist.html | 2 +- .../__tests__/resolve-config.spec.ts | 2 +- playground/vue-lib/src-consumer/index.ts | 2 +- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/vite/src/node/__tests__/build.spec.ts b/packages/vite/src/node/__tests__/build.spec.ts index b49847f1d955a4..771f6f4569079a 100644 --- a/packages/vite/src/node/__tests__/build.spec.ts +++ b/packages/vite/src/node/__tests__/build.spec.ts @@ -33,7 +33,7 @@ describe('resolveLibFilename', () => { resolve(__dirname, 'packages/name') ) - expect(filename).toBe('custom-filename.es.mjs') + expect(filename).toBe('custom-filename.mjs') }) test('package name as filename', () => { @@ -45,7 +45,7 @@ describe('resolveLibFilename', () => { resolve(__dirname, 'packages/name') ) - expect(filename).toBe('mylib.es.mjs') + expect(filename).toBe('mylib.mjs') }) test('custom filename and no package name', () => { @@ -58,7 +58,7 @@ describe('resolveLibFilename', () => { resolve(__dirname, 'packages/noname') ) - expect(filename).toBe('custom-filename.es.mjs') + expect(filename).toBe('custom-filename.mjs') }) test('missing filename', () => { @@ -75,9 +75,9 @@ describe('resolveLibFilename', () => { test('commonjs package extensions', () => { const formatsToFilenames: FormatsToFileNames = [ - ['es', 'my-lib.es.mjs'], + ['es', 'my-lib.mjs'], ['umd', 'my-lib.umd.js'], - ['cjs', 'my-lib.cjs.js'], + ['cjs', 'my-lib.js'], ['iife', 'my-lib.iife.js'] ] @@ -94,9 +94,9 @@ describe('resolveLibFilename', () => { test('module package extensions', () => { const formatsToFilenames: FormatsToFileNames = [ - ['es', 'my-lib.es.js'], + ['es', 'my-lib.js'], ['umd', 'my-lib.umd.cjs'], - ['cjs', 'my-lib.cjs.cjs'], + ['cjs', 'my-lib.cjs'], ['iife', 'my-lib.iife.js'] ] @@ -107,7 +107,7 @@ describe('resolveLibFilename', () => { resolve(__dirname, 'packages/module') ) - expect(filename).toBe(expectedFilename) + expect(expectedFilename).toBe(filename) } }) }) diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index cc254521b8d2aa..49692f955e672c 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -592,6 +592,10 @@ export function resolveLibFilename( extension = format === 'es' ? 'mjs' : 'js' } + if (format == 'cjs' || format === 'es') { + return `${name}.${extension}` + } + return `${name}.${format}.${extension}` } diff --git a/playground/lib/__tests__/lib.spec.ts b/playground/lib/__tests__/lib.spec.ts index cc5887c2777fcb..87393e2a02e1a8 100644 --- a/playground/lib/__tests__/lib.spec.ts +++ b/playground/lib/__tests__/lib.spec.ts @@ -1,4 +1,4 @@ -import { isBuild, findAssetFile, testDir } from 'testUtils' +import { isBuild, testDir } from 'testUtils' import path from 'path' import fs from 'fs' diff --git a/playground/lib/index.dist.html b/playground/lib/index.dist.html index 9e0fac1f6b5730..02362a9c111e5e 100644 --- a/playground/lib/index.dist.html +++ b/playground/lib/index.dist.html @@ -5,7 +5,7 @@
diff --git a/playground/resolve-config/__tests__/resolve-config.spec.ts b/playground/resolve-config/__tests__/resolve-config.spec.ts index cde329afde2f50..d715cc1b8d23c4 100644 --- a/playground/resolve-config/__tests__/resolve-config.spec.ts +++ b/playground/resolve-config/__tests__/resolve-config.spec.ts @@ -12,7 +12,7 @@ const build = (configName: string) => { } const getDistFile = (configName: string, extension: string) => { return fs.readFileSync( - fromTestDir(`${configName}/dist/index.es.${extension}`), + fromTestDir(`${configName}/dist/index.${extension}`), 'utf8' ) } diff --git a/playground/vue-lib/src-consumer/index.ts b/playground/vue-lib/src-consumer/index.ts index ac0f65e2a3ed9d..38c625bb0caf0b 100644 --- a/playground/vue-lib/src-consumer/index.ts +++ b/playground/vue-lib/src-consumer/index.ts @@ -1,6 +1,6 @@ // @ts-ignore /* eslint-disable node/no-missing-import */ -import { CompA } from '../dist/lib/my-vue-lib.es' +import { CompA } from '../dist/lib/my-vue-lib' import '../dist/lib/style.css' import { createApp } from 'vue' From 1b27ff79dc290cdccb3f03ee92589757628b296d Mon Sep 17 00:00:00 2001 From: Sachin Raja Date: Tue, 10 May 2022 16:38:51 -0700 Subject: [PATCH 2/3] fix: lint error --- packages/vite/src/node/build.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vite/src/node/build.ts b/packages/vite/src/node/build.ts index 49692f955e672c..86bb0237ac132b 100644 --- a/packages/vite/src/node/build.ts +++ b/packages/vite/src/node/build.ts @@ -592,7 +592,7 @@ export function resolveLibFilename( extension = format === 'es' ? 'mjs' : 'js' } - if (format == 'cjs' || format === 'es') { + if (format === 'cjs' || format === 'es') { return `${name}.${extension}` } From abf6b7a60cc2efb91a3381eaa71abab94cb723e2 Mon Sep 17 00:00:00 2001 From: Sachin Raja Date: Thu, 12 May 2022 05:58:55 -0700 Subject: [PATCH 3/3] fix: ts error --- playground/vue-lib/src-consumer/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playground/vue-lib/src-consumer/index.ts b/playground/vue-lib/src-consumer/index.ts index 6c7739cca51fac..880acf90238edf 100644 --- a/playground/vue-lib/src-consumer/index.ts +++ b/playground/vue-lib/src-consumer/index.ts @@ -1,7 +1,7 @@ -/* eslint-disable node/no-missing-import */ +import { createApp } from 'vue' +// @ts-ignore import { CompA } from '../dist/lib/my-vue-lib' import '../dist/lib/style.css' -import { createApp } from 'vue' const app = createApp(CompA) app.mount('#app')