@vertesia/build-tools 1.6.0-dev.20261022.120426Z → 1.7.0-dev.20261120.100641Z
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/README.md +37 -37
- package/lib/vite/dev-server.d.ts +1 -1
- package/lib/vite/dev-server.d.ts.map +1 -1
- package/lib/vite/dev-server.js +33 -17
- package/lib/vite/dev-server.js.map +1 -1
- package/package.json +15 -15
- package/src/vite/dev-server.ts +33 -18
package/README.md
CHANGED
|
@@ -6,11 +6,11 @@ JavaScript modules, with schema validation.
|
|
|
6
6
|
|
|
7
7
|
Ships three entry points:
|
|
8
8
|
|
|
9
|
-
| Entry point
|
|
10
|
-
|
|
|
11
|
-
| `vertesia-build` CLI
|
|
12
|
-
| `@vertesia/build-tools/vite` | Dev-time. Same transformers applied to sources at request time.
|
|
13
|
-
| `@vertesia/build-tools`
|
|
9
|
+
| Entry point | Used for |
|
|
10
|
+
| ---------------------------- | ----------------------------------------------------------------------------- |
|
|
11
|
+
| `vertesia-build` CLI | Build-time. Runs as a post-`tsc` step over the emitted `lib/`. |
|
|
12
|
+
| `@vertesia/build-tools/vite` | Dev-time. Same transformers applied to sources at request time. |
|
|
13
|
+
| `@vertesia/build-tools` | Programmatic. `transformImports()`, the transformers, the skill preprocessor. |
|
|
14
14
|
|
|
15
15
|
> **Not a bundler plugin.** Earlier versions of this package were a Rollup plugin
|
|
16
16
|
> (`vertesiaImportPlugin`). It is now a standalone post-`tsc` transformer: it reads the JavaScript
|
|
@@ -84,16 +84,16 @@ set. Asset copying and widget bundling are build-time concerns and are skipped i
|
|
|
84
84
|
|
|
85
85
|
## Transformers
|
|
86
86
|
|
|
87
|
-
| Name
|
|
88
|
-
|
|
|
89
|
-
| `skill`
|
|
90
|
-
| `skills`
|
|
91
|
-
| `template`
|
|
92
|
-
| `templates` | `<dir>/<name>?templates`
|
|
93
|
-
| `prompt`
|
|
94
|
-
| `raw`
|
|
87
|
+
| Name | Matches | Produces |
|
|
88
|
+
| ----------- | -------------------------------- | -------------------------------------------------------------------- |
|
|
89
|
+
| `skill` | `*.md?skill`, `*/SKILL.md` | `SkillDefinition` object |
|
|
90
|
+
| `skills` | `<dir>/<name>?skills` | Array of `SkillDefinition`, one per `SKILL.md` in the subdirectories |
|
|
91
|
+
| `template` | `*.md?template`, `*/TEMPLATE.md` | `RenderingTemplateDefinition` |
|
|
92
|
+
| `templates` | `<dir>/<name>?templates` | Array of rendering templates |
|
|
93
|
+
| `prompt` | `*?prompt` | `PromptDefinition` |
|
|
94
|
+
| `raw` | `*?raw` | The file contents as a string |
|
|
95
95
|
|
|
96
|
-
The two collection transformers are
|
|
96
|
+
The two collection transformers are _virtual_: there is no file at `./all?skills`, the name before
|
|
97
97
|
the query is simply the generated module's name. That name is required, so two collections in the
|
|
98
98
|
same directory cannot collide.
|
|
99
99
|
|
|
@@ -195,12 +195,12 @@ preprocessor makes the references explicit so the build can verify them.
|
|
|
195
195
|
|
|
196
196
|
Four constructs, all optional:
|
|
197
197
|
|
|
198
|
-
| Written
|
|
199
|
-
|
|
|
200
|
-
| `{@tool fetch_document}`
|
|
201
|
-
| `{@skill web_search}`
|
|
202
|
-
| `{@param fetch_document.format}` | `` `format` ``
|
|
203
|
-
| ` ```json tool=fetch_document `
|
|
198
|
+
| Written | Rendered | Verified |
|
|
199
|
+
| -------------------------------- | ------------------------ | ------------------------------------------- |
|
|
200
|
+
| `{@tool fetch_document}` | `` `fetch_document` `` | tool exists, name unambiguous |
|
|
201
|
+
| `{@skill web_search}` | `` `learn_web_search` `` | skill exists, name unambiguous |
|
|
202
|
+
| `{@param fetch_document.format}` | `` `format` `` | that tool's schema declares the field |
|
|
203
|
+
| ` ```json tool=fetch_document ` | plain ` ```json ` fence | payload validates against the tool's schema |
|
|
204
204
|
|
|
205
205
|
````markdown
|
|
206
206
|
Call {@tool fetch_document} to load the object — {@param fetch_document.format} selects the
|
|
@@ -251,7 +251,7 @@ export const exampleLanguages = new Set(['json']); // default
|
|
|
251
251
|
```
|
|
252
252
|
|
|
253
253
|
`createSchemaExampleValidator` (also exported from this package) validates a payload against the
|
|
254
|
-
tool's AJV schema, and additionally resolves
|
|
254
|
+
tool's AJV schema, and additionally resolves _dispatcher_ fields — a `string` parameter that carries
|
|
255
255
|
another tool's name, such as `batch_execute.tool_name` — which JSON Schema alone cannot check.
|
|
256
256
|
`createSchemaFieldValidator` walks a `{@param …}` path through the same schemas, descending into
|
|
257
257
|
`anyOf`/`oneOf`/`allOf` branches and following local `$ref`s (resolved against the innermost
|
|
@@ -268,15 +268,15 @@ fails, rather than shipping a raw `{@tool …}` to the model.
|
|
|
268
268
|
|
|
269
269
|
All paths are resolved relative to the package directory.
|
|
270
270
|
|
|
271
|
-
| Key
|
|
272
|
-
|
|
|
273
|
-
| `libDir`
|
|
274
|
-
| `srcDir`
|
|
275
|
-
| `transformers` | string[]
|
|
276
|
-
| `assetsDir`
|
|
277
|
-
| `widgetsDir`
|
|
278
|
-
| `widgetConfig` | object
|
|
279
|
-
| `skillCatalog` | string
|
|
271
|
+
| Key | Type | Default | Meaning |
|
|
272
|
+
| -------------- | --------------- | ----------- | --------------------------------------------------------------------------- |
|
|
273
|
+
| `libDir` | string | _required_ | Root of the compiled output to transform. |
|
|
274
|
+
| `srcDir` | string | _required_ | Root of the sources, mirroring `libDir`. |
|
|
275
|
+
| `transformers` | string[] | _required_ | Names from the table above. Non-empty. |
|
|
276
|
+
| `assetsDir` | string \| false | `libDir` | Where scripts and widgets are emitted; `false` disables both. |
|
|
277
|
+
| `widgetsDir` | string | `'widgets'` | Sub-directory of `assetsDir` for widget bundles. |
|
|
278
|
+
| `widgetConfig` | object | — | Options forwarded to the esbuild widget bundler, e.g. `{ "minify": true }`. |
|
|
279
|
+
| `skillCatalog` | string | — | Module supplying `{ tools, skills, … }` for the preprocessor. |
|
|
280
280
|
|
|
281
281
|
## Programmatic API
|
|
282
282
|
|
|
@@ -336,13 +336,13 @@ await transformImports({
|
|
|
336
336
|
|
|
337
337
|
`transform` returns a `TransformResult`:
|
|
338
338
|
|
|
339
|
-
| Field
|
|
340
|
-
|
|
|
341
|
-
| `data`
|
|
342
|
-
| `code`
|
|
339
|
+
| Field | Meaning |
|
|
340
|
+
| --------- | ---------------------------------------------------------------- |
|
|
341
|
+
| `data` | Value to export as the module default (serialized to JSON). |
|
|
342
|
+
| `code` | Custom module source, used _instead_ of the JSON export. |
|
|
343
343
|
| `imports` | Extra import lines to inject at the top of the generated module. |
|
|
344
|
-
| `assets`
|
|
345
|
-
| `widgets` | Widget entries to bundle.
|
|
344
|
+
| `assets` | Files to copy into `assetsDir`. |
|
|
345
|
+
| `widgets` | Widget entries to bundle. |
|
|
346
346
|
|
|
347
347
|
Set `virtual: true` on the rule when the specifier does not name a real file, as the collection
|
|
348
348
|
transformers do.
|
|
@@ -351,7 +351,7 @@ transformers do.
|
|
|
351
351
|
|
|
352
352
|
1. **Scan** — walk `libDir` for `.js` files containing a query-import marker.
|
|
353
353
|
2. **Detect** — lex each file with `es-module-lexer` and match the specifiers against the
|
|
354
|
-
transformers. A real lexer rather than a regex, because a regex matches anything that
|
|
354
|
+
transformers. A real lexer rather than a regex, because a regex matches anything that _looks_
|
|
355
355
|
like a specifier: a doc comment mentioning `` `?skill` ``, or a plain constant holding a path,
|
|
356
356
|
were both picked up as imports.
|
|
357
357
|
3. **Resolve** — map the specifier back to its source asset under `srcDir`.
|
package/lib/vite/dev-server.d.ts
CHANGED
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
* vertesiaDevServerPlugin({ transformers: ['skill', 'raw'] });
|
|
30
30
|
* ```
|
|
31
31
|
*/
|
|
32
|
-
import type
|
|
32
|
+
import { type Plugin } from 'vite';
|
|
33
33
|
import type { PreprocessSkillMarkdownOptions } from '../core/skill-markdown/preprocess.js';
|
|
34
34
|
export interface VertesiaDevServerPluginOptions {
|
|
35
35
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/vite/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAIH,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/vite/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAIH,OAAO,EAAiB,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AAK3F,MAAM,WAAW,8BAA8B;IAC3C;;;;OAIG;IACH,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAEjC;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,8BAA8B,GAAG,KAAK,CAAC;CAClE;AAED,wBAAgB,uBAAuB,CAAC,OAAO,GAAE,8BAAmC,GAAG,MAAM,CAkH5F"}
|
package/lib/vite/dev-server.js
CHANGED
|
@@ -29,8 +29,9 @@
|
|
|
29
29
|
* vertesiaDevServerPlugin({ transformers: ['skill', 'raw'] });
|
|
30
30
|
* ```
|
|
31
31
|
*/
|
|
32
|
-
import { readFileSync } from 'node:fs';
|
|
32
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
33
33
|
import path from 'node:path';
|
|
34
|
+
import { normalizePath } from 'vite';
|
|
34
35
|
import { loadSkillCatalog, readPackageJson, resolveSkillCatalogPath } from '../core/skill-markdown/load-catalog.js';
|
|
35
36
|
import { createSkillTransformer, isSkillTransformer } from '../core/transformers/skill.js';
|
|
36
37
|
import { BUILTIN_TRANSFORMER_NAMES, resolveTransformerNames } from '../import-transform/builtins.js';
|
|
@@ -39,7 +40,7 @@ export function vertesiaDevServerPlugin(options = {}) {
|
|
|
39
40
|
const transformers = resolveTransformerNames([...names]);
|
|
40
41
|
// Resolved once, lazily: the catalog module is compiled output, so it may not exist when the
|
|
41
42
|
// config is first evaluated.
|
|
42
|
-
let root = process.cwd();
|
|
43
|
+
let root = normalizePath(process.cwd());
|
|
43
44
|
let boundPromise;
|
|
44
45
|
/** The catalog-bound skill transformer, or null when this package configures no catalog. */
|
|
45
46
|
const boundSkillTransformer = () => {
|
|
@@ -65,31 +66,43 @@ export function vertesiaDevServerPlugin(options = {}) {
|
|
|
65
66
|
enforce: 'pre',
|
|
66
67
|
configResolved(config) {
|
|
67
68
|
if (config.root)
|
|
68
|
-
root = config.root;
|
|
69
|
+
root = normalizePath(config.root);
|
|
69
70
|
},
|
|
70
71
|
/**
|
|
71
|
-
* Map relative query-style imports to absolute paths so Vite's loader
|
|
72
|
-
* sees a stable id keyed by the original file location. The query
|
|
73
|
-
*
|
|
74
|
-
* transformer.
|
|
72
|
+
* Map relative and root-relative query-style imports to absolute paths so Vite's loader
|
|
73
|
+
* sees a stable id keyed by the original file location. The query suffix is preserved in
|
|
74
|
+
* the id and used by `load` to pick the right transformer.
|
|
75
75
|
*/
|
|
76
76
|
resolveId(source, importer) {
|
|
77
77
|
for (const transformer of transformers) {
|
|
78
78
|
if (!transformer.pattern.test(source))
|
|
79
79
|
continue;
|
|
80
|
+
const suffix = source.match(transformer.pattern)?.[0] ?? '';
|
|
81
|
+
// `/@fs/<abs>` is Vite's URL for a file outside the root; this hook runs before
|
|
82
|
+
// Vite's resolver, so the prefix is still on the id here.
|
|
83
|
+
let base = source.slice(0, source.length - suffix.length);
|
|
84
|
+
if (base.startsWith(FS_PREFIX)) {
|
|
85
|
+
// Keep the leading `/` of a POSIX path, but not before a Windows drive letter.
|
|
86
|
+
const fsPath = base.slice(FS_PREFIX.length);
|
|
87
|
+
base = WINDOWS_VOLUME.test(fsPath) ? fsPath : `/${fsPath}`;
|
|
88
|
+
}
|
|
80
89
|
// Only relative specifiers can be resolved meaningfully against an importer.
|
|
81
|
-
if (
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
+
if (base.startsWith('.') && importer) {
|
|
91
|
+
base = normalizePath(path.resolve(path.dirname(stripQuery(importer)), base));
|
|
92
|
+
}
|
|
93
|
+
// Vite also requests modules by their root-relative URL (`/src/x.md?skill`), e.g.
|
|
94
|
+
// when it replays a cached transform, and may hand such a URL over as the importer
|
|
95
|
+
// of a relative import. Like Vite's own resolver, read a `/` id under the root
|
|
96
|
+
// first, and as a filesystem path only when nothing exists there.
|
|
97
|
+
if (base.startsWith('/') && !base.startsWith(`${root}/`)) {
|
|
98
|
+
const underRoot = normalizePath(path.join(root, base)) + suffix;
|
|
99
|
+
// A collection id names a module that does not exist inside the directory it scans.
|
|
100
|
+
const target = transformer.virtual ? path.dirname(stripQuery(underRoot)) : stripQuery(underRoot);
|
|
101
|
+
if (existsSync(target))
|
|
102
|
+
return underRoot;
|
|
90
103
|
}
|
|
91
104
|
// Bare or absolute matches are returned as-is.
|
|
92
|
-
return
|
|
105
|
+
return base + suffix;
|
|
93
106
|
}
|
|
94
107
|
return null;
|
|
95
108
|
},
|
|
@@ -129,6 +142,9 @@ export function vertesiaDevServerPlugin(options = {}) {
|
|
|
129
142
|
},
|
|
130
143
|
};
|
|
131
144
|
}
|
|
145
|
+
// Vite's prefix for ids outside the root; it is not part of Vite's public exports.
|
|
146
|
+
const FS_PREFIX = '/@fs/';
|
|
147
|
+
const WINDOWS_VOLUME = /^[A-Za-z]:/;
|
|
132
148
|
function findMatchingTransformer(id, transformers) {
|
|
133
149
|
for (const t of transformers) {
|
|
134
150
|
if (t.pattern.test(id))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../src/vite/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../src/vite/dev-server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vertesia/build-tools",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0-dev.20261120.100641Z",
|
|
4
4
|
"description": "Build tools for Vertesia projects - import transformers (skill / template / prompt / raw), esbuild widget bundler, vertesia-build CLI, and a Vite dev plugin",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -25,27 +25,27 @@
|
|
|
25
25
|
}
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@hono/node-server": "^2.1.
|
|
28
|
+
"@hono/node-server": "^2.1.6",
|
|
29
29
|
"@types/js-yaml": "^4.0.9",
|
|
30
30
|
"@types/node": "^24.19.2",
|
|
31
31
|
"@vertesia/tsconfig": "0.1.0",
|
|
32
32
|
"typescript": "7.0.2",
|
|
33
|
-
"vite": "8.3.
|
|
34
|
-
"vitest": "5.0
|
|
33
|
+
"vite": "8.3.7",
|
|
34
|
+
"vitest": "5.1.0"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@llumiverse/common": "1.
|
|
38
|
-
"@vertesia/common": "1.
|
|
39
|
-
"@vertesia/studio-utils": "1.
|
|
37
|
+
"@llumiverse/common": "1.7.0-dev.20261120.100641Z",
|
|
38
|
+
"@vertesia/common": "1.7.0-dev.20261120.100641Z",
|
|
39
|
+
"@vertesia/studio-utils": "1.7.0-dev.20261120.100641Z",
|
|
40
40
|
"ajv": "^8.20.0",
|
|
41
|
-
"es-module-lexer": "^3.0.
|
|
41
|
+
"es-module-lexer": "^3.0.4",
|
|
42
42
|
"esbuild": "^0.28.2",
|
|
43
|
-
"js-yaml": "^5.
|
|
43
|
+
"js-yaml": "^5.5.0",
|
|
44
44
|
"zod": "4.6.7"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
|
-
"@hono/node-server": "^2.1.
|
|
48
|
-
"vite": "^8.3.
|
|
47
|
+
"@hono/node-server": "^2.1.6",
|
|
48
|
+
"vite": "^8.3.7"
|
|
49
49
|
},
|
|
50
50
|
"peerDependenciesMeta": {
|
|
51
51
|
"@hono/node-server": {
|
|
@@ -76,11 +76,11 @@
|
|
|
76
76
|
"zod",
|
|
77
77
|
"validation"
|
|
78
78
|
],
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "0b4dcc5c9e17a0fdb8771fee841f98efac7e2a2c",
|
|
80
80
|
"releaseIdentity": {
|
|
81
|
-
"source_sha": "
|
|
82
|
-
"dependency_sha": "
|
|
83
|
-
"lock_sha256": "
|
|
81
|
+
"source_sha": "0b4dcc5c9e17a0fdb8771fee841f98efac7e2a2c",
|
|
82
|
+
"dependency_sha": "03036cb597143f5875280772be09363dd03a815b",
|
|
83
|
+
"lock_sha256": "cb02511f3cf2336c054ce40df0fded2a938cf3f192df24b3f73586f0050a4ea0"
|
|
84
84
|
},
|
|
85
85
|
"scripts": {
|
|
86
86
|
"lint": "biome lint src",
|
package/src/vite/dev-server.ts
CHANGED
|
@@ -30,9 +30,9 @@
|
|
|
30
30
|
* ```
|
|
31
31
|
*/
|
|
32
32
|
|
|
33
|
-
import { readFileSync } from 'node:fs';
|
|
33
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
34
34
|
import path from 'node:path';
|
|
35
|
-
import type
|
|
35
|
+
import { normalizePath, type Plugin } from 'vite';
|
|
36
36
|
import { loadSkillCatalog, readPackageJson, resolveSkillCatalogPath } from '../core/skill-markdown/load-catalog.js';
|
|
37
37
|
import type { PreprocessSkillMarkdownOptions } from '../core/skill-markdown/preprocess.js';
|
|
38
38
|
import { createSkillTransformer, isSkillTransformer } from '../core/transformers/skill.js';
|
|
@@ -64,7 +64,7 @@ export function vertesiaDevServerPlugin(options: VertesiaDevServerPluginOptions
|
|
|
64
64
|
|
|
65
65
|
// Resolved once, lazily: the catalog module is compiled output, so it may not exist when the
|
|
66
66
|
// config is first evaluated.
|
|
67
|
-
let root = process.cwd();
|
|
67
|
+
let root = normalizePath(process.cwd());
|
|
68
68
|
|
|
69
69
|
let boundPromise: Promise<TransformerRule | null> | undefined;
|
|
70
70
|
|
|
@@ -94,31 +94,42 @@ export function vertesiaDevServerPlugin(options: VertesiaDevServerPluginOptions
|
|
|
94
94
|
enforce: 'pre',
|
|
95
95
|
|
|
96
96
|
configResolved(config: { root?: string }) {
|
|
97
|
-
if (config.root) root = config.root;
|
|
97
|
+
if (config.root) root = normalizePath(config.root);
|
|
98
98
|
},
|
|
99
99
|
|
|
100
100
|
/**
|
|
101
|
-
* Map relative query-style imports to absolute paths so Vite's loader
|
|
102
|
-
* sees a stable id keyed by the original file location. The query
|
|
103
|
-
*
|
|
104
|
-
* transformer.
|
|
101
|
+
* Map relative and root-relative query-style imports to absolute paths so Vite's loader
|
|
102
|
+
* sees a stable id keyed by the original file location. The query suffix is preserved in
|
|
103
|
+
* the id and used by `load` to pick the right transformer.
|
|
105
104
|
*/
|
|
106
105
|
resolveId(source: string, importer: string | undefined) {
|
|
107
106
|
for (const transformer of transformers) {
|
|
108
107
|
if (!transformer.pattern.test(source)) continue;
|
|
108
|
+
const suffix = source.match(transformer.pattern)?.[0] ?? '';
|
|
109
|
+
// `/@fs/<abs>` is Vite's URL for a file outside the root; this hook runs before
|
|
110
|
+
// Vite's resolver, so the prefix is still on the id here.
|
|
111
|
+
let base = source.slice(0, source.length - suffix.length);
|
|
112
|
+
if (base.startsWith(FS_PREFIX)) {
|
|
113
|
+
// Keep the leading `/` of a POSIX path, but not before a Windows drive letter.
|
|
114
|
+
const fsPath = base.slice(FS_PREFIX.length);
|
|
115
|
+
base = WINDOWS_VOLUME.test(fsPath) ? fsPath : `/${fsPath}`;
|
|
116
|
+
}
|
|
109
117
|
// Only relative specifiers can be resolved meaningfully against an importer.
|
|
110
|
-
if (
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
118
|
+
if (base.startsWith('.') && importer) {
|
|
119
|
+
base = normalizePath(path.resolve(path.dirname(stripQuery(importer)), base));
|
|
120
|
+
}
|
|
121
|
+
// Vite also requests modules by their root-relative URL (`/src/x.md?skill`), e.g.
|
|
122
|
+
// when it replays a cached transform, and may hand such a URL over as the importer
|
|
123
|
+
// of a relative import. Like Vite's own resolver, read a `/` id under the root
|
|
124
|
+
// first, and as a filesystem path only when nothing exists there.
|
|
125
|
+
if (base.startsWith('/') && !base.startsWith(`${root}/`)) {
|
|
126
|
+
const underRoot = normalizePath(path.join(root, base)) + suffix;
|
|
127
|
+
// A collection id names a module that does not exist inside the directory it scans.
|
|
128
|
+
const target = transformer.virtual ? path.dirname(stripQuery(underRoot)) : stripQuery(underRoot);
|
|
129
|
+
if (existsSync(target)) return underRoot;
|
|
119
130
|
}
|
|
120
131
|
// Bare or absolute matches are returned as-is.
|
|
121
|
-
return
|
|
132
|
+
return base + suffix;
|
|
122
133
|
}
|
|
123
134
|
return null;
|
|
124
135
|
},
|
|
@@ -163,6 +174,10 @@ export function vertesiaDevServerPlugin(options: VertesiaDevServerPluginOptions
|
|
|
163
174
|
};
|
|
164
175
|
}
|
|
165
176
|
|
|
177
|
+
// Vite's prefix for ids outside the root; it is not part of Vite's public exports.
|
|
178
|
+
const FS_PREFIX = '/@fs/';
|
|
179
|
+
const WINDOWS_VOLUME = /^[A-Za-z]:/;
|
|
180
|
+
|
|
166
181
|
function findMatchingTransformer(id: string, transformers: TransformerRule[]): TransformerRule | undefined {
|
|
167
182
|
for (const t of transformers) {
|
|
168
183
|
if (t.pattern.test(id)) return t;
|