fix(webpack): use cjs for emitted webpack files (#395)

This commit is contained in:
Daniel Roe 2021-07-28 13:00:39 +01:00 committed by GitHub
parent f6f7d771ee
commit bb757045ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 10 deletions

View File

@ -12,7 +12,7 @@ export default defineNuxtModule({
const runtimeDir = resolve(__dirname, 'runtime') const runtimeDir = resolve(__dirname, 'runtime')
// Transpile @nuxt/meta // Transpile @nuxt/meta
nuxt.options.build.transpile.push('@nuxt/meta', runtimeDir) nuxt.options.build.transpile.push('@nuxt/meta', runtimeDir, '@vueuse/head')
nuxt.options.alias['@nuxt/meta'] = resolve(runtimeDir, 'index') nuxt.options.alias['@nuxt/meta'] = resolve(runtimeDir, 'index')
// Global meta // Global meta

View File

@ -1,6 +1,6 @@
import fetch from 'node-fetch' import fetch from 'node-fetch'
import { resolve } from 'upath' import { resolve } from 'upath'
import { readFile, writeFile } from 'fs-extra' import { move, readFile, writeFile } from 'fs-extra'
import { build, generate, prepare } from './build' import { build, generate, prepare } from './build'
import { getNitroContext, NitroContext } from './context' import { getNitroContext, NitroContext } from './context'
import { createDevServer } from './server/dev' import { createDevServer } from './server/dev'
@ -78,7 +78,9 @@ export default function nuxt2CompatModule () {
// Generate mjs resources // Generate mjs resources
nuxt.hook('build:compiled', async ({ name }) => { nuxt.hook('build:compiled', async ({ name }) => {
if (name === 'server') { if (name === 'server') {
await writeFile(resolve(nuxt.options.buildDir, 'dist/server/server.mjs'), 'export { default } from "./server.js"', 'utf8') const jsServerEntry = resolve(nuxt.options.buildDir, 'dist/server/server.js')
await move(jsServerEntry, jsServerEntry.replace(/.js$/, '.cjs'))
await writeFile(jsServerEntry.replace(/.js$/, '.mjs'), 'export { default } from "./server.cjs"', 'utf8')
} else if (name === 'client') { } else if (name === 'client') {
const manifest = await readFile(resolve(nuxt.options.buildDir, 'dist/server/client.manifest.json'), 'utf8') const manifest = await readFile(resolve(nuxt.options.buildDir, 'dist/server/client.manifest.json'), 'utf8')
await writeFile(resolve(nuxt.options.buildDir, 'dist/server/client.manifest.mjs'), 'export default ' + manifest, 'utf8') await writeFile(resolve(nuxt.options.buildDir, 'dist/server/client.manifest.mjs'), 'export default ' + manifest, 'utf8')

View File

@ -163,7 +163,10 @@ export const getRollupConfig = (nitroContext: NitroContext) => {
inline: nitroContext.node === false || nitroContext.inlineDynamicImports, inline: nitroContext.node === false || nitroContext.inlineDynamicImports,
globbyOptions: { globbyOptions: {
ignore: [ ignore: [
'server.js' 'client.manifest.mjs',
'server.cjs',
'server.mjs',
'server.manifest.mjs'
] ]
} }
})) }))

View File

@ -53,7 +53,7 @@ export function dynamicRequire ({ dir, globbyOptions, inline }: Options): Plugin
} }
// Scan chunks // Scan chunks
const files = await globby('**/*.js', { cwd: dir, absolute: false, ...globbyOptions }) const files = await globby('**/*.{cjs,mjs,js}', { cwd: dir, absolute: false, ...globbyOptions })
const chunks = files.map(id => ({ const chunks = files.map(id => ({
id, id,
src: resolve(dir, id).replace(/\\/g, '/'), src: resolve(dir, id).replace(/\\/g, '/'),

View File

@ -21,7 +21,7 @@ export function server (ctx: WebpackConfigContext) {
function serverPreset (ctx: WebpackConfigContext) { function serverPreset (ctx: WebpackConfigContext) {
const { config } = ctx const { config } = ctx
config.output.filename = 'server.js' config.output.filename = 'server.cjs'
config.devtool = 'cheap-module-source-map' config.devtool = 'cheap-module-source-map'
config.optimization = { config.optimization = {

View File

@ -82,7 +82,7 @@ export default class VueSSRServerPlugin {
} }
// TODO: Workaround for webpack // TODO: Workaround for webpack
const serverJS = 'export { default } from "./server.js"' const serverJS = 'export { default } from "./server.cjs"'
assets['server.mjs'] = { assets['server.mjs'] = {
source: () => serverJS, source: () => serverJS,
map: () => null, map: () => null,

View File

@ -23,7 +23,7 @@ export const validate = (compiler) => {
} }
} }
const isJSRegExp = /\.js(\?[^.]+)?$/ const isJSRegExp = /\.[cm]?js(\?[^.]+)?$/
export const isJS = file => isJSRegExp.test(file) export const isJS = file => isJSRegExp.test(file)

View File

@ -10,8 +10,10 @@ export function node (ctx: WebpackConfigContext) {
config.output = { config.output = {
...config.output, ...config.output,
chunkFilename: '[name].js', chunkFilename: '[name].cjs',
libraryTarget: 'commonjs2' library: {
type: 'commonjs2'
}
} }
config.performance = { config.performance = {