FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(vite): replace the browser preload helper before esbuild minifies it by sitefinitysteve · Pull Request #11425 · NativeScript/NativeScript · GitHub

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .ts  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
21 changes: 20 additions & 1 deletion packages/vite/helpers/dynamic-import-plugin.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest';
import { transformDynamicImports } from './dynamic-import-plugin.js';
import { dynamicImportPlugin, transformDynamicImports } from './dynamic-import-plugin.js';

const vitePreloadHelper = `const scriptRel = /* @__PURE__ */ (function detectScriptRel() {
const relList = typeof document !== "undefined" && document.createElement("link").relList;
Expand Down Expand Up @@ -37,4 +37,23 @@ describe('dynamic import plugin', () => {
const source = 'export const value = 42;';
expect(transformDynamicImports(source)).toBe(source);
});

// Minified builds rename __vitePreload before generateBundle; the browser
// helper then survived and its window.dispatchEvent masked every dynamic
// import failure as "window is not defined".
it('replaces the helper in renderChunk as a post plugin, ahead of esbuild minification', () => {
const plugin = dynamicImportPlugin() as any;
expect(plugin.enforce).toBe('post');
expect(plugin.generateBundle).toBeUndefined();
const result = plugin.renderChunk(`${vitePreloadHelper}\nconst page = () => __vitePreload(() => import('./page.js'), []);`);
expect(result.code).not.toContain('document');
expect(result.code).toContain("import('~/page.js')");
});

it('returns null from renderChunk when nothing changes, including on already-transformed code', () => {
const plugin = dynamicImportPlugin() as any;
expect(plugin.renderChunk('export const value = 42;')).toBeNull();
const once = transformDynamicImports(`${vitePreloadHelper}\nexport const page = () => __vitePreload(() => import('./page.js'), []);`);
expect(plugin.renderChunk(once)).toBeNull();
});
});
13 changes: 8 additions & 5 deletions packages/vite/helpers/dynamic-import-plugin.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,18 @@ export function transformDynamicImports(code: string) {
// Fix NativeScript dynamic imports by transforming paths and simplifying __vitePreload.
// Vite still emits its browser preload helper when modulePreload is disabled:
// https://github.com/vitejs/vite/issues/13952
// Runs in renderChunk as a post plugin: user post plugins precede Vite's
// esbuild minifier, so `__vitePreload` is still named when we look for it.
export function dynamicImportPlugin() {
return {
name: 'nativescript-dynamic-import-fix',
generateBundle(_options, bundle) {
for (const chunk of Object.values(bundle) as any) {
if (chunk.type === 'chunk') {
chunk.code = transformDynamicImports(chunk.code);
}
enforce: 'post' as const,
renderChunk(code: string) {
const transformed = transformDynamicImports(code);
if (transformed === code) {
return null;
}
return { code: transformed, map: null };
},
};
}
Loading

Back | FazBrowse Home | New Git URL