@nativescript/vite 8.0.0-alpha.15 → 8.0.0-alpha.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/configuration/base.js +20 -1
- package/configuration/base.js.map +1 -1
- package/configuration/solid.js +25 -19
- package/configuration/solid.js.map +1 -1
- package/helpers/ns-core-url.d.ts +8 -3
- package/helpers/ns-core-url.js +9 -8
- package/helpers/ns-core-url.js.map +1 -1
- package/helpers/solid-jsx-deps.d.ts +15 -0
- package/helpers/solid-jsx-deps.js +178 -0
- package/helpers/solid-jsx-deps.js.map +1 -0
- package/hmr/client/index.js +43 -6
- package/hmr/client/index.js.map +1 -1
- package/hmr/client/vue-sfc-update-overlay.d.ts +82 -0
- package/hmr/client/vue-sfc-update-overlay.js +133 -0
- package/hmr/client/vue-sfc-update-overlay.js.map +1 -0
- package/hmr/entry-runtime.d.ts +1 -1
- package/hmr/entry-runtime.js +26 -8
- package/hmr/entry-runtime.js.map +1 -1
- package/hmr/helpers/ast-normalizer.js +9 -2
- package/hmr/helpers/ast-normalizer.js.map +1 -1
- package/hmr/helpers/package-exports.d.ts +16 -0
- package/hmr/helpers/package-exports.js +396 -0
- package/hmr/helpers/package-exports.js.map +1 -0
- package/hmr/server/core-sanitize.d.ts +2 -6
- package/hmr/server/core-sanitize.js +9 -28
- package/hmr/server/core-sanitize.js.map +1 -1
- package/hmr/server/import-map.js +22 -5
- package/hmr/server/import-map.js.map +1 -1
- package/hmr/server/ns-rt-bridge.d.ts +51 -0
- package/hmr/server/ns-rt-bridge.js +131 -0
- package/hmr/server/ns-rt-bridge.js.map +1 -0
- package/hmr/server/websocket-core-bridge.d.ts +37 -10
- package/hmr/server/websocket-core-bridge.js +26 -56
- package/hmr/server/websocket-core-bridge.js.map +1 -1
- package/hmr/server/websocket-ns-m-finalize.js +4 -2
- package/hmr/server/websocket-ns-m-finalize.js.map +1 -1
- package/hmr/server/websocket-served-module-helpers.js +2 -2
- package/hmr/server/websocket-served-module-helpers.js.map +1 -1
- package/hmr/server/websocket-vue-sfc.d.ts +0 -1
- package/hmr/server/websocket-vue-sfc.js +0 -16
- package/hmr/server/websocket-vue-sfc.js.map +1 -1
- package/hmr/server/websocket.d.ts +1 -1
- package/hmr/server/websocket.js +110 -211
- package/hmr/server/websocket.js.map +1 -1
- package/hmr/shared/runtime/boot-placeholder-ui.d.ts +1 -1
- package/hmr/shared/runtime/boot-placeholder-ui.js +1 -1
- package/hmr/shared/runtime/boot-progress.d.ts +1 -1
- package/hmr/shared/runtime/boot-progress.js +1 -1
- package/hmr/shared/runtime/root-placeholder.js +96 -56
- package/hmr/shared/runtime/root-placeholder.js.map +1 -1
- package/hmr/shared/vendor/manifest.js +55 -0
- package/hmr/shared/vendor/manifest.js.map +1 -1
- package/package.json +1 -1
- package/hmr/server/websocket-runtime-compat.d.ts +0 -19
- package/hmr/server/websocket-runtime-compat.js +0 -287
- package/hmr/server/websocket-runtime-compat.js.map +0 -1
package/configuration/base.js
CHANGED
|
@@ -244,7 +244,26 @@ export const baseConfig = ({ mode, flavor }) => {
|
|
|
244
244
|
disableOptimizeDeps = hmrActive || process.env.NS_DISABLE_OPTIMIZEDEPS === '1' || process.env.NS_DISABLE_OPTIMIZEDEPS === 'true';
|
|
245
245
|
break;
|
|
246
246
|
}
|
|
247
|
-
|
|
247
|
+
// `module` / `node:module` are aliased to local polyfills (see
|
|
248
|
+
// `aliasCssTree` and the `node:module` entry in `resolveConfig.alias`).
|
|
249
|
+
// Vite's depscanner has no awareness of these aliases and, when discovery
|
|
250
|
+
// is enabled (every non-Angular flavor), happily pre-bundles them at
|
|
251
|
+
// `/node_modules/.vite/deps/module.js`. The HMR `/ns/m/` pipeline then
|
|
252
|
+
// runs `rewriteVitePrebundleImportsForDevice`, which maps pre-bundle URLs
|
|
253
|
+
// back to bare specifiers via the vendor manifest. Because `module` is
|
|
254
|
+
// NOT a real package (no manifest entry), the mapping returns `null` and
|
|
255
|
+
// the entire `import { createRequire } from 'module'` line is dropped —
|
|
256
|
+
// leaving `createRequire` undefined when `css-tree/lib/data-patch.js`
|
|
257
|
+
// executes on device:
|
|
258
|
+
//
|
|
259
|
+
// ReferenceError: createRequire is not defined
|
|
260
|
+
// at .../node_modules/css-tree/lib/data-patch.js
|
|
261
|
+
//
|
|
262
|
+
// Excluding both specifiers from optimizeDeps keeps the alias path
|
|
263
|
+
// intact end-to-end. Angular sets `noDiscovery: true` so it never hits
|
|
264
|
+
// this in the first place, but adding it here is still safe because the
|
|
265
|
+
// Angular config rebuilds `optimizeDeps.exclude` from a different list.
|
|
266
|
+
const optimizeDepsExclude = ['@nativescript/core', '@valor/nativescript-websockets', 'set-value', 'react', 'react-reconciler', 'react-nativescript', 'module', 'node:module'];
|
|
248
267
|
const optimizeDepsConditions = ['module', 'react-native', 'import', 'browser', 'default'];
|
|
249
268
|
const optimizeDepsConfig = disableOptimizeDeps
|
|
250
269
|
? {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../packages/vite/configuration/base.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../packages/vite/configuration/base.ts"],"names":[],"mappings":"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"}
|
package/configuration/solid.js
CHANGED
|
@@ -3,10 +3,11 @@ import path from 'path';
|
|
|
3
3
|
import alias from '@rollup/plugin-alias';
|
|
4
4
|
import { fileURLToPath } from 'node:url';
|
|
5
5
|
import { dirname, resolve } from 'node:path';
|
|
6
|
-
import { getProjectRootPath } from '../helpers/project.js';
|
|
6
|
+
import { findMonorepoWorkspaceRoot, getProjectRootPath } from '../helpers/project.js';
|
|
7
7
|
import { mergeConfig } from 'vite';
|
|
8
8
|
import { baseConfig } from './base.js';
|
|
9
9
|
import { getTypeCheckPlugins } from '../helpers/typescript-check.js';
|
|
10
|
+
import { findSolidPackagesShippingJsx } from '../helpers/solid-jsx-deps.js';
|
|
10
11
|
const __filename = fileURLToPath(import.meta.url);
|
|
11
12
|
const __dirname = dirname(__filename);
|
|
12
13
|
const projectRoot = getProjectRootPath();
|
|
@@ -50,27 +51,32 @@ const plugins = [
|
|
|
50
51
|
}),
|
|
51
52
|
];
|
|
52
53
|
export const solidConfig = ({ mode }, options = {}) => {
|
|
54
|
+
const projectRoot = getProjectRootPath();
|
|
55
|
+
const monorepoRoot = findMonorepoWorkspaceRoot(projectRoot);
|
|
56
|
+
// Any Solid library that ships `.jsx`/`.tsx` files in its published
|
|
57
|
+
// output (e.g. `solid-navigation`'s `dist/src/*.jsx`) MUST bypass
|
|
58
|
+
// Vite's depscanner. The depscanner concatenates the package into
|
|
59
|
+
// `node_modules/.vite/deps/<pkg>.js` with the JSX preserved, then
|
|
60
|
+
// `vite:import-analysis` hits the first JSX expression and aborts the
|
|
61
|
+
// dev server with `Failed to parse source for import analysis…`. The
|
|
62
|
+
// `vite-plugin-solid` `transform` hook only runs on ids ending in
|
|
63
|
+
// `.jsx`/`.tsx`, so it never sees the pre-bundled `.js` to fix it.
|
|
64
|
+
// Excluding these packages routes them through the normal serve
|
|
65
|
+
// pipeline, where the original `.jsx` ids match the Solid plugin's
|
|
66
|
+
// filter. See `helpers/solid-jsx-deps.ts` for the detection rules.
|
|
67
|
+
const solidJsxPackages = findSolidPackagesShippingJsx(projectRoot, monorepoRoot);
|
|
53
68
|
return mergeConfig(baseConfig({ mode, flavor: 'solid' }), {
|
|
54
69
|
plugins: [...getTypeCheckPlugins('solid', options.typeCheck), ...plugins],
|
|
55
70
|
optimizeDeps: {
|
|
56
|
-
//
|
|
57
|
-
//
|
|
58
|
-
//
|
|
59
|
-
//
|
|
60
|
-
//
|
|
61
|
-
//
|
|
62
|
-
//
|
|
63
|
-
//
|
|
64
|
-
|
|
65
|
-
// pre-bundled URL back to a known bare specifier (because `module`
|
|
66
|
-
// isn't a real package), and SILENTLY DROPS the entire import
|
|
67
|
-
// statement — leaving `createRequire` undefined at runtime. The
|
|
68
|
-
// Angular config disables optimizeDeps wholesale so it never sees
|
|
69
|
-
// this; Solid keeps optimizeDeps active for `solid-js` etc., so we
|
|
70
|
-
// surgically exclude `module` (and `node:module`) here. With both
|
|
71
|
-
// excluded, the alias resolves the import directly to the polyfill
|
|
72
|
-
// file and the HMR pipeline leaves it intact.
|
|
73
|
-
exclude: ['module', 'node:module'],
|
|
71
|
+
// Defense-in-depth: keep `module` / `node:module` out of the
|
|
72
|
+
// depscanner's pre-bundle set even if a downstream config swaps
|
|
73
|
+
// out the base `optimizeDeps.exclude`. The root rationale (and the
|
|
74
|
+
// canonical exclude list) lives in `configuration/base.ts`; see
|
|
75
|
+
// the comment above `optimizeDepsExclude` there for the full
|
|
76
|
+
// css-tree → createRequire → HMR rewrite chain that necessitates
|
|
77
|
+
// this. Vite's `mergeConfig` concatenates `exclude` arrays, so
|
|
78
|
+
// duplicating these here is harmless.
|
|
79
|
+
exclude: ['module', 'node:module', ...solidJsxPackages],
|
|
74
80
|
},
|
|
75
81
|
});
|
|
76
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solid.js","sourceRoot":"","sources":["../../../../packages/vite/configuration/solid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,sBAAsB,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"solid.js","sourceRoot":"","sources":["../../../../packages/vite/configuration/solid.ts"],"names":[],"mappings":"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"}
|
package/helpers/ns-core-url.d.ts
CHANGED
|
@@ -4,8 +4,14 @@
|
|
|
4
4
|
* Every public-facing reference to `@nativescript/core[/sub]` resolves to
|
|
5
5
|
* exactly one URL string — byte-for-byte identical across every emitter
|
|
6
6
|
* (bundle entry, external-urls plugin, rewriter, import map, runtime
|
|
7
|
-
* require).
|
|
8
|
-
*
|
|
7
|
+
* require). The only valid shapes are:
|
|
8
|
+
*
|
|
9
|
+
* - `/ns/core` — package main
|
|
10
|
+
* - `/ns/core/<sub>` — subpath form
|
|
11
|
+
*
|
|
12
|
+
* with `<sub>` always run through `normalizeCoreSub` (extensionless, no
|
|
13
|
+
* `/index` tail, no platform suffix). There is no version segment, no
|
|
14
|
+
* `?p=` query form, no `.js` tail.
|
|
9
15
|
*
|
|
10
16
|
* This module is the ONE site that constructs those URLs. Every caller in
|
|
11
17
|
* the repo should use `buildCoreUrl()` (or `buildCoreUrlPath()` when origin
|
|
@@ -58,7 +64,6 @@ export declare function isCoreBridgeUrl(input: string): boolean;
|
|
|
58
64
|
* 'http://localhost:5173/ns/core' → ''
|
|
59
65
|
* 'http://localhost:5173/ns/core/application' → 'application'
|
|
60
66
|
* '/ns/core/ui/core/view' → 'ui/core/view'
|
|
61
|
-
* '/ns/core?p=foo' → 'foo' (legacy form tolerated)
|
|
62
67
|
* 'http://example.com/other' → null
|
|
63
68
|
*/
|
|
64
69
|
export declare function extractCoreSub(input: string): string | null;
|
package/helpers/ns-core-url.js
CHANGED
|
@@ -4,8 +4,14 @@
|
|
|
4
4
|
* Every public-facing reference to `@nativescript/core[/sub]` resolves to
|
|
5
5
|
* exactly one URL string — byte-for-byte identical across every emitter
|
|
6
6
|
* (bundle entry, external-urls plugin, rewriter, import map, runtime
|
|
7
|
-
* require).
|
|
8
|
-
*
|
|
7
|
+
* require). The only valid shapes are:
|
|
8
|
+
*
|
|
9
|
+
* - `/ns/core` — package main
|
|
10
|
+
* - `/ns/core/<sub>` — subpath form
|
|
11
|
+
*
|
|
12
|
+
* with `<sub>` always run through `normalizeCoreSub` (extensionless, no
|
|
13
|
+
* `/index` tail, no platform suffix). There is no version segment, no
|
|
14
|
+
* `?p=` query form, no `.js` tail.
|
|
9
15
|
*
|
|
10
16
|
* This module is the ONE site that constructs those URLs. Every caller in
|
|
11
17
|
* the repo should use `buildCoreUrl()` (or `buildCoreUrlPath()` when origin
|
|
@@ -103,14 +109,13 @@ export function buildCoreUrl(origin, sub) {
|
|
|
103
109
|
export function isCoreBridgeUrl(input) {
|
|
104
110
|
if (!input)
|
|
105
111
|
return false;
|
|
106
|
-
return /\/ns\/core(
|
|
112
|
+
return /\/ns\/core(?:\/|$)/.test(input);
|
|
107
113
|
}
|
|
108
114
|
/**
|
|
109
115
|
* Extract the canonical sub path from a /ns/core URL.
|
|
110
116
|
* 'http://localhost:5173/ns/core' → ''
|
|
111
117
|
* 'http://localhost:5173/ns/core/application' → 'application'
|
|
112
118
|
* '/ns/core/ui/core/view' → 'ui/core/view'
|
|
113
|
-
* '/ns/core?p=foo' → 'foo' (legacy form tolerated)
|
|
114
119
|
* 'http://example.com/other' → null
|
|
115
120
|
*/
|
|
116
121
|
export function extractCoreSub(input) {
|
|
@@ -119,14 +124,10 @@ export function extractCoreSub(input) {
|
|
|
119
124
|
try {
|
|
120
125
|
const u = new URL(input, 'http://placeholder.invalid');
|
|
121
126
|
const pathname = u.pathname;
|
|
122
|
-
const pRaw = u.searchParams.get('p');
|
|
123
|
-
if (pRaw)
|
|
124
|
-
return normalizeCoreSub(pRaw);
|
|
125
127
|
const afterCore = pathname.replace(/^.*\/ns\/core(?:\/|$)/, '');
|
|
126
128
|
return normalizeCoreSub(afterCore);
|
|
127
129
|
}
|
|
128
130
|
catch {
|
|
129
|
-
// Fall back to literal parsing if URL constructor fails
|
|
130
131
|
const m = input.match(/\/ns\/core(?:\/([^?#]*))?/);
|
|
131
132
|
if (!m)
|
|
132
133
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ns-core-url.js","sourceRoot":"","sources":["../../../../packages/vite/helpers/ns-core-url.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"ns-core-url.js","sourceRoot":"","sources":["../../../../packages/vite/helpers/ns-core-url.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Find installed packages whose pre-bundle output would smuggle JSX into
|
|
3
|
+
* Vite's import-analysis stage. Returned names are safe to drop into
|
|
4
|
+
* `optimizeDeps.exclude` — the dev server will serve them through the
|
|
5
|
+
* normal module pipeline, where `vite-plugin-solid` can transform their
|
|
6
|
+
* original `.jsx`/`.tsx` files.
|
|
7
|
+
*
|
|
8
|
+
* The function is intentionally synchronous and best-effort: filesystem
|
|
9
|
+
* errors are swallowed, missing directories are skipped, and the scan
|
|
10
|
+
* caps at {@link MAX_SCAN_DEPTH} levels per package. Callers should
|
|
11
|
+
* treat the empty-array result as "no exclusions needed", not "scan
|
|
12
|
+
* failed". A nullable `monorepoRoot` is accepted so workspace hoisting
|
|
13
|
+
* is covered without forcing every caller to compute it.
|
|
14
|
+
*/
|
|
15
|
+
export declare function findSolidPackagesShippingJsx(projectRoot: string, monorepoRoot?: string | null): string[];
|
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
/**
|
|
4
|
+
* Why this helper exists
|
|
5
|
+
* ----------------------
|
|
6
|
+
*
|
|
7
|
+
* Vite's depscanner happily pre-bundles every bare specifier the app
|
|
8
|
+
* imports. For a Solid library that publishes pre-compiled-but-still-JSX
|
|
9
|
+
* files (e.g. `solid-navigation`'s `dist/src/*.jsx`), the pre-bundle output
|
|
10
|
+
* lands at `node_modules/.vite/deps/<pkg>.js` with the JSX intact —
|
|
11
|
+
* rolldown's depscanner doesn't run Solid's JSX transform (that lives in
|
|
12
|
+
* `vite-plugin-solid`'s `transform` hook, which only matches files whose
|
|
13
|
+
* id ends in `.jsx`/`.tsx`).
|
|
14
|
+
*
|
|
15
|
+
* Vite then runs `vite:import-analysis` on the `.js` output, hits the
|
|
16
|
+
* first JSX expression, and aborts the dev server's pre-transform with:
|
|
17
|
+
*
|
|
18
|
+
* Failed to parse source for import analysis because the content
|
|
19
|
+
* contains invalid JS syntax. If you are using JSX, make sure to
|
|
20
|
+
* name the file with the .jsx or .tsx extension.
|
|
21
|
+
* File: /…/.vite/deps/<pkg>.js:51:32
|
|
22
|
+
*
|
|
23
|
+
* The fix: when a project depends on a Solid library that ships `.jsx`
|
|
24
|
+
* (or `.tsx`) source files in its package directory, mark that package
|
|
25
|
+
* as `optimizeDeps.exclude` so Vite serves it through the regular dev
|
|
26
|
+
* pipeline, where `vite-plugin-solid`'s `transform` hook matches the
|
|
27
|
+
* original `.jsx` id and applies the Solid babel preset.
|
|
28
|
+
*
|
|
29
|
+
* Detection rules — biased toward false negatives so we never wrongly
|
|
30
|
+
* exclude a package that Vite must pre-bundle (esp. CJS-only deps that
|
|
31
|
+
* need esm interop). A package is excluded only when ALL of the
|
|
32
|
+
* following hold:
|
|
33
|
+
*
|
|
34
|
+
* 1. It declares `solid-js` or `@nativescript-community/solid-js` in
|
|
35
|
+
* `dependencies` / `peerDependencies` / `devDependencies`. This is
|
|
36
|
+
* a strong signal that the package's published artifacts are
|
|
37
|
+
* meant to be processed by a Solid-aware JSX transformer.
|
|
38
|
+
* 2. Its package directory contains at least one `.jsx` / `.tsx`
|
|
39
|
+
* source file under `dist` / `lib` / `build` / `es` / `esm` /
|
|
40
|
+
* `out` (the common published-output dirs) or directly at the
|
|
41
|
+
* package root. We deliberately skip `node_modules`, `src` (raw
|
|
42
|
+
* sources, not what `main` points to), and test dirs.
|
|
43
|
+
*
|
|
44
|
+
* Both checks are scoped to packages installed in the app's
|
|
45
|
+
* `node_modules` (plus the monorepo's hoisted `node_modules`, if any)
|
|
46
|
+
* — we never recurse into transitive nested copies, since those are
|
|
47
|
+
* also reachable from the same top-level scan once Vite resolves them.
|
|
48
|
+
*/
|
|
49
|
+
const PUBLISHED_OUTPUT_DIRS = new Set(['dist', 'lib', 'build', 'es', 'esm', 'out']);
|
|
50
|
+
// Always-skip subdirs regardless of depth: nested copies, test fixtures,
|
|
51
|
+
// docs, and example apps. Notably `src` is NOT in here because a published
|
|
52
|
+
// bundle may use `dist/src/<file>.jsx` as its layout (e.g. `solid-navigation`).
|
|
53
|
+
// `src/` at the *package root* is rejected separately by the
|
|
54
|
+
// "depth 0 must be a published-output dir" gate below.
|
|
55
|
+
const ALWAYS_SKIP_DIR_NAMES = new Set(['node_modules', 'test', 'tests', '__tests__', 'spec', 'specs', 'docs', 'examples', 'example', '.git', '.cache']);
|
|
56
|
+
const JSX_EXT_RE = /\.(jsx|tsx)$/;
|
|
57
|
+
const MAX_SCAN_DEPTH = 4;
|
|
58
|
+
function isSolidConsumer(pkgJson) {
|
|
59
|
+
const buckets = ['dependencies', 'peerDependencies', 'devDependencies', 'optionalDependencies'];
|
|
60
|
+
for (const key of buckets) {
|
|
61
|
+
const deps = pkgJson[key];
|
|
62
|
+
if (!deps || typeof deps !== 'object')
|
|
63
|
+
continue;
|
|
64
|
+
if (deps['solid-js'])
|
|
65
|
+
return true;
|
|
66
|
+
if (deps['@nativescript-community/solid-js'])
|
|
67
|
+
return true;
|
|
68
|
+
}
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
function hasJsxFile(dir, depth = 0) {
|
|
72
|
+
if (depth > MAX_SCAN_DEPTH)
|
|
73
|
+
return false;
|
|
74
|
+
let entries;
|
|
75
|
+
try {
|
|
76
|
+
entries = fs.readdirSync(dir, { withFileTypes: true });
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
return false;
|
|
80
|
+
}
|
|
81
|
+
for (const entry of entries) {
|
|
82
|
+
if (entry.isFile() && JSX_EXT_RE.test(entry.name)) {
|
|
83
|
+
return true;
|
|
84
|
+
}
|
|
85
|
+
if (entry.isDirectory()) {
|
|
86
|
+
if (entry.name.startsWith('.'))
|
|
87
|
+
continue;
|
|
88
|
+
if (ALWAYS_SKIP_DIR_NAMES.has(entry.name))
|
|
89
|
+
continue;
|
|
90
|
+
// At depth 0 (package root) only descend into known
|
|
91
|
+
// published-output dirs so a sibling `src/` (raw sources)
|
|
92
|
+
// can't flag the package on its own. Deeper levels are
|
|
93
|
+
// inside a publish dir already, so any subdir (incl. `src`)
|
|
94
|
+
// is fair game.
|
|
95
|
+
if (depth === 0 && !PUBLISHED_OUTPUT_DIRS.has(entry.name))
|
|
96
|
+
continue;
|
|
97
|
+
if (hasJsxFile(path.join(dir, entry.name), depth + 1))
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return false;
|
|
102
|
+
}
|
|
103
|
+
function scanDirectoryForJsxPackages(nodeModulesDir, result, scope = '') {
|
|
104
|
+
let entries;
|
|
105
|
+
try {
|
|
106
|
+
entries = fs.readdirSync(nodeModulesDir, { withFileTypes: true });
|
|
107
|
+
}
|
|
108
|
+
catch {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
for (const entry of entries) {
|
|
112
|
+
if (!entry.isDirectory())
|
|
113
|
+
continue;
|
|
114
|
+
if (entry.name.startsWith('.'))
|
|
115
|
+
continue;
|
|
116
|
+
if (entry.name === 'node_modules')
|
|
117
|
+
continue;
|
|
118
|
+
const entryPath = path.join(nodeModulesDir, entry.name);
|
|
119
|
+
if (!scope && entry.name.startsWith('@')) {
|
|
120
|
+
scanDirectoryForJsxPackages(entryPath, result, entry.name);
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
const pkgName = scope ? `${scope}/${entry.name}` : entry.name;
|
|
124
|
+
if (result.has(pkgName))
|
|
125
|
+
continue;
|
|
126
|
+
const pkgJsonPath = path.join(entryPath, 'package.json');
|
|
127
|
+
if (!fs.existsSync(pkgJsonPath))
|
|
128
|
+
continue;
|
|
129
|
+
let pkgJson;
|
|
130
|
+
try {
|
|
131
|
+
pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf8'));
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
continue;
|
|
135
|
+
}
|
|
136
|
+
if (!isSolidConsumer(pkgJson))
|
|
137
|
+
continue;
|
|
138
|
+
if (!hasJsxFile(entryPath))
|
|
139
|
+
continue;
|
|
140
|
+
result.add(pkgName);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Find installed packages whose pre-bundle output would smuggle JSX into
|
|
145
|
+
* Vite's import-analysis stage. Returned names are safe to drop into
|
|
146
|
+
* `optimizeDeps.exclude` — the dev server will serve them through the
|
|
147
|
+
* normal module pipeline, where `vite-plugin-solid` can transform their
|
|
148
|
+
* original `.jsx`/`.tsx` files.
|
|
149
|
+
*
|
|
150
|
+
* The function is intentionally synchronous and best-effort: filesystem
|
|
151
|
+
* errors are swallowed, missing directories are skipped, and the scan
|
|
152
|
+
* caps at {@link MAX_SCAN_DEPTH} levels per package. Callers should
|
|
153
|
+
* treat the empty-array result as "no exclusions needed", not "scan
|
|
154
|
+
* failed". A nullable `monorepoRoot` is accepted so workspace hoisting
|
|
155
|
+
* is covered without forcing every caller to compute it.
|
|
156
|
+
*/
|
|
157
|
+
export function findSolidPackagesShippingJsx(projectRoot, monorepoRoot) {
|
|
158
|
+
const found = new Set();
|
|
159
|
+
const seenDirs = new Set();
|
|
160
|
+
const scanDirs = [];
|
|
161
|
+
const projectNodeModules = path.resolve(projectRoot, 'node_modules');
|
|
162
|
+
scanDirs.push(projectNodeModules);
|
|
163
|
+
if (monorepoRoot && path.resolve(monorepoRoot) !== path.resolve(projectRoot)) {
|
|
164
|
+
const monorepoNodeModules = path.resolve(monorepoRoot, 'node_modules');
|
|
165
|
+
scanDirs.push(monorepoNodeModules);
|
|
166
|
+
}
|
|
167
|
+
for (const dir of scanDirs) {
|
|
168
|
+
const key = path.resolve(dir);
|
|
169
|
+
if (seenDirs.has(key))
|
|
170
|
+
continue;
|
|
171
|
+
seenDirs.add(key);
|
|
172
|
+
if (!fs.existsSync(dir))
|
|
173
|
+
continue;
|
|
174
|
+
scanDirectoryForJsxPackages(dir, found);
|
|
175
|
+
}
|
|
176
|
+
return Array.from(found).sort();
|
|
177
|
+
}
|
|
178
|
+
//# sourceMappingURL=solid-jsx-deps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"solid-jsx-deps.js","sourceRoot":"","sources":["../../../../packages/vite/helpers/solid-jsx-deps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;AACpF,yEAAyE;AACzE,2EAA2E;AAC3E,gFAAgF;AAChF,6DAA6D;AAC7D,uDAAuD;AACvD,MAAM,qBAAqB,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;AACxJ,MAAM,UAAU,GAAG,cAAc,CAAC;AAClC,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB,SAAS,eAAe,CAAC,OAA4B;IACpD,MAAM,OAAO,GAAG,CAAC,cAAc,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,sBAAsB,CAAU,CAAC;IACzG,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,SAAS;QAChD,IAAI,IAAI,CAAC,UAAU,CAAC;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,IAAI,CAAC,kCAAkC,CAAC;YAAE,OAAO,IAAI,CAAC;IAC3D,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,KAAK,GAAG,CAAC;IACzC,IAAI,KAAK,GAAG,cAAc;QAAE,OAAO,KAAK,CAAC;IACzC,IAAI,OAAoB,CAAC;IACzB,IAAI,CAAC;QACJ,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC;QACb,CAAC;QACD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,SAAS;YACzC,IAAI,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,SAAS;YACpD,oDAAoD;YACpD,0DAA0D;YAC1D,uDAAuD;YACvD,4DAA4D;YAC5D,gBAAgB;YAChB,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,SAAS;YACpE,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC;gBAAE,OAAO,IAAI,CAAC;QACpE,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED,SAAS,2BAA2B,CAAC,cAAsB,EAAE,MAAmB,EAAE,KAAK,GAAG,EAAE;IAC3F,IAAI,OAAoB,CAAC;IACzB,IAAI,CAAC;QACJ,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,cAAc,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,CAAC;IAAC,MAAM,CAAC;QACR,OAAO;IACR,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAAE,SAAS;QACnC,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QACzC,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;YAAE,SAAS;QAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1C,2BAA2B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC3D,SAAS;QACV,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAC9D,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,SAAS;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,SAAS;QAC1C,IAAI,OAAY,CAAC;QACjB,IAAI,CAAC;YACJ,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5D,CAAC;QAAC,MAAM,CAAC;YACR,SAAS;QACV,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAAE,SAAS;QACxC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,SAAS;QACrC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC;AACF,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,4BAA4B,CAAC,WAAmB,EAAE,YAA4B;IAC7F,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACrE,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAClC,IAAI,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9E,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACvE,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACpC,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QAChC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAClC,2BAA2B,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;AACjC,CAAC"}
|
package/hmr/client/index.js
CHANGED
|
@@ -172,6 +172,7 @@ catch (err) {
|
|
|
172
172
|
// vitest, etc.) or when the user opted out via
|
|
173
173
|
// `__NS_HMR_PROGRESS_OVERLAY_ENABLED__ === false`.
|
|
174
174
|
import { applyHmrPendingFrame } from './hmr-pending-overlay.js';
|
|
175
|
+
import { driveVueSfcUpdateOverlay } from './vue-sfc-update-overlay.js';
|
|
175
176
|
function setHmrPendingOverlay(filePath) {
|
|
176
177
|
applyHmrPendingFrame(filePath, { getOverlay: getHmrOverlayApi });
|
|
177
178
|
}
|
|
@@ -749,7 +750,13 @@ function __nsNavigateUsingApp(comp, opts = {}) {
|
|
|
749
750
|
const buildTarget = () => {
|
|
750
751
|
const existingApp = getCurrentApp();
|
|
751
752
|
const baseProvides = (existingApp && existingApp._context && existingApp._context.provides) || {};
|
|
752
|
-
|
|
753
|
+
// Forward `opts.props` as Vue's rootProps so `$navigateTo(Comp, { props: { … } })`
|
|
754
|
+
// reaches the destination component. nativescript-vue's stock `$navigateTo`
|
|
755
|
+
// does the same via `createNativeView(target, options?.props, …)` →
|
|
756
|
+
// `renderer.createApp(component, props)`. Dropping props here would surface
|
|
757
|
+
// at the destination as `[Vue warn]: Missing required prop` and any
|
|
758
|
+
// required-prop component would render with `undefined` bindings.
|
|
759
|
+
const app = AppFactory(normalizeComponent(comp, comp && (comp.__name || comp.name)), opts && opts.props);
|
|
753
760
|
switch (TARGET_FLAVOR) {
|
|
754
761
|
case 'vue':
|
|
755
762
|
ensurePiniaOnApp(app);
|
|
@@ -938,7 +945,25 @@ async function processQueue() {
|
|
|
938
945
|
// After evaluating the batch, perform flavor-specific UI refresh.
|
|
939
946
|
switch (TARGET_FLAVOR) {
|
|
940
947
|
case 'vue':
|
|
941
|
-
// Vue SFCs are handled via the registry update path
|
|
948
|
+
// Vue SFCs are handled via the registry update path
|
|
949
|
+
// (which drives its own overlay completion through
|
|
950
|
+
// `driveVueSfcUpdateOverlay`); nothing else to do
|
|
951
|
+
// for the view-tree refresh here.
|
|
952
|
+
//
|
|
953
|
+
// However, when a non-SFC file (e.g. a `.ts`
|
|
954
|
+
// utility module imported by an SFC) is the only
|
|
955
|
+
// changed entry, no `ns:vue-sfc-registry-update`
|
|
956
|
+
// will follow — and without an explicit 'complete'
|
|
957
|
+
// the overlay would stick on "Preparing update
|
|
958
|
+
// (5%)". Drive the closing frame here so the
|
|
959
|
+
// auto-hide timer can dismiss the toast in the
|
|
960
|
+
// pure-TS-change case. The detail surfaces the
|
|
961
|
+
// changed count so a user can correlate the
|
|
962
|
+
// overlay with the server-side `[hmr-ws][update]`
|
|
963
|
+
// log.
|
|
964
|
+
setUpdateOverlayStage('complete', {
|
|
965
|
+
detail: drained.length === 1 ? `Updated ${drained[0]} in ${Math.max(0, Date.now() - tQueueStart)}ms` : `Updated ${drained.length} modules in ${Math.max(0, Date.now() - tQueueStart)}ms`,
|
|
966
|
+
});
|
|
942
967
|
break;
|
|
943
968
|
case 'solid': {
|
|
944
969
|
// Boundaries discovered in this HMR cycle (tsx files reachable
|
|
@@ -1889,10 +1914,22 @@ async function handleHmrMessage(ev) {
|
|
|
1889
1914
|
if (msg.type === 'ns:vue-sfc-registry-update') {
|
|
1890
1915
|
if (typeof msg.version === 'number')
|
|
1891
1916
|
setGraphVersion(msg.version);
|
|
1892
|
-
|
|
1893
|
-
|
|
1894
|
-
|
|
1895
|
-
|
|
1917
|
+
// `ns:hmr-pending` already set the overlay to 'received' (5%).
|
|
1918
|
+
// Without the explicit stage walk below the overlay would stick
|
|
1919
|
+
// at "Preparing update" forever after a successful SFC swap —
|
|
1920
|
+
// the Vue path was missing the framework-specific completion
|
|
1921
|
+
// hooks that Angular drives via `handleAngularHotUpdateMessage`
|
|
1922
|
+
// and CSS drives inline above. `driveVueSfcUpdateOverlay` is a
|
|
1923
|
+
// thin orchestrator that walks 'evicting' → 'reimporting' →
|
|
1924
|
+
// 'rebooting' → 'complete' around the load + reset steps and
|
|
1925
|
+
// always lands on 'complete' (or a failure detail) so the
|
|
1926
|
+
// auto-hide timer can dismiss the toast.
|
|
1927
|
+
const sfcFilePath = typeof msg.path === 'string' ? msg.path : undefined;
|
|
1928
|
+
await driveVueSfcUpdateOverlay({
|
|
1929
|
+
filePath: sfcFilePath,
|
|
1930
|
+
loadComponent: () => handleVueSfcRegistryUpdate(msg, getGraphVersion()),
|
|
1931
|
+
applyComponent: (component) => performResetRoot(component),
|
|
1932
|
+
}, { getOverlay: getHmrOverlayApi });
|
|
1896
1933
|
return;
|
|
1897
1934
|
}
|
|
1898
1935
|
}
|