Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: rewrite CJS specific funcs/vars in plugins #8227

Merged
merged 1 commit into from
May 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ module.exports = defineConfig({
'node/no-extraneous-import': 'off'
}
},
{
files: ['packages/plugin-*/**/*'],
rules: {
'no-restricted-globals': ['error', 'require', '__dirname', '__filename']
}
},
{
files: ['playground/**'],
rules: {
Expand Down
7 changes: 5 additions & 2 deletions packages/plugin-legacy/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* eslint-disable node/no-extraneous-import */
import path from 'path'
import { createHash } from 'crypto'
import { createRequire } from 'module'
import { fileURLToPath } from 'url'
import { build } from 'vite'
import MagicString from 'magic-string'
import type {
Expand Down Expand Up @@ -171,6 +173,7 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] {
}
}

const _require = createRequire(import.meta.url)
const legacyPostPlugin: Plugin = {
name: 'vite:legacy-post-process',
enforce: 'post',
Expand Down Expand Up @@ -331,7 +334,7 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] {
useBuiltIns: needPolyfills ? 'usage' : false,
corejs: needPolyfills
? {
version: require('core-js/package.json').version,
version: _require('core-js/package.json').version,
proposals: false
}
: undefined,
Expand Down Expand Up @@ -557,7 +560,7 @@ async function buildPolyfillChunk(
minify = minify ? 'terser' : false
const res = await build({
// so that everything is resolved from here
root: __dirname,
root: path.dirname(fileURLToPath(import.meta.url)),
configFile: false,
logLevel: 'error',
plugins: [polyfillsPlugin(imports, externalSystemJS)],
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-legacy/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"compilerOptions": {
"outDir": "dist",
"target": "ES2020",
"module": "CommonJS",
"module": "ES2020",
"moduleResolution": "Node",
"strict": true,
"declaration": true,
Expand Down
4 changes: 3 additions & 1 deletion packages/plugin-react/src/fast-refresh.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import fs from 'fs'
import path from 'path'
import { createRequire } from 'module'
import type { types as t } from '@babel/core'

export const runtimePublicPath = '/@react-refresh'

const _require = createRequire(import.meta.url)
const reactRefreshDir = path.dirname(
require.resolve('react-refresh/package.json')
_require.resolve('react-refresh/package.json')
)
const runtimeFilePath = path.join(
reactRefreshDir,
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"compilerOptions": {
"outDir": "dist",
"target": "ES2020",
"module": "CommonJS",
"module": "ES2020",
"moduleResolution": "Node",
"strict": true,
"declaration": true,
Expand Down
7 changes: 5 additions & 2 deletions packages/plugin-vue-jsx/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function vueJsxPlugin(options: Options = {}): Plugin {
}
},

transform(code, id, opt) {
async transform(code, id, opt) {
const ssr = typeof opt === 'boolean' ? opt : (opt && opt.ssr) === true
const {
include,
Expand All @@ -91,7 +91,10 @@ function vueJsxPlugin(options: Options = {}): Plugin {
const plugins = [importMeta, [jsx, babelPluginOptions], ...babelPlugins]
if (id.endsWith('.tsx') || filepath.endsWith('.tsx')) {
plugins.push([
require('@babel/plugin-transform-typescript'),
// @ts-ignore missing type
await import('@babel/plugin-transform-typescript').then(
(r) => r.default
),
// @ts-ignore
{ isTSX: true, allowExtensions: true }
])
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin-vue-jsx/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"compilerOptions": {
"outDir": "dist",
"target": "ES2020",
"module": "CommonJS",
"module": "ES2020",
"moduleResolution": "Node",
"strict": true,
"declaration": true,
Expand Down
6 changes: 5 additions & 1 deletion packages/plugin-vue/src/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ declare module 'vue/compiler-sfc' {
}
}

import { createRequire } from 'module'
import type * as _compiler from 'vue/compiler-sfc'

export function resolveCompiler(root: string): typeof _compiler {
Expand All @@ -23,8 +24,11 @@ export function resolveCompiler(root: string): typeof _compiler {
return compiler
}

const _require = createRequire(import.meta.url)
function tryRequire(id: string, from?: string) {
try {
return from ? require(require.resolve(id, { paths: [from] })) : require(id)
return from
? _require(_require.resolve(id, { paths: [from] }))
: _require(id)
} catch (e) {}
}
2 changes: 1 addition & 1 deletion packages/plugin-vue/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"compilerOptions": {
"outDir": "dist",
"target": "ES2020",
"module": "commonjs",
"module": "ES2020",
"moduleResolution": "node",
"strict": true,
"declaration": true,
Expand Down