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: dynamic import vars ignored warning #14006

Merged
merged 2 commits into from
Aug 7, 2023
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
5 changes: 5 additions & 0 deletions packages/vite/src/node/plugins/dynamicImportVars.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
transformStableResult,
} from '../utils'
import { toAbsoluteGlob } from './importMetaGlob'
import { hasViteIgnoreRE } from './importAnalysis'

export const dynamicImportHelperId = '\0vite/dynamic-import-helper'

Expand Down Expand Up @@ -206,6 +207,10 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
continue
}

if (hasViteIgnoreRE.test(source.slice(expStart, expEnd))) {
continue
}

s ||= new MagicString(source)
let result
try {
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/src/node/plugins/importAnalysis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const optimizedDepDynamicRE = /-[A-Z\d]{8}\.js/

const hasImportInQueryParamsRE = /[?&]import=?\b/

const hasViteIgnoreRE = /\/\*\s*@vite-ignore\s*\*\//
export const hasViteIgnoreRE = /\/\*\s*@vite-ignore\s*\*\//

const cleanUpRawUrlRE = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm
const urlIsStringRE = /^(?:'.*'|".*"|`.*`)$/
Expand Down
5 changes: 2 additions & 3 deletions packages/vite/src/node/plugins/workerImportMetaUrl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import { WORKER_FILE_ID, workerFileToUrl } from './worker'
import { fileToUrl } from './asset'
import type { InternalResolveOptions } from './resolve'
import { tryFsResolve } from './resolve'

const ignoreFlagRE = /\/\*\s*@vite-ignore\s*\*\//
import { hasViteIgnoreRE } from './importAnalysis'

interface WorkerOptions {
type?: WorkerType
Expand Down Expand Up @@ -78,7 +77,7 @@ function getWorkerType(raw: string, clean: string, i: number): WorkerType {
.substring(commaIndex + 1, endIndex)
.replace(/\}[\s\S]*,/g, '}') // strip trailing comma for parsing

const hasViteIgnore = ignoreFlagRE.test(workerOptString)
const hasViteIgnore = hasViteIgnoreRE.test(workerOptString)
if (hasViteIgnore) {
return 'ignore'
}
Expand Down
14 changes: 14 additions & 0 deletions playground/dynamic-import/__tests__/dynamic-import.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@ test('should load dynamic import with vars', async () => {
)
})

test('should load dynamic import with vars ignored', async () => {
await untilUpdated(
() => page.textContent('.dynamic-import-with-vars-ignored'),
'hello',
true,
)
// No warning should be logged as we are using @vite-ignore
expect(
serverLogs.some((log) =>
log.includes('"https" has been externalized for browser compatibility'),
),
).toBe(false)
})

test('should load dynamic import with vars multiline', async () => {
await untilUpdated(
() => page.textContent('.dynamic-import-with-vars-multiline'),
Expand Down
3 changes: 3 additions & 0 deletions playground/dynamic-import/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<p>dynamic-import-with-vars</p>
<div class="dynamic-import-with-vars">todo</div>

<p>dynamic-import-with-vars-ignored</p>
<div class="dynamic-import-with-vars-ignored">todo</div>

<p>dynamic-import-with-vars-multiline</p>
<div class="dynamic-import-with-vars-multiline">todo</div>

Expand Down
5 changes: 5 additions & 0 deletions playground/dynamic-import/nested/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ import(`../alias/${base}.js`).then((mod) => {
text('.dynamic-import-with-vars', mod.hello())
})

import(/*@vite-ignore*/ `https://localhost`).catch((mod) => {
console.log(mod)
text('.dynamic-import-with-vars-ignored', 'hello')
})

// prettier-ignore
import(
/* this messes with */
Expand Down