Skip to content

Commit ad8c3b1

Browse files
authoredMay 12, 2022
fix(lib)!: remove format prefixes for cjs and esm (#8107)
1 parent c32e3ac commit ad8c3b1

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed
 

‎packages/vite/src/node/__tests__/build.spec.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('resolveLibFilename', () => {
3333
resolve(__dirname, 'packages/name')
3434
)
3535

36-
expect(filename).toBe('custom-filename.es.mjs')
36+
expect(filename).toBe('custom-filename.mjs')
3737
})
3838

3939
test('package name as filename', () => {
@@ -45,7 +45,7 @@ describe('resolveLibFilename', () => {
4545
resolve(__dirname, 'packages/name')
4646
)
4747

48-
expect(filename).toBe('mylib.es.mjs')
48+
expect(filename).toBe('mylib.mjs')
4949
})
5050

5151
test('custom filename and no package name', () => {
@@ -58,7 +58,7 @@ describe('resolveLibFilename', () => {
5858
resolve(__dirname, 'packages/noname')
5959
)
6060

61-
expect(filename).toBe('custom-filename.es.mjs')
61+
expect(filename).toBe('custom-filename.mjs')
6262
})
6363

6464
test('missing filename', () => {
@@ -75,9 +75,9 @@ describe('resolveLibFilename', () => {
7575

7676
test('commonjs package extensions', () => {
7777
const formatsToFilenames: FormatsToFileNames = [
78-
['es', 'my-lib.es.mjs'],
78+
['es', 'my-lib.mjs'],
7979
['umd', 'my-lib.umd.js'],
80-
['cjs', 'my-lib.cjs.js'],
80+
['cjs', 'my-lib.js'],
8181
['iife', 'my-lib.iife.js']
8282
]
8383

@@ -94,9 +94,9 @@ describe('resolveLibFilename', () => {
9494

9595
test('module package extensions', () => {
9696
const formatsToFilenames: FormatsToFileNames = [
97-
['es', 'my-lib.es.js'],
97+
['es', 'my-lib.js'],
9898
['umd', 'my-lib.umd.cjs'],
99-
['cjs', 'my-lib.cjs.cjs'],
99+
['cjs', 'my-lib.cjs'],
100100
['iife', 'my-lib.iife.js']
101101
]
102102

@@ -107,7 +107,7 @@ describe('resolveLibFilename', () => {
107107
resolve(__dirname, 'packages/module')
108108
)
109109

110-
expect(filename).toBe(expectedFilename)
110+
expect(expectedFilename).toBe(filename)
111111
}
112112
})
113113
})

‎packages/vite/src/node/build.ts

+4
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,10 @@ export function resolveLibFilename(
596596
extension = format === 'es' ? 'mjs' : 'js'
597597
}
598598

599+
if (format === 'cjs' || format === 'es') {
600+
return `${name}.${extension}`
601+
}
602+
599603
return `${name}.${format}.${extension}`
600604
}
601605

‎playground/lib/index.dist.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="dynamic-import-message"></div>
66

77
<script type="module">
8-
import myLib from './my-lib-custom-filename.es.mjs'
8+
import myLib from './my-lib-custom-filename.mjs'
99

1010
myLib('.es')
1111
</script>

‎playground/resolve-config/__tests__/resolve-config.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const build = (configName: string) => {
1111

1212
const getDistFile = (configName: string, extension: string) => {
1313
return fs.readFileSync(
14-
fromTestDir(`${configName}/dist/index.es.${extension}`),
14+
fromTestDir(`${configName}/dist/index.${extension}`),
1515
'utf8'
1616
)
1717
}
+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
/* eslint-disable node/no-missing-import */
1+
import { createApp } from 'vue'
22
// @ts-ignore
3-
import { CompA } from '../dist/lib/my-vue-lib.es'
3+
import { CompA } from '../dist/lib/my-vue-lib'
44
import '../dist/lib/style.css'
5-
import { createApp } from 'vue'
65

76
const app = createApp(CompA)
87
app.mount('#app')

0 commit comments

Comments
 (0)
Please sign in to comment.