@unocss/vite 0.20.2 → 0.21.2

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.
Files changed (3) hide show
  1. package/dist/index.cjs +16 -3
  2. package/dist/index.mjs +16 -3
  3. package/package.json +6 -6
package/dist/index.cjs CHANGED
@@ -247,6 +247,7 @@ const READY_CALLBACK_DEFAULT = "/__unocss_ready";
247
247
  const WARN_TIMEOUT = 2e3;
248
248
  function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
249
249
  const servers = [];
250
+ let base = "";
250
251
  const tasks = [];
251
252
  const entries = /* @__PURE__ */ new Map();
252
253
  let invalidateTimer;
@@ -254,6 +255,13 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
254
255
  let lastServed = 0;
255
256
  let resolved = false;
256
257
  let resolvedWarnTimer;
258
+ function configResolved(config) {
259
+ base = config.base || "";
260
+ if (base === "/")
261
+ base = "";
262
+ else if (base.endsWith("/"))
263
+ base = base.slice(0, base.length - 1);
264
+ }
257
265
  function invalidate(timer = 10) {
258
266
  for (const server of servers) {
259
267
  for (const id of entries.keys()) {
@@ -300,12 +308,16 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
300
308
  name: "unocss:global",
301
309
  apply: "serve",
302
310
  enforce: "pre",
311
+ configResolved,
303
312
  async configureServer(_server) {
304
313
  servers.push(_server);
305
314
  _server.middlewares.use(async (req, res, next) => {
315
+ let url = req.url;
316
+ if (url && base.length > 0 && url.startsWith(base))
317
+ url = url.slice(base.length);
306
318
  setWarnTimer();
307
- if (req.url?.startsWith(READY_CALLBACK_DEFAULT)) {
308
- const servedTime = +req.url.slice(READY_CALLBACK_DEFAULT.length + 1);
319
+ if (url?.startsWith(READY_CALLBACK_DEFAULT)) {
320
+ const servedTime = +url.slice(READY_CALLBACK_DEFAULT.length + 1);
309
321
  if (servedTime < lastUpdate)
310
322
  invalidate(0);
311
323
  res.statusCode = 200;
@@ -346,6 +358,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
346
358
  },
347
359
  {
348
360
  name: "unocss:global:post",
361
+ configResolved,
349
362
  apply(config, env) {
350
363
  return env.command === "serve" && !config.build?.ssr;
351
364
  },
@@ -353,7 +366,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
353
366
  transform(code, id) {
354
367
  if (entries.has(getPath(id)) && code.includes("import.meta.hot"))
355
368
  return `${code}
356
- await fetch("${READY_CALLBACK_DEFAULT}/${lastServed}")`;
369
+ await fetch("${base}${READY_CALLBACK_DEFAULT}/${lastServed}")`;
357
370
  }
358
371
  }
359
372
  ];
package/dist/index.mjs CHANGED
@@ -239,6 +239,7 @@ const READY_CALLBACK_DEFAULT = "/__unocss_ready";
239
239
  const WARN_TIMEOUT = 2e3;
240
240
  function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
241
241
  const servers = [];
242
+ let base = "";
242
243
  const tasks = [];
243
244
  const entries = /* @__PURE__ */ new Map();
244
245
  let invalidateTimer;
@@ -246,6 +247,13 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
246
247
  let lastServed = 0;
247
248
  let resolved = false;
248
249
  let resolvedWarnTimer;
250
+ function configResolved(config) {
251
+ base = config.base || "";
252
+ if (base === "/")
253
+ base = "";
254
+ else if (base.endsWith("/"))
255
+ base = base.slice(0, base.length - 1);
256
+ }
249
257
  function invalidate(timer = 10) {
250
258
  for (const server of servers) {
251
259
  for (const id of entries.keys()) {
@@ -292,12 +300,16 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
292
300
  name: "unocss:global",
293
301
  apply: "serve",
294
302
  enforce: "pre",
303
+ configResolved,
295
304
  async configureServer(_server) {
296
305
  servers.push(_server);
297
306
  _server.middlewares.use(async (req, res, next) => {
307
+ let url = req.url;
308
+ if (url && base.length > 0 && url.startsWith(base))
309
+ url = url.slice(base.length);
298
310
  setWarnTimer();
299
- if (req.url?.startsWith(READY_CALLBACK_DEFAULT)) {
300
- const servedTime = +req.url.slice(READY_CALLBACK_DEFAULT.length + 1);
311
+ if (url?.startsWith(READY_CALLBACK_DEFAULT)) {
312
+ const servedTime = +url.slice(READY_CALLBACK_DEFAULT.length + 1);
301
313
  if (servedTime < lastUpdate)
302
314
  invalidate(0);
303
315
  res.statusCode = 200;
@@ -338,6 +350,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
338
350
  },
339
351
  {
340
352
  name: "unocss:global:post",
353
+ configResolved,
341
354
  apply(config, env) {
342
355
  return env.command === "serve" && !config.build?.ssr;
343
356
  },
@@ -345,7 +358,7 @@ function GlobalModeDevPlugin({ uno, tokens, onInvalidate, extract, filter }) {
345
358
  transform(code, id) {
346
359
  if (entries.has(getPath(id)) && code.includes("import.meta.hot"))
347
360
  return `${code}
348
- await fetch("${READY_CALLBACK_DEFAULT}/${lastServed}")`;
361
+ await fetch("${base}${READY_CALLBACK_DEFAULT}/${lastServed}")`;
349
362
  }
350
363
  }
351
364
  ];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unocss/vite",
3
- "version": "0.20.2",
3
+ "version": "0.21.2",
4
4
  "description": "The Vite plugin for UnoCSS",
5
5
  "keywords": [
6
6
  "unocss",
@@ -35,13 +35,13 @@
35
35
  ],
36
36
  "dependencies": {
37
37
  "@rollup/pluginutils": "^4.1.2",
38
- "@unocss/config": "0.20.2",
39
- "@unocss/core": "0.20.2",
40
- "@unocss/inspector": "0.20.2",
41
- "@unocss/scope": "0.20.2"
38
+ "@unocss/config": "0.21.2",
39
+ "@unocss/core": "0.21.2",
40
+ "@unocss/inspector": "0.21.2",
41
+ "@unocss/scope": "0.21.2"
42
42
  },
43
43
  "devDependencies": {
44
- "vite": "^2.7.7"
44
+ "vite": "^2.7.10"
45
45
  },
46
46
  "scripts": {
47
47
  "build": "unbuild",