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(plugin-legacy): modern polyfill latest features (fixes #8399) #8408

Merged
merged 1 commit into from
May 31, 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
53 changes: 30 additions & 23 deletions packages/plugin-legacy/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ const forceDynamicImportUsage = `export function __vite_legacy_guard(){import('d

const legacyEnvVarMarker = `__VITE_IS_LEGACY__`

const _require = createRequire(import.meta.url)

function viteLegacyPlugin(options: Options = {}): Plugin[] {
let config: ResolvedConfig
const targets = options.targets || 'defaults'
Expand Down Expand Up @@ -175,7 +177,6 @@ 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 @@ -328,21 +329,10 @@ function viteLegacyPlugin(options: Options = {}): Plugin[] {
],
[
'env',
{
targets,
modules: false,
bugfixes: true,
loose: false,
useBuiltIns: needPolyfills ? 'usage' : false,
corejs: needPolyfills
? {
version: _require('core-js/package.json').version,
proposals: false
}
: undefined,
shippedProposals: true,
createBabelPresetEnvOptions(targets, {
needPolyfills,
ignoreBrowserslistConfig: options.ignoreBrowserslistConfig
}
})
]
]
})
Expand Down Expand Up @@ -528,14 +518,7 @@ export async function detectPolyfills(
presets: [
[
'env',
{
targets,
modules: false,
useBuiltIns: 'usage',
corejs: { version: 3, proposals: false },
shippedProposals: true,
ignoreBrowserslistConfig: true
}
createBabelPresetEnvOptions(targets, { ignoreBrowserslistConfig: true })
]
]
})
Expand All @@ -552,6 +535,30 @@ export async function detectPolyfills(
}
}

function createBabelPresetEnvOptions(
targets: any,
{
needPolyfills = true,
ignoreBrowserslistConfig
}: { needPolyfills?: boolean; ignoreBrowserslistConfig?: boolean }
) {
return {
targets,
bugfixes: true,
loose: false,
modules: false,
useBuiltIns: needPolyfills ? 'usage' : false,
corejs: needPolyfills
? {
version: _require('core-js/package.json').version,
proposals: false
}
: undefined,
shippedProposals: true,
ignoreBrowserslistConfig
}
}

async function buildPolyfillChunk(
imports: Set<string>,
bundle: OutputBundle,
Expand Down
1 change: 1 addition & 0 deletions playground/legacy/__tests__/legacy.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,6 @@ describe.runIf(isBuild)('build', () => {

test('includes structuredClone polyfill which is supported after core-js v3', () => {
expect(findAssetFile(/polyfills-legacy/)).toMatch('"structuredClone"')
expect(findAssetFile(/polyfills\./)).toMatch('"structuredClone"')
})
})