@typestyles/vite 0.7.0 → 0.8.0
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/dist/index.cjs +72 -15
- package/dist/index.js +73 -16
- package/package.json +4 -4
package/dist/index.cjs
CHANGED
|
@@ -42,6 +42,9 @@ function renderCssFileName(pattern, source) {
|
|
|
42
42
|
return hash.slice(0, clamped);
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
|
+
function appendSourceMappingUrl(css, cssFileName) {
|
|
46
|
+
return `${css}\n/*# sourceMappingURL=${`${cssFileName.split("/").pop()}.map`} */`;
|
|
47
|
+
}
|
|
45
48
|
function isTypestylesStylesheetHref(href, cssHref, bareName) {
|
|
46
49
|
return href === cssHref || href.endsWith(`/${bareName}`) || href === bareName || href === `./${bareName}`;
|
|
47
50
|
}
|
|
@@ -96,6 +99,7 @@ function typestylesPlugin(options = {}) {
|
|
|
96
99
|
let isServe = false;
|
|
97
100
|
const recipeModules = new Map();
|
|
98
101
|
let devExtractCss = null;
|
|
102
|
+
let devExtractMap = null;
|
|
99
103
|
let devExtractInFlight = null;
|
|
100
104
|
let extraction = null;
|
|
101
105
|
let planIndex = null;
|
|
@@ -103,7 +107,8 @@ function typestylesPlugin(options = {}) {
|
|
|
103
107
|
extraction ??= (0, _typestyles_build_runner.runTypestylesExtract)({
|
|
104
108
|
root,
|
|
105
109
|
modules: resolvedExtractModules,
|
|
106
|
-
sourceComments: extract?.sourceComments
|
|
110
|
+
sourceComments: extract?.sourceComments,
|
|
111
|
+
sourceMap: extract?.sourceMap
|
|
107
112
|
});
|
|
108
113
|
return extraction;
|
|
109
114
|
}
|
|
@@ -151,6 +156,7 @@ function typestylesPlugin(options = {}) {
|
|
|
151
156
|
const fileName = stableDevCssFileName(extract?.fileName);
|
|
152
157
|
const invalidateDevExtract = () => {
|
|
153
158
|
devExtractCss = null;
|
|
159
|
+
devExtractMap = null;
|
|
154
160
|
devExtractInFlight = null;
|
|
155
161
|
};
|
|
156
162
|
server.watcher.on("change", invalidateDevExtract);
|
|
@@ -168,12 +174,40 @@ function typestylesPlugin(options = {}) {
|
|
|
168
174
|
}
|
|
169
175
|
const url = req.url?.split("?")[0] ?? "";
|
|
170
176
|
const base = config.base.replace(/\/$/, "") || "";
|
|
171
|
-
|
|
177
|
+
const expectedPath = base === "" || base === "/" ? `/${fileName.replace(/^\//, "")}` : `${base}/${fileName.replace(/^\//, "")}`;
|
|
178
|
+
const isMapRequest = url === `${expectedPath}.map`;
|
|
179
|
+
if (url !== expectedPath && !isMapRequest) {
|
|
172
180
|
next();
|
|
173
181
|
return;
|
|
174
182
|
}
|
|
183
|
+
if (isMapRequest && !extract?.sourceMap) {
|
|
184
|
+
res.statusCode = 404;
|
|
185
|
+
res.end("Not found");
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
175
188
|
const root = config.root ?? process.cwd();
|
|
176
189
|
try {
|
|
190
|
+
if (isMapRequest) {
|
|
191
|
+
if (devExtractMap !== null) {
|
|
192
|
+
res.statusCode = 200;
|
|
193
|
+
res.setHeader("Content-Type", "application/json; charset=utf-8");
|
|
194
|
+
res.setHeader("Cache-Control", "no-cache");
|
|
195
|
+
res.end(devExtractMap);
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
const { map } = await (devExtractInFlight ?? extractOnce(root));
|
|
199
|
+
if (!map) {
|
|
200
|
+
res.statusCode = 404;
|
|
201
|
+
res.end("Not found");
|
|
202
|
+
return;
|
|
203
|
+
}
|
|
204
|
+
devExtractMap = map;
|
|
205
|
+
res.statusCode = 200;
|
|
206
|
+
res.setHeader("Content-Type", "application/json; charset=utf-8");
|
|
207
|
+
res.setHeader("Cache-Control", "no-cache");
|
|
208
|
+
res.end(map);
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
177
211
|
if (devExtractCss !== null) {
|
|
178
212
|
res.statusCode = 200;
|
|
179
213
|
res.setHeader("Content-Type", "text/css; charset=utf-8");
|
|
@@ -181,17 +215,13 @@ function typestylesPlugin(options = {}) {
|
|
|
181
215
|
res.end(devExtractCss);
|
|
182
216
|
return;
|
|
183
217
|
}
|
|
184
|
-
if (!devExtractInFlight) devExtractInFlight = (
|
|
185
|
-
root,
|
|
186
|
-
modules: resolvedExtractModules,
|
|
187
|
-
sourceComments: extract?.sourceComments
|
|
188
|
-
}).then((css) => {
|
|
189
|
-
devExtractCss = css;
|
|
190
|
-
return css;
|
|
191
|
-
}).finally(() => {
|
|
218
|
+
if (!devExtractInFlight) devExtractInFlight = extractOnce(root).finally(() => {
|
|
192
219
|
devExtractInFlight = null;
|
|
193
220
|
});
|
|
194
|
-
const
|
|
221
|
+
const result = await devExtractInFlight;
|
|
222
|
+
devExtractCss = result.css;
|
|
223
|
+
devExtractMap = result.map ?? null;
|
|
224
|
+
const css = extract?.sourceMap ? `${result.css}\n/*# sourceMappingURL=${fileName}.map */` : result.css;
|
|
195
225
|
res.statusCode = 200;
|
|
196
226
|
res.setHeader("Content-Type", "text/css; charset=utf-8");
|
|
197
227
|
res.setHeader("Cache-Control", "no-cache");
|
|
@@ -233,7 +263,7 @@ if (import.meta.hot) {
|
|
|
233
263
|
});
|
|
234
264
|
}`;
|
|
235
265
|
return {
|
|
236
|
-
code: hmrImports + overrideBootstrap + code + hmrCode,
|
|
266
|
+
code: `import 'typestyles/inspect';\n` + hmrImports + overrideBootstrap + code + hmrCode,
|
|
237
267
|
map: null
|
|
238
268
|
};
|
|
239
269
|
},
|
|
@@ -308,21 +338,48 @@ if (import.meta.hot) {
|
|
|
308
338
|
}
|
|
309
339
|
}
|
|
310
340
|
try {
|
|
311
|
-
const { css } = await extractOnce(root);
|
|
341
|
+
const { css, map } = await extractOnce(root);
|
|
312
342
|
if (requestedFileName && cssFileNameHasPlaceholder(requestedFileName)) {
|
|
313
343
|
builtCssFileName = renderCssFileName(requestedFileName, css);
|
|
344
|
+
const cssWithMap = map ? appendSourceMappingUrl(css, builtCssFileName) : css;
|
|
314
345
|
this.emitFile({
|
|
315
346
|
type: "asset",
|
|
316
347
|
fileName: builtCssFileName,
|
|
317
|
-
source:
|
|
348
|
+
source: cssWithMap
|
|
349
|
+
});
|
|
350
|
+
if (map) this.emitFile({
|
|
351
|
+
type: "asset",
|
|
352
|
+
fileName: `${builtCssFileName}.map`,
|
|
353
|
+
source: map
|
|
318
354
|
});
|
|
319
355
|
} else if (requestedFileName) {
|
|
320
356
|
builtCssFileName = requestedFileName;
|
|
357
|
+
const cssWithMap = map ? appendSourceMappingUrl(css, builtCssFileName) : css;
|
|
321
358
|
this.emitFile({
|
|
322
359
|
type: "asset",
|
|
323
360
|
fileName: requestedFileName,
|
|
324
|
-
source:
|
|
361
|
+
source: cssWithMap
|
|
362
|
+
});
|
|
363
|
+
if (map) this.emitFile({
|
|
364
|
+
type: "asset",
|
|
365
|
+
fileName: `${builtCssFileName}.map`,
|
|
366
|
+
source: map
|
|
367
|
+
});
|
|
368
|
+
} else if (map) {
|
|
369
|
+
const mapReferenceId = this.emitFile({
|
|
370
|
+
type: "asset",
|
|
371
|
+
name: `${DEFAULT_CSS_FILE_NAME}.map`,
|
|
372
|
+
source: map
|
|
325
373
|
});
|
|
374
|
+
const mapFileName = this.getFileName(mapReferenceId);
|
|
375
|
+
const mapBasename = mapFileName.split("/").pop() ?? mapFileName;
|
|
376
|
+
const finalCss = `${rebaseRelativeCssUrls(css, mapFileName.split("/").length - 1)}\n/*# sourceMappingURL=${mapBasename} */`;
|
|
377
|
+
const referenceId = this.emitFile({
|
|
378
|
+
type: "asset",
|
|
379
|
+
name: DEFAULT_CSS_FILE_NAME,
|
|
380
|
+
source: finalCss
|
|
381
|
+
});
|
|
382
|
+
builtCssFileName = this.getFileName(referenceId);
|
|
326
383
|
} else {
|
|
327
384
|
const referenceId = this.emitFile({
|
|
328
385
|
type: "asset",
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { posix, resolve } from "node:path";
|
|
3
|
-
import { DEFAULT_EXTRACT_MODULE_CANDIDATES, discoverDefaultExtractModules, extractNamespaces, findRealSheetModules, findUnextractedRecipes, indexPlans, isSheetRequest, isTransformableId, lingeringRuntimeWarning, mayNeedRecompile, moduleNeedsOverrideHmr, moduleNeedsOverrideHmr as moduleNeedsOverrideHmr$1, reportDuplicateNamespaces, resolveExtractMode, resolveExtractModules,
|
|
3
|
+
import { DEFAULT_EXTRACT_MODULE_CANDIDATES, discoverDefaultExtractModules, extractNamespaces, findRealSheetModules, findUnextractedRecipes, indexPlans, isSheetRequest, isTransformableId, lingeringRuntimeWarning, mayNeedRecompile, moduleNeedsOverrideHmr, moduleNeedsOverrideHmr as moduleNeedsOverrideHmr$1, reportDuplicateNamespaces, resolveExtractMode, resolveExtractModules, runTypestylesExtract, toZeroRuntimeSheetId, transformRecipeCalls, zeroRuntimeLeakMessage } from "@typestyles/build-runner";
|
|
4
4
|
//#region src/index.ts
|
|
5
5
|
function resolveExtractModulesForVite(root, extract) {
|
|
6
6
|
return resolveExtractModules(root, extract);
|
|
@@ -38,6 +38,9 @@ function renderCssFileName(pattern, source) {
|
|
|
38
38
|
return hash.slice(0, clamped);
|
|
39
39
|
});
|
|
40
40
|
}
|
|
41
|
+
function appendSourceMappingUrl(css, cssFileName) {
|
|
42
|
+
return `${css}\n/*# sourceMappingURL=${`${cssFileName.split("/").pop()}.map`} */`;
|
|
43
|
+
}
|
|
41
44
|
function isTypestylesStylesheetHref(href, cssHref, bareName) {
|
|
42
45
|
return href === cssHref || href.endsWith(`/${bareName}`) || href === bareName || href === `./${bareName}`;
|
|
43
46
|
}
|
|
@@ -92,6 +95,7 @@ function typestylesPlugin(options = {}) {
|
|
|
92
95
|
let isServe = false;
|
|
93
96
|
const recipeModules = new Map();
|
|
94
97
|
let devExtractCss = null;
|
|
98
|
+
let devExtractMap = null;
|
|
95
99
|
let devExtractInFlight = null;
|
|
96
100
|
let extraction = null;
|
|
97
101
|
let planIndex = null;
|
|
@@ -99,7 +103,8 @@ function typestylesPlugin(options = {}) {
|
|
|
99
103
|
extraction ??= runTypestylesExtract({
|
|
100
104
|
root,
|
|
101
105
|
modules: resolvedExtractModules,
|
|
102
|
-
sourceComments: extract?.sourceComments
|
|
106
|
+
sourceComments: extract?.sourceComments,
|
|
107
|
+
sourceMap: extract?.sourceMap
|
|
103
108
|
});
|
|
104
109
|
return extraction;
|
|
105
110
|
}
|
|
@@ -147,6 +152,7 @@ function typestylesPlugin(options = {}) {
|
|
|
147
152
|
const fileName = stableDevCssFileName(extract?.fileName);
|
|
148
153
|
const invalidateDevExtract = () => {
|
|
149
154
|
devExtractCss = null;
|
|
155
|
+
devExtractMap = null;
|
|
150
156
|
devExtractInFlight = null;
|
|
151
157
|
};
|
|
152
158
|
server.watcher.on("change", invalidateDevExtract);
|
|
@@ -164,12 +170,40 @@ function typestylesPlugin(options = {}) {
|
|
|
164
170
|
}
|
|
165
171
|
const url = req.url?.split("?")[0] ?? "";
|
|
166
172
|
const base = config.base.replace(/\/$/, "") || "";
|
|
167
|
-
|
|
173
|
+
const expectedPath = base === "" || base === "/" ? `/${fileName.replace(/^\//, "")}` : `${base}/${fileName.replace(/^\//, "")}`;
|
|
174
|
+
const isMapRequest = url === `${expectedPath}.map`;
|
|
175
|
+
if (url !== expectedPath && !isMapRequest) {
|
|
168
176
|
next();
|
|
169
177
|
return;
|
|
170
178
|
}
|
|
179
|
+
if (isMapRequest && !extract?.sourceMap) {
|
|
180
|
+
res.statusCode = 404;
|
|
181
|
+
res.end("Not found");
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
171
184
|
const root = config.root ?? process.cwd();
|
|
172
185
|
try {
|
|
186
|
+
if (isMapRequest) {
|
|
187
|
+
if (devExtractMap !== null) {
|
|
188
|
+
res.statusCode = 200;
|
|
189
|
+
res.setHeader("Content-Type", "application/json; charset=utf-8");
|
|
190
|
+
res.setHeader("Cache-Control", "no-cache");
|
|
191
|
+
res.end(devExtractMap);
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
const { map } = await (devExtractInFlight ?? extractOnce(root));
|
|
195
|
+
if (!map) {
|
|
196
|
+
res.statusCode = 404;
|
|
197
|
+
res.end("Not found");
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
devExtractMap = map;
|
|
201
|
+
res.statusCode = 200;
|
|
202
|
+
res.setHeader("Content-Type", "application/json; charset=utf-8");
|
|
203
|
+
res.setHeader("Cache-Control", "no-cache");
|
|
204
|
+
res.end(map);
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
173
207
|
if (devExtractCss !== null) {
|
|
174
208
|
res.statusCode = 200;
|
|
175
209
|
res.setHeader("Content-Type", "text/css; charset=utf-8");
|
|
@@ -177,17 +211,13 @@ function typestylesPlugin(options = {}) {
|
|
|
177
211
|
res.end(devExtractCss);
|
|
178
212
|
return;
|
|
179
213
|
}
|
|
180
|
-
if (!devExtractInFlight) devExtractInFlight =
|
|
181
|
-
root,
|
|
182
|
-
modules: resolvedExtractModules,
|
|
183
|
-
sourceComments: extract?.sourceComments
|
|
184
|
-
}).then((css) => {
|
|
185
|
-
devExtractCss = css;
|
|
186
|
-
return css;
|
|
187
|
-
}).finally(() => {
|
|
214
|
+
if (!devExtractInFlight) devExtractInFlight = extractOnce(root).finally(() => {
|
|
188
215
|
devExtractInFlight = null;
|
|
189
216
|
});
|
|
190
|
-
const
|
|
217
|
+
const result = await devExtractInFlight;
|
|
218
|
+
devExtractCss = result.css;
|
|
219
|
+
devExtractMap = result.map ?? null;
|
|
220
|
+
const css = extract?.sourceMap ? `${result.css}\n/*# sourceMappingURL=${fileName}.map */` : result.css;
|
|
191
221
|
res.statusCode = 200;
|
|
192
222
|
res.setHeader("Content-Type", "text/css; charset=utf-8");
|
|
193
223
|
res.setHeader("Cache-Control", "no-cache");
|
|
@@ -229,7 +259,7 @@ if (import.meta.hot) {
|
|
|
229
259
|
});
|
|
230
260
|
}`;
|
|
231
261
|
return {
|
|
232
|
-
code: hmrImports + overrideBootstrap + code + hmrCode,
|
|
262
|
+
code: `import 'typestyles/inspect';\n` + hmrImports + overrideBootstrap + code + hmrCode,
|
|
233
263
|
map: null
|
|
234
264
|
};
|
|
235
265
|
},
|
|
@@ -304,21 +334,48 @@ if (import.meta.hot) {
|
|
|
304
334
|
}
|
|
305
335
|
}
|
|
306
336
|
try {
|
|
307
|
-
const { css } = await extractOnce(root);
|
|
337
|
+
const { css, map } = await extractOnce(root);
|
|
308
338
|
if (requestedFileName && cssFileNameHasPlaceholder(requestedFileName)) {
|
|
309
339
|
builtCssFileName = renderCssFileName(requestedFileName, css);
|
|
340
|
+
const cssWithMap = map ? appendSourceMappingUrl(css, builtCssFileName) : css;
|
|
310
341
|
this.emitFile({
|
|
311
342
|
type: "asset",
|
|
312
343
|
fileName: builtCssFileName,
|
|
313
|
-
source:
|
|
344
|
+
source: cssWithMap
|
|
345
|
+
});
|
|
346
|
+
if (map) this.emitFile({
|
|
347
|
+
type: "asset",
|
|
348
|
+
fileName: `${builtCssFileName}.map`,
|
|
349
|
+
source: map
|
|
314
350
|
});
|
|
315
351
|
} else if (requestedFileName) {
|
|
316
352
|
builtCssFileName = requestedFileName;
|
|
353
|
+
const cssWithMap = map ? appendSourceMappingUrl(css, builtCssFileName) : css;
|
|
317
354
|
this.emitFile({
|
|
318
355
|
type: "asset",
|
|
319
356
|
fileName: requestedFileName,
|
|
320
|
-
source:
|
|
357
|
+
source: cssWithMap
|
|
358
|
+
});
|
|
359
|
+
if (map) this.emitFile({
|
|
360
|
+
type: "asset",
|
|
361
|
+
fileName: `${builtCssFileName}.map`,
|
|
362
|
+
source: map
|
|
363
|
+
});
|
|
364
|
+
} else if (map) {
|
|
365
|
+
const mapReferenceId = this.emitFile({
|
|
366
|
+
type: "asset",
|
|
367
|
+
name: `${DEFAULT_CSS_FILE_NAME}.map`,
|
|
368
|
+
source: map
|
|
321
369
|
});
|
|
370
|
+
const mapFileName = this.getFileName(mapReferenceId);
|
|
371
|
+
const mapBasename = mapFileName.split("/").pop() ?? mapFileName;
|
|
372
|
+
const finalCss = `${rebaseRelativeCssUrls(css, mapFileName.split("/").length - 1)}\n/*# sourceMappingURL=${mapBasename} */`;
|
|
373
|
+
const referenceId = this.emitFile({
|
|
374
|
+
type: "asset",
|
|
375
|
+
name: DEFAULT_CSS_FILE_NAME,
|
|
376
|
+
source: finalCss
|
|
377
|
+
});
|
|
378
|
+
builtCssFileName = this.getFileName(referenceId);
|
|
322
379
|
} else {
|
|
323
380
|
const referenceId = this.emitFile({
|
|
324
381
|
type: "asset",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typestyles/vite",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"description": "Vite plugin for typestyles HMR support",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.cjs",
|
|
@@ -39,12 +39,12 @@
|
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"typescript": "^6.0.0",
|
|
42
|
+
"typestyles": "0.36.0",
|
|
42
43
|
"vite": "npm:@voidzero-dev/vite-plus-core@1.3.0",
|
|
43
|
-
"vite-plus": "1.3.0"
|
|
44
|
-
"typestyles": "0.35.0"
|
|
44
|
+
"vite-plus": "1.3.0"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@typestyles/build-runner": "0.
|
|
47
|
+
"@typestyles/build-runner": "0.9.0"
|
|
48
48
|
},
|
|
49
49
|
"scripts": {
|
|
50
50
|
"build": "vp pack",
|