one 1.1.495 → 1.1.496

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.
@@ -99,28 +99,40 @@ function invalidateModule(server, id) {
99
99
  mod && server.moduleGraph.invalidateModule(mod);
100
100
  }
101
101
  async function collectStyle(server, entries) {
102
- const urls = await collectStyleUrls(server, entries);
103
- return (await Promise.all(urls.map(async url => {
102
+ const {
103
+ transform
104
+ } = await import("lightningcss"),
105
+ urls = await collectStyleUrls(server, entries);
106
+ let out = (await Promise.all(urls.map(async url => {
104
107
  const code = (await server.transformRequest(url + "?direct"))?.code || "",
105
108
  prefix = `/* [collectStyle] ${url} */`;
106
109
  try {
107
- const {
108
- transform
109
- } = await import("lightningcss"),
110
- buffer = Buffer.from(code),
110
+ const buffer = Buffer.from(code),
111
111
  codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
112
112
  let processed = transform({
113
113
  filename: "code.css",
114
114
  code: codeOut,
115
115
  ...server.config.css.lightningcss
116
116
  }).code.toString();
117
- return process.env.ONE_DEBUG_CSS && console.info("Got CSS", processed), process.env.ONE_DEDUPE_CSS && (processed = dedupeCSS(processed)), process.env.ONE_DEBUG_CSS && console.info("Got CSS after dedupe", processed), [prefix, processed];
117
+ return [prefix, processed];
118
118
  } catch (err) {
119
119
  return console.error(` [one] Error post-processing CSS, leaving un-processed: ${err}`), [prefix, code];
120
120
  }
121
121
  }))).flat().filter(Boolean).join(`
122
122
 
123
123
  `);
124
+ try {
125
+ const buffer = Buffer.from(out),
126
+ codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
127
+ out = transform({
128
+ filename: "code.css",
129
+ code: codeOut,
130
+ ...server.config.css.lightningcss
131
+ }).code.toString();
132
+ } catch {
133
+ console.error(" [one] Error post-processing merged CSS, leaving un-processed");
134
+ }
135
+ return out;
124
136
  }
125
137
  async function collectStyleUrls(server, entries) {
126
138
  const visited = /* @__PURE__ */new Set();
@@ -133,15 +145,4 @@ async function collectStyleUrls(server, entries) {
133
145
  }
134
146
  return await Promise.all(entries.map(e => server.transformRequest(e))), await Promise.all(entries.map(url => traverse(url))), [...visited].filter(url => url.match(CSS_LANGS_RE));
135
147
  }
136
- const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
137
- function dedupeCSS(css) {
138
- const lines = css.split(`
139
- `),
140
- uniqueLines = /* @__PURE__ */new Set();
141
- for (const line of lines) {
142
- const trimmedLine = line.trim();
143
- trimmedLine && uniqueLines.add(trimmedLine);
144
- }
145
- return Array.from(uniqueLines).join(`
146
- `);
147
- }
148
+ const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
@@ -93,18 +93,18 @@ function invalidateModule(server, id) {
93
93
  mod && server.moduleGraph.invalidateModule(mod);
94
94
  }
95
95
  async function collectStyle(server, entries) {
96
- const urls = await collectStyleUrls(server, entries);
97
- return (await Promise.all(
96
+ const { transform } = await import("lightningcss"), urls = await collectStyleUrls(server, entries);
97
+ let out = (await Promise.all(
98
98
  urls.map(async (url) => {
99
99
  const code = (await server.transformRequest(url + "?direct"))?.code || "", prefix = `/* [collectStyle] ${url} */`;
100
100
  try {
101
- const { transform } = await import("lightningcss"), buffer = Buffer.from(code), codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
101
+ const buffer = Buffer.from(code), codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
102
102
  let processed = transform({
103
103
  filename: "code.css",
104
104
  code: codeOut,
105
105
  ...server.config.css.lightningcss
106
106
  }).code.toString();
107
- return process.env.ONE_DEBUG_CSS && console.info("Got CSS", processed), process.env.ONE_DEDUPE_CSS && (processed = dedupeCSS(processed)), process.env.ONE_DEBUG_CSS && console.info("Got CSS after dedupe", processed), [prefix, processed];
107
+ return [prefix, processed];
108
108
  } catch (err) {
109
109
  return console.error(` [one] Error post-processing CSS, leaving un-processed: ${err}`), [prefix, code];
110
110
  }
@@ -112,6 +112,17 @@ async function collectStyle(server, entries) {
112
112
  )).flat().filter(Boolean).join(`
113
113
 
114
114
  `);
115
+ try {
116
+ const buffer = Buffer.from(out), codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
117
+ out = transform({
118
+ filename: "code.css",
119
+ code: codeOut,
120
+ ...server.config.css.lightningcss
121
+ }).code.toString();
122
+ } catch {
123
+ console.error(" [one] Error post-processing merged CSS, leaving un-processed");
124
+ }
125
+ return out;
115
126
  }
116
127
  async function collectStyleUrls(server, entries) {
117
128
  const visited = /* @__PURE__ */ new Set();
@@ -126,14 +137,4 @@ async function collectStyleUrls(server, entries) {
126
137
  return await Promise.all(entries.map((e) => server.transformRequest(e))), await Promise.all(entries.map((url) => traverse(url))), [...visited].filter((url) => url.match(CSS_LANGS_RE));
127
138
  }
128
139
  const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
129
- function dedupeCSS(css) {
130
- const lines = css.split(`
131
- `), uniqueLines = /* @__PURE__ */ new Set();
132
- for (const line of lines) {
133
- const trimmedLine = line.trim();
134
- trimmedLine && uniqueLines.add(trimmedLine);
135
- }
136
- return Array.from(uniqueLines).join(`
137
- `);
138
- }
139
140
  //# sourceMappingURL=SSRCSSPlugin.js.map
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/vite/plugins/SSRCSSPlugin.ts"],
4
- "mappings": "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",
4
+ "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,uBAA4D;AAIrD,SAAS,aAAa,YAA2C;AACtE,MAAI;AAEJ,SAAO;AAAA,IACL,MAAM;AAAA,IACN,OAAO;AAAA,IACP,gBAAgB,SAAS;AACvB,eAAS,SAGT,OAAO,YAAY,IAAI,OAAO,KAAK,KAAK,SAAS;AAC/C,YAAI,IAAI,KAAK,SAAS,qCAAoB,GAAG;AAC3C,2BAAiB,QAAQ,OAAO,yCAAwB,SAAS;AAEjE,cAAI,OAAO,MAAM,aAAa,QAAQ,WAAW,OAAO;AAExD,cAAI,UAAU,gBAAgB,UAAU,GACxC,IAAI,UAAU,iBAAiB,UAAU,GACzC,IAAI,UAAU,QAAQ,GAAG,GACzB,IAAI,MAAM,IAAI,GACd,IAAI,IAAI;AACR;AAAA,QACF;AACA,aAAK;AAAA,MACP,CAAC;AAAA,IACH;AAAA;AAAA;AAAA,IAIA,UAAU,QAAQ,WAAW,UAAU;AACrC,aAAO,OAAO,WAAW,sCAAqB,IAAI,OAAO,SAAS;AAAA,IACpE;AAAA,IAEA,MAAM,KAAK,IAAI,UAAU;AACvB,UAAI,GAAG,WAAW,OAAO,sCAAqB,GAAG;AAC/C,cAAM,MAAM,IAAI,IAAI,GAAG,MAAM,CAAC,GAAG,oBAAoB;AACrD,YAAI,OAAO,MAAM,aAAa,QAAQ,WAAW,OAAO;AACxD,eAAK,IAAI,aAAa,IAAI,QAAQ,MAChC,OAAO,kBAAkB,KAAK,UAAU,IAAI,CAAC,KAExC;AAAA,MACT;AAAA,IAGF;AAAA;AAAA,IAGA,oBAAoB;AAAA,MAClB,SAAS,YACA;AAAA,QACL;AAAA,UACE,KAAK;AAAA,UACL,UAAU;AAAA,UACV,OAAO;AAAA,YACL,KAAK;AAAA,YACL,MAAM;AAAA,YACN,gBAAgB;AAAA,UAClB;AAAA,QACF;AAAA,QAEA;AAAA,UACE,KAAK;AAAA,UACL,UAAU;AAAA,UACV,OAAO,EAAE,MAAM,SAAS;AAAA,UACxB;AAAA;AAAA,YAAmB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,QASrB;AAAA,MACF;AAAA,IAEJ;AAAA,EACF;AACF;AAEA,SAAS,iBAAiB,QAAuB,IAAY;AAC3D,QAAM,MAAM,OAAO,YAAY,cAAc,EAAE;AAC/C,EAAI,OACF,OAAO,YAAY,iBAAiB,GAAG;AAE3C;AAMA,eAAsB,aAAa,QAAuB,SAAmB;AAC3E,QAAM,EAAE,UAAU,IAAI,MAAM,OAAO,cAAc,GAE3C,OAAO,MAAM,iBAAiB,QAAQ,OAAO;AAyBnD,MAAI,OAxBU,MAAM,QAAQ;AAAA,IAC1B,KAAK,IAAI,OAAO,QAAQ;AAEtB,YAAM,QADM,MAAM,OAAO,iBAAiB,MAAM,SAAS,IACvC,QAAQ,IACpB,SAAS,qBAAqB,GAAG;AAEvC,UAAI;AACF,cAAM,SAAS,OAAO,KAAK,IAAI,GACzB,UAAU,IAAI,WAAW,OAAO,QAAQ,OAAO,YAAY,OAAO,UAAU;AAElF,YAAI,YAAY,UAAU;AAAA,UACxB,UAAU;AAAA,UACV,MAAM;AAAA,UACN,GAAG,OAAO,OAAO,IAAI;AAAA,QACvB,CAAC,EAAE,KAAK,SAAS;AAEjB,eAAO,CAAC,QAAQ,SAAS;AAAA,MAC3B,SAAS,KAAK;AACZ,uBAAQ,MAAM,2DAA2D,GAAG,EAAE,GACvE,CAAC,QAAQ,IAAI;AAAA,MACtB;AAAA,IACF,CAAC;AAAA,EACH,GAEgB,KAAK,EAAE,OAAO,OAAO,EAAE,KAAK;AAAA;AAAA,CAAM;AAElD,MAAI;AAEF,UAAM,SAAS,OAAO,KAAK,GAAG,GACxB,UAAU,IAAI,WAAW,OAAO,QAAQ,OAAO,YAAY,OAAO,UAAU;AAClF,UAAM,UAAU;AAAA,MACd,UAAU;AAAA,MACV,MAAM;AAAA,MACN,GAAG,OAAO,OAAO,IAAI;AAAA,IACvB,CAAC,EAAE,KAAK,SAAS;AAAA,EACnB,QAAc;AACZ,YAAQ,MAAM,+DAA+D;AAAA,EAC/E;AAEA,SAAO;AACT;AAEA,eAAe,iBAAiB,QAAuB,SAAsC;AAC3F,QAAM,UAAU,oBAAI,IAAY;AAEhC,iBAAe,SAAS,KAAa;AACnC,UAAM,CAAC,EAAE,EAAE,IAAI,MAAM,OAAO,YAAY,WAAW,GAAG;AACtD,QAAI,QAAQ,IAAI,EAAE;AAChB;AAEF,YAAQ,IAAI,EAAE;AACd,UAAM,MAAM,OAAO,YAAY,cAAc,EAAE;AAC/C,IAAK,OAGL,MAAM,QAAQ,IAAI,CAAC,GAAG,IAAI,eAAe,EAAE,IAAI,CAAC,aAAa,SAAS,SAAS,GAAG,CAAC,CAAC;AAAA,EACtF;AAGA,eAAM,QAAQ,IAAI,QAAQ,IAAI,CAAC,MAAM,OAAO,iBAAiB,CAAC,CAAC,CAAC,GAGhE,MAAM,QAAQ,IAAI,QAAQ,IAAI,CAAC,QAAQ,SAAS,GAAG,CAAC,CAAC,GAG9C,CAAC,GAAG,OAAO,EAAE,OAAO,CAAC,QAAQ,IAAI,MAAM,YAAY,CAAC;AAC7D;AAGA,MAAM,eAAe;",
5
5
  "names": []
6
6
  }
@@ -98,15 +98,15 @@ function invalidateModule(server, id) {
98
98
  mod && server.moduleGraph.invalidateModule(mod);
99
99
  }
100
100
  async function collectStyle(server, entries) {
101
- var urls = await collectStyleUrls(server, entries), codes = await Promise.all(urls.map(async function(url) {
101
+ var { transform } = await import("lightningcss"), urls = await collectStyleUrls(server, entries), codes = await Promise.all(urls.map(async function(url) {
102
102
  var res = await server.transformRequest(url + "?direct"), code = (res == null ? void 0 : res.code) || "", prefix = `/* [collectStyle] ${url} */`;
103
103
  try {
104
- var { transform } = await import("lightningcss"), buffer = Buffer.from(code), codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength), processed = transform({
104
+ var buffer2 = Buffer.from(code), codeOut2 = new Uint8Array(buffer2.buffer, buffer2.byteOffset, buffer2.byteLength), processed = transform({
105
105
  filename: "code.css",
106
- code: codeOut,
106
+ code: codeOut2,
107
107
  ...server.config.css.lightningcss
108
108
  }).code.toString();
109
- return process.env.ONE_DEBUG_CSS && console.info("Got CSS", processed), process.env.ONE_DEDUPE_CSS && (processed = dedupeCSS(processed)), process.env.ONE_DEBUG_CSS && console.info("Got CSS after dedupe", processed), [
109
+ return [
110
110
  prefix,
111
111
  processed
112
112
  ];
@@ -116,10 +116,20 @@ async function collectStyle(server, entries) {
116
116
  code
117
117
  ];
118
118
  }
119
- }));
120
- return codes.flat().filter(Boolean).join(`
119
+ })), out = codes.flat().filter(Boolean).join(`
121
120
 
122
121
  `);
122
+ try {
123
+ var buffer = Buffer.from(out), codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
124
+ out = transform({
125
+ filename: "code.css",
126
+ code: codeOut,
127
+ ...server.config.css.lightningcss
128
+ }).code.toString();
129
+ } catch {
130
+ console.error(" [one] Error post-processing merged CSS, leaving un-processed");
131
+ }
132
+ return out;
123
133
  }
124
134
  async function collectStyleUrls(server, entries) {
125
135
  var visited = /* @__PURE__ */ new Set();
@@ -146,27 +156,6 @@ async function collectStyleUrls(server, entries) {
146
156
  });
147
157
  }
148
158
  var CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
149
- function dedupeCSS(css) {
150
- var lines = css.split(`
151
- `), uniqueLines = /* @__PURE__ */ new Set(), _iteratorNormalCompletion = !0, _didIteratorError = !1, _iteratorError = void 0;
152
- try {
153
- for (var _iterator = lines[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
154
- var line = _step.value, trimmedLine = line.trim();
155
- trimmedLine && uniqueLines.add(trimmedLine);
156
- }
157
- } catch (err) {
158
- _didIteratorError = !0, _iteratorError = err;
159
- } finally {
160
- try {
161
- !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
162
- } finally {
163
- if (_didIteratorError)
164
- throw _iteratorError;
165
- }
166
- }
167
- return Array.from(uniqueLines).join(`
168
- `);
169
- }
170
159
  // Annotate the CommonJS export names for ESM import in node:
171
160
  0 && (module.exports = {
172
161
  SSRCSSPlugin,
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/vite/plugins/SSRCSSPlugin.ts"],
4
- "mappings": "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",
5
- "names": ["SSRCSSPlugin", "pluginOpts", "server", "name", "apply", "configureServer", "server_", "middlewares", "use", "req", "res", "next", "url", "includes", "VIRTUAL_SSR_CSS_HREF", "invalidateModule", "VIRTUAL_SSR_CSS_ENTRY", "code", "collectStyle", "entries", "setHeader", "write", "end", "resolveId", "source", "_importer", "_options", "startsWith", "undefined", "load", "id", "URL", "slice", "searchParams", "has", "JSON", "stringify", "transformIndexHtml", "handler", "tag", "injectTo", "attrs", "rel", "href", "type", "children", "mod", "moduleGraph", "getModuleById", "urls", "collectStyleUrls", "codes", "Promise", "all", "map", "transformRequest", "prefix", "transform", "buffer", "Buffer", "from", "codeOut", "Uint8Array", "byteOffset", "byteLength", "processed", "filename", "config", "css", "lightningcss", "toString", "process", "env", "ONE_DEBUG_CSS", "console", "info", "ONE_DEDUPE_CSS", "dedupeCSS", "err", "error", "flat", "filter", "Boolean", "join", "visited", "Set", "traverse", "resolveUrl", "add", "importedModules", "childMod", "e", "match", "CSS_LANGS_RE", "lines", "split", "uniqueLines", "line", "trimmedLine", "trim", "Array"]
4
+ "mappings": "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",
5
+ "names": ["SSRCSSPlugin", "pluginOpts", "server", "name", "apply", "configureServer", "server_", "middlewares", "use", "req", "res", "next", "url", "includes", "VIRTUAL_SSR_CSS_HREF", "invalidateModule", "VIRTUAL_SSR_CSS_ENTRY", "code", "collectStyle", "entries", "setHeader", "write", "end", "resolveId", "source", "_importer", "_options", "startsWith", "undefined", "load", "id", "URL", "slice", "searchParams", "has", "JSON", "stringify", "transformIndexHtml", "handler", "tag", "injectTo", "attrs", "rel", "href", "type", "children", "mod", "moduleGraph", "getModuleById", "transform", "urls", "collectStyleUrls", "codes", "Promise", "all", "map", "transformRequest", "prefix", "buffer", "Buffer", "from", "codeOut", "Uint8Array", "byteOffset", "byteLength", "processed", "filename", "config", "css", "lightningcss", "toString", "err", "console", "error", "out", "flat", "filter", "Boolean", "join", "visited", "Set", "traverse", "resolveUrl", "add", "importedModules", "childMod", "e", "match", "CSS_LANGS_RE"]
6
6
  }
@@ -65,18 +65,18 @@ function invalidateModule(server, id) {
65
65
  mod && server.moduleGraph.invalidateModule(mod);
66
66
  }
67
67
  async function collectStyle(server, entries) {
68
- const urls = await collectStyleUrls(server, entries);
69
- return (await Promise.all(
68
+ const { transform } = await import("lightningcss"), urls = await collectStyleUrls(server, entries);
69
+ let out = (await Promise.all(
70
70
  urls.map(async (url) => {
71
71
  const code = (await server.transformRequest(url + "?direct"))?.code || "", prefix = `/* [collectStyle] ${url} */`;
72
72
  try {
73
- const { transform } = await import("lightningcss"), buffer = Buffer.from(code), codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
73
+ const buffer = Buffer.from(code), codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
74
74
  let processed = transform({
75
75
  filename: "code.css",
76
76
  code: codeOut,
77
77
  ...server.config.css.lightningcss
78
78
  }).code.toString();
79
- return process.env.ONE_DEBUG_CSS && console.info("Got CSS", processed), process.env.ONE_DEDUPE_CSS && (processed = dedupeCSS(processed)), process.env.ONE_DEBUG_CSS && console.info("Got CSS after dedupe", processed), [prefix, processed];
79
+ return [prefix, processed];
80
80
  } catch (err) {
81
81
  return console.error(` [one] Error post-processing CSS, leaving un-processed: ${err}`), [prefix, code];
82
82
  }
@@ -84,6 +84,17 @@ async function collectStyle(server, entries) {
84
84
  )).flat().filter(Boolean).join(`
85
85
 
86
86
  `);
87
+ try {
88
+ const buffer = Buffer.from(out), codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
89
+ out = transform({
90
+ filename: "code.css",
91
+ code: codeOut,
92
+ ...server.config.css.lightningcss
93
+ }).code.toString();
94
+ } catch {
95
+ console.error(" [one] Error post-processing merged CSS, leaving un-processed");
96
+ }
97
+ return out;
87
98
  }
88
99
  async function collectStyleUrls(server, entries) {
89
100
  const visited = /* @__PURE__ */ new Set();
@@ -98,16 +109,6 @@ async function collectStyleUrls(server, entries) {
98
109
  return await Promise.all(entries.map((e) => server.transformRequest(e))), await Promise.all(entries.map((url) => traverse(url))), [...visited].filter((url) => url.match(CSS_LANGS_RE));
99
110
  }
100
111
  const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
101
- function dedupeCSS(css) {
102
- const lines = css.split(`
103
- `), uniqueLines = /* @__PURE__ */ new Set();
104
- for (const line of lines) {
105
- const trimmedLine = line.trim();
106
- trimmedLine && uniqueLines.add(trimmedLine);
107
- }
108
- return Array.from(uniqueLines).join(`
109
- `);
110
- }
111
112
  export {
112
113
  SSRCSSPlugin,
113
114
  collectStyle
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../../../src/vite/plugins/SSRCSSPlugin.ts"],
4
- "mappings": "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",
4
+ "mappings": "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",
5
5
  "names": []
6
6
  }
@@ -62,28 +62,40 @@ function invalidateModule(server, id) {
62
62
  mod && server.moduleGraph.invalidateModule(mod);
63
63
  }
64
64
  async function collectStyle(server, entries) {
65
- const urls = await collectStyleUrls(server, entries);
66
- return (await Promise.all(urls.map(async url => {
65
+ const {
66
+ transform
67
+ } = await import("lightningcss"),
68
+ urls = await collectStyleUrls(server, entries);
69
+ let out = (await Promise.all(urls.map(async url => {
67
70
  const code = (await server.transformRequest(url + "?direct"))?.code || "",
68
71
  prefix = `/* [collectStyle] ${url} */`;
69
72
  try {
70
- const {
71
- transform
72
- } = await import("lightningcss"),
73
- buffer = Buffer.from(code),
73
+ const buffer = Buffer.from(code),
74
74
  codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
75
75
  let processed = transform({
76
76
  filename: "code.css",
77
77
  code: codeOut,
78
78
  ...server.config.css.lightningcss
79
79
  }).code.toString();
80
- return process.env.ONE_DEBUG_CSS && console.info("Got CSS", processed), process.env.ONE_DEDUPE_CSS && (processed = dedupeCSS(processed)), process.env.ONE_DEBUG_CSS && console.info("Got CSS after dedupe", processed), [prefix, processed];
80
+ return [prefix, processed];
81
81
  } catch (err) {
82
82
  return console.error(` [one] Error post-processing CSS, leaving un-processed: ${err}`), [prefix, code];
83
83
  }
84
84
  }))).flat().filter(Boolean).join(`
85
85
 
86
86
  `);
87
+ try {
88
+ const buffer = Buffer.from(out),
89
+ codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
90
+ out = transform({
91
+ filename: "code.css",
92
+ code: codeOut,
93
+ ...server.config.css.lightningcss
94
+ }).code.toString();
95
+ } catch {
96
+ console.error(" [one] Error post-processing merged CSS, leaving un-processed");
97
+ }
98
+ return out;
87
99
  }
88
100
  async function collectStyleUrls(server, entries) {
89
101
  const visited = /* @__PURE__ */new Set();
@@ -97,16 +109,5 @@ async function collectStyleUrls(server, entries) {
97
109
  return await Promise.all(entries.map(e => server.transformRequest(e))), await Promise.all(entries.map(url => traverse(url))), [...visited].filter(url => url.match(CSS_LANGS_RE));
98
110
  }
99
111
  const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
100
- function dedupeCSS(css) {
101
- const lines = css.split(`
102
- `),
103
- uniqueLines = /* @__PURE__ */new Set();
104
- for (const line of lines) {
105
- const trimmedLine = line.trim();
106
- trimmedLine && uniqueLines.add(trimmedLine);
107
- }
108
- return Array.from(uniqueLines).join(`
109
- `);
110
- }
111
112
  export { SSRCSSPlugin, collectStyle };
112
113
  //# sourceMappingURL=SSRCSSPlugin.mjs.map
@@ -1 +1 @@
1
- {"version":3,"names":["VIRTUAL_SSR_CSS_ENTRY","VIRTUAL_SSR_CSS_HREF","SSRCSSPlugin","pluginOpts","server","name","apply","configureServer","server_","middlewares","use","req","res","next","url","includes","invalidateModule","code","collectStyle","entries","setHeader","write","end","resolveId","source","_importer","_options","startsWith","load","id","URL","slice","searchParams","has","JSON","stringify","transformIndexHtml","handler","tag","injectTo","attrs","rel","href","type","children","mod","moduleGraph","getModuleById","urls","collectStyleUrls","Promise","all","map","transformRequest","prefix","transform","buffer","Buffer","from","codeOut","Uint8Array","byteOffset","byteLength","processed","filename","config","css","lightningcss","toString","process","env","ONE_DEBUG_CSS","console","info","ONE_DEDUPE_CSS","dedupeCSS","err","error","flat","filter","Boolean","join","visited","Set","traverse","resolveUrl","add","importedModules","childMod","e","match","CSS_LANGS_RE","lines","split","uniqueLines","line","trimmedLine","trim","Array"],"sources":["../../../../src/vite/plugins/SSRCSSPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["VIRTUAL_SSR_CSS_ENTRY","VIRTUAL_SSR_CSS_HREF","SSRCSSPlugin","pluginOpts","server","name","apply","configureServer","server_","middlewares","use","req","res","next","url","includes","invalidateModule","code","collectStyle","entries","setHeader","write","end","resolveId","source","_importer","_options","startsWith","load","id","URL","slice","searchParams","has","JSON","stringify","transformIndexHtml","handler","tag","injectTo","attrs","rel","href","type","children","mod","moduleGraph","getModuleById","transform","urls","collectStyleUrls","out","Promise","all","map","transformRequest","prefix","buffer","Buffer","from","codeOut","Uint8Array","byteOffset","byteLength","processed","filename","config","css","lightningcss","toString","err","console","error","flat","filter","Boolean","join","visited","Set","traverse","resolveUrl","add","importedModules","childMod","e","match","CSS_LANGS_RE"],"sources":["../../../../src/vite/plugins/SSRCSSPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -65,30 +65,42 @@ function invalidateModule(server, id) {
65
65
  mod && server.moduleGraph.invalidateModule(mod);
66
66
  }
67
67
  async function collectStyle(server, entries) {
68
- var urls = await collectStyleUrls(server, entries),
68
+ var {
69
+ transform
70
+ } = await import("lightningcss"),
71
+ urls = await collectStyleUrls(server, entries),
69
72
  codes = await Promise.all(urls.map(async function (url) {
70
73
  var res = await server.transformRequest(url + "?direct"),
71
74
  code = res?.code || "",
72
75
  prefix = `/* [collectStyle] ${url} */`;
73
76
  try {
74
- var {
75
- transform
76
- } = await import("lightningcss"),
77
- buffer = Buffer.from(code),
78
- codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength),
77
+ var buffer2 = Buffer.from(code),
78
+ codeOut2 = new Uint8Array(buffer2.buffer, buffer2.byteOffset, buffer2.byteLength),
79
79
  processed = transform({
80
80
  filename: "code.css",
81
- code: codeOut,
81
+ code: codeOut2,
82
82
  ...server.config.css.lightningcss
83
83
  }).code.toString();
84
- return process.env.ONE_DEBUG_CSS && console.info("Got CSS", processed), process.env.ONE_DEDUPE_CSS && (processed = dedupeCSS(processed)), process.env.ONE_DEBUG_CSS && console.info("Got CSS after dedupe", processed), [prefix, processed];
84
+ return [prefix, processed];
85
85
  } catch (err) {
86
86
  return console.error(` [one] Error post-processing CSS, leaving un-processed: ${err}`), [prefix, code];
87
87
  }
88
- }));
89
- return codes.flat().filter(Boolean).join(`
88
+ })),
89
+ out = codes.flat().filter(Boolean).join(`
90
90
 
91
91
  `);
92
+ try {
93
+ var buffer = Buffer.from(out),
94
+ codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
95
+ out = transform({
96
+ filename: "code.css",
97
+ code: codeOut,
98
+ ...server.config.css.lightningcss
99
+ }).code.toString();
100
+ } catch {
101
+ console.error(" [one] Error post-processing merged CSS, leaving un-processed");
102
+ }
103
+ return out;
92
104
  }
93
105
  async function collectStyleUrls(server, entries) {
94
106
  var visited = /* @__PURE__ */new Set();
@@ -111,30 +123,5 @@ async function collectStyleUrls(server, entries) {
111
123
  });
112
124
  }
113
125
  var CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
114
- function dedupeCSS(css) {
115
- var lines = css.split(`
116
- `),
117
- uniqueLines = /* @__PURE__ */new Set(),
118
- _iteratorNormalCompletion = !0,
119
- _didIteratorError = !1,
120
- _iteratorError = void 0;
121
- try {
122
- for (var _iterator = lines[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = !0) {
123
- var line = _step.value,
124
- trimmedLine = line.trim();
125
- trimmedLine && uniqueLines.add(trimmedLine);
126
- }
127
- } catch (err) {
128
- _didIteratorError = !0, _iteratorError = err;
129
- } finally {
130
- try {
131
- !_iteratorNormalCompletion && _iterator.return != null && _iterator.return();
132
- } finally {
133
- if (_didIteratorError) throw _iteratorError;
134
- }
135
- }
136
- return Array.from(uniqueLines).join(`
137
- `);
138
- }
139
126
  export { SSRCSSPlugin, collectStyle };
140
127
  //# sourceMappingURL=SSRCSSPlugin.native.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["VIRTUAL_SSR_CSS_ENTRY","VIRTUAL_SSR_CSS_HREF","SSRCSSPlugin","pluginOpts","server","name","apply","configureServer","server_","middlewares","use","req","res","next","_req_url","url","includes","invalidateModule","code","collectStyle","entries","setHeader","write","end","resolveId","source","_importer","_options","startsWith","load","id","URL","slice","searchParams","has","JSON","stringify","transformIndexHtml","handler","tag","injectTo","attrs","rel","href","type","children","mod","moduleGraph","getModuleById","urls","collectStyleUrls","codes","Promise","all","map","transformRequest","prefix","transform","buffer","Buffer","from","codeOut","Uint8Array","byteOffset","byteLength","processed","filename","config","css","lightningcss","toString","process","env","ONE_DEBUG_CSS","console","info","ONE_DEDUPE_CSS","dedupeCSS","err","error","flat","filter","Boolean","join","visited","Set","traverse","resolveUrl","add","importedModules","childMod","e"],"sources":["../../../../src/vite/plugins/SSRCSSPlugin.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["VIRTUAL_SSR_CSS_ENTRY","VIRTUAL_SSR_CSS_HREF","SSRCSSPlugin","pluginOpts","server","name","apply","configureServer","server_","middlewares","use","req","res","next","_req_url","url","includes","invalidateModule","code","collectStyle","entries","setHeader","write","end","resolveId","source","_importer","_options","startsWith","load","id","URL","slice","searchParams","has","JSON","stringify","transformIndexHtml","handler","tag","injectTo","attrs","rel","href","type","children","mod","moduleGraph","getModuleById","transform","urls","collectStyleUrls","codes","Promise","all","map","transformRequest","prefix","buffer2","Buffer","from","codeOut2","Uint8Array","buffer","byteOffset","byteLength","processed","filename","config","css","lightningcss","toString","err","console","error","out","flat","filter","Boolean","join","codeOut","visited","Set","traverse","resolveUrl","add"],"sources":["../../../../src/vite/plugins/SSRCSSPlugin.ts"],"sourcesContent":[null],"mappings":"AACA,SAASA,qBAAA,EAAuBC,oBAAA,QAA4B;AAIrD,SAASC,aAAaC,UAAA,EAA2C;EACtE,IAAIC,MAAA;EAEJ,OAAO;IACLC,IAAA,EAAM;IACNC,KAAA,EAAO;IACPC,gBAAgBC,OAAA,EAAS;MACvBJ,MAAA,GAASI,OAAA,EAGTJ,MAAA,CAAOK,WAAA,CAAYC,GAAA,CAAI,gBAAYC,GAAK,EAAAC,GAAA,EAAAC,IAAS;QAC/C,IAAIC,QAAI;QACN,OAAAA,QAAA,GAAAH,GAAiB,CAAAI,GAAA,MAAQ,IAAO,IAAAD,QAAA,WAAwB,KAAAA,QAAS,CAAAE,QAAA,CAAAf,oBAAA;UAEjEgB,gBAAW,CAAMb,MAAA,SAAaJ,qBAAmB,GAAO;UAExD,IAAIkB,IAAA,SAAUC,YAAA,CAAgBf,MAAA,EAAAD,UAC1B,CAAAiB,OAAA,CAAU;UAIdR,GAAA,CAAAS,SAAA,8BAAAT,GAAA,CAAAS,SAAA,+BAAAT,GAAA,CAAAS,SAAA,eAAAT,GAAA,CAAAU,KAAA,CAAAJ,IAAA,GAAAN,GAAA,CAAAW,GAAA;UACF;QACA;QACDV,IAAA;MACH;IAAA;IAAA;IAIA;IACEW,SAAOA,CAAAC,MAAO,EAAAC,SAAW,EAAAC,QAAA;MAC3B,OAAAF,MAAA,CAAAG,UAAA,CAAA5B,qBAAA,WAAAyB,MAAA;IAEA;IACE,MAAII,IAAGA,CAAAC,EAAA,EAAAH,QAAW;MAChB,IAAAG,EAAA,CAAAF,UAAY,CAAI,IAAI,GAAG5B,qBAAU;QACjC,IAAIe,GAAA,OAAOgB,GAAM,CAAAD,EAAA,CAAAE,KAAA,KAAa,oBAAmB;UAAAd,IAAO,SAAAC,YAAA,CAAAf,MAAA,EAAAD,UAAA,CAAAiB,OAAA;QACxD,OAAKL,GAAA,CAAIkB,YAAA,CAAaC,GAAA,CAAI,QAAQ,MAChChB,IAAA,GAAO,kBAAkBiB,IAAA,CAAKC,SAAA,CAAUlB,IAAI,CAAC,KAExCA,IAAA;MACT;IAGF;IAAA;IAGAmB,kBAAA,EAAoB;MAClBC,OAAA,EAAS,eAAAA,CAAA,EACA;QACL,QACE;UACAC,GAAA,QAAU;UACVC,QAAO;UACLC,KAAK;YACLC,GAAA,EAAM;YACNC,IAAA,EAAA1C,oBAAgB;YAClB;UACF;QAEA,GACE;UACAsC,GAAA,UAAU;UACVC,QAAS,QAAM;UACfC,KAAA;YAAAG,IAAA;UAAmB;UAAAC,QAAA;UAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASrB,aACF;QAGN,EACF;MAEA;IACE;EACI;AAGN;AAMA,SAAA5B,gBAAsBA,CAAAb,MAAa,EAAA0B,EAAuB;EACxD,IAAAgB,GAAM,GAAE1C,MAAA,CAAA2C,WAAoB,CAAAC,aAAO,CAAAlB,EAAA;EA2BnCgB,GAAA,IAAI1C,MAxBU,CAAA2C,WAAc,CAAA9B,gBAAA,CAAA6B,GAAA;AAAA;AAGxB,eAAM3B,YADYA,CAAAf,MAAO,EAAAgB,OAAA;EAIzB;MAAA6B;IAAI;IAAAC,IAAA,SAAAC,gBAAA,CAAA/C,MAAA,EAAAgB,OAAA;IAAAgC,KAAA,SAAAC,OAAA,CAAAC,GAAA,CAAAJ,IAAA,CAAAK,GAAA,iBAAAxC,GAAA;MACF,IAAAH,GAAA,GAAM,MAAAR,MAAS,CAAAoD,gBACT,CAAAzC,GAAA,YAAc;QAAAG,IAAA,GAAWN,GAAA,EAAOM,IAAA,IAAQ;QAAAuC,MAAO,wBAAmB1C,GAAU;MAElF;QAA0B,IACxB2C,OAAA,GAAUC,MAAA,CAAAC,IAAA,CAAA1C,IAAA;UAAA2C,QAAA,OAAAC,UAAA,CAAAJ,OAAA,CAAAK,MAAA,EAAAL,OAAA,CAAAM,UAAA,EAAAN,OAAA,CAAAO,UAAA;UAAAC,SAAA,GAAAjB,SAAA;YAAAkB,QACJ;YAAAjD,IACN,EAAG2C,QAAO;YACZ,GAAGzD,MAAK,CAAAgE,MAAA,CAASC,GAAA,CAAAC;UAEjB,GAAApD,IAAA,CAAAqD,QAAQ,EAAQ;QAClB,QACEd,MAAA,EAEFS,SAAA,CACD;MACH,CAEgB,QAAOM,GAAA;QAAqB,OAAAC,OAAA,CAAAC,KAAA,4DAAAF,GAAA,MAAMf,MAAA,EAE9CvC,IAAA,CAEF;MAEA;IAAgB;IACdyD,GAAA,GAAAvB,KAAU,CAAAwB,IAAA,GAAAC,MAAA,CAAAC,OAAA,EAAAC,IAAA;AAAA;AACJ;EACe,IACtB;IACH,IAAAhB,MAAc,GAAAJ,MAAA,CAAAC,IAAA,CAAAe,GAAA;MAAAK,OAAA,OAAAlB,UAAA,CAAAC,MAAA,CAAAA,MAAA,EAAAA,MAAA,CAAAC,UAAA,EAAAD,MAAA,CAAAE,UAAA;IACZU,GAAA,GAAA1B,SAAc;MAChBkB,QAAA;MAEAjD,IAAO,EAAA8D,OAAA;MACT,GAAA5E,MAAA,CAAAgE,MAAA,CAAAC,GAAA,CAAAC;IAEA,GAAApD,IAAA,CAAAqD,QAAe;EACb,QAAM;IAENE,OAAA,CAAAC,KAAe,gEAAsB;EACnC;EACA,OAAIC,GAAA;AACF;AAEF,eAAQxB,gBAAMA,CAAA/C,MAAA,EAAAgB,OAAA;EACd,IAAA6D,OAAM,GAAM,eAAO,IAAYC,GAAA;EAC/B,eAGMC,QAAQA,CAAApE,GAAI,EAAC;IACrB,OAAAe,EAAA,UAAA1B,MAAA,CAAA2C,WAAA,CAAAqC,UAAA,CAAArE,GAAA;IAGA,KAAAkE,OAAM,CAAA/C,GAAA,CAAAJ,EAAQ;MAOhBmD,OAAA,CAAAI,GAAA,CAAAvD,EAAA;MAGM,IAAAgB,GAAA,GAAA1C,MAAe,CAAA2C,WAAA,CAAAC,aAAA,CAAAlB,EAAA","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "one",
3
- "version": "1.1.495",
3
+ "version": "1.1.496",
4
4
  "license": "BSD-3-Clause",
5
5
  "sideEffects": [
6
6
  "setup.mjs",
@@ -96,15 +96,15 @@
96
96
  "@react-navigation/routers": "~7.3.2",
97
97
  "@swc/core": "^1.10.4",
98
98
  "@ungap/structured-clone": "^1.2.0",
99
- "@vxrn/compiler": "1.1.495",
100
- "@vxrn/resolve": "1.1.495",
101
- "@vxrn/tslib-lite": "1.1.495",
102
- "@vxrn/universal-color-scheme": "1.1.495",
103
- "@vxrn/use-isomorphic-layout-effect": "1.1.495",
99
+ "@vxrn/compiler": "1.1.496",
100
+ "@vxrn/resolve": "1.1.496",
101
+ "@vxrn/tslib-lite": "1.1.496",
102
+ "@vxrn/universal-color-scheme": "1.1.496",
103
+ "@vxrn/use-isomorphic-layout-effect": "1.1.496",
104
104
  "babel-dead-code-elimination": "^1.0.9",
105
105
  "citty": "^0.1.6",
106
106
  "core-js": "^3.38.1",
107
- "create-vxrn": "1.1.495",
107
+ "create-vxrn": "1.1.496",
108
108
  "escape-string-regexp": "^5.0.0",
109
109
  "expo-linking": "~6.3.1",
110
110
  "expo-modules-core": "2.3.13",
@@ -130,7 +130,7 @@
130
130
  "vite": "^6.1.0",
131
131
  "vite-plugin-barrel": "^0.4.1",
132
132
  "vite-tsconfig-paths": "^5.0.1",
133
- "vxrn": "1.1.495",
133
+ "vxrn": "1.1.496",
134
134
  "ws": "^8.18.0",
135
135
  "xxhashjs": "^0.2.2"
136
136
  },
@@ -95,6 +95,8 @@ function invalidateModule(server: ViteDevServer, id: string) {
95
95
  // https://github.com/vikejs/vike/blob/f9a91f3c47cab9c2871526ef714cc0f87a41fda0/vike/node/runtime/renderPage/getPageAssets/retrieveAssetsDev.ts
96
96
 
97
97
  export async function collectStyle(server: ViteDevServer, entries: string[]) {
98
+ const { transform } = await import('lightningcss')
99
+
98
100
  const urls = await collectStyleUrls(server, entries)
99
101
  const codes = await Promise.all(
100
102
  urls.map(async (url) => {
@@ -103,7 +105,6 @@ export async function collectStyle(server: ViteDevServer, entries: string[]) {
103
105
  const prefix = `/* [collectStyle] ${url} */`
104
106
 
105
107
  try {
106
- const { transform } = await import('lightningcss')
107
108
  const buffer = Buffer.from(code)
108
109
  const codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength)
109
110
 
@@ -113,18 +114,6 @@ export async function collectStyle(server: ViteDevServer, entries: string[]) {
113
114
  ...server.config.css.lightningcss,
114
115
  }).code.toString()
115
116
 
116
- if (process.env.ONE_DEBUG_CSS) {
117
- console.info(`Got CSS`, processed)
118
- }
119
-
120
- if (process.env.ONE_DEDUPE_CSS) {
121
- processed = dedupeCSS(processed)
122
- }
123
-
124
- if (process.env.ONE_DEBUG_CSS) {
125
- console.info(`Got CSS after dedupe`, processed)
126
- }
127
-
128
117
  return [prefix, processed]
129
118
  } catch (err) {
130
119
  console.error(` [one] Error post-processing CSS, leaving un-processed: ${err}`)
@@ -132,7 +121,23 @@ export async function collectStyle(server: ViteDevServer, entries: string[]) {
132
121
  }
133
122
  })
134
123
  )
135
- return codes.flat().filter(Boolean).join('\n\n')
124
+
125
+ let out = codes.flat().filter(Boolean).join('\n\n')
126
+
127
+ try {
128
+ // run once more at the end to de-dupe!
129
+ const buffer = Buffer.from(out)
130
+ const codeOut = new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength)
131
+ out = transform({
132
+ filename: 'code.css',
133
+ code: codeOut,
134
+ ...server.config.css.lightningcss,
135
+ }).code.toString()
136
+ } catch (err) {
137
+ console.error(` [one] Error post-processing merged CSS, leaving un-processed`)
138
+ }
139
+
140
+ return out
136
141
  }
137
142
 
138
143
  async function collectStyleUrls(server: ViteDevServer, entries: string[]): Promise<string[]> {
@@ -163,17 +168,3 @@ async function collectStyleUrls(server: ViteDevServer, entries: string[]): Promi
163
168
 
164
169
  // cf. https://github.com/vitejs/vite/blob/d6bde8b03d433778aaed62afc2be0630c8131908/packages/vite/src/node/constants.ts#L49C23-L50
165
170
  const CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/
166
-
167
- function dedupeCSS(css: string): string {
168
- const lines = css.split('\n')
169
- const uniqueLines = new Set<string>()
170
-
171
- for (const line of lines) {
172
- const trimmedLine = line.trim()
173
- if (trimmedLine) {
174
- uniqueLines.add(trimmedLine)
175
- }
176
- }
177
-
178
- return Array.from(uniqueLines).join('\n')
179
- }
@@ -1 +1 @@
1
- {"version":3,"file":"SSRCSSPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/SSRCSSPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAKjD,wBAAgB,YAAY,CAAC,UAAU,EAAE;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,MAAM,CA8EtE;AAaD,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,mBAuC1E"}
1
+ {"version":3,"file":"SSRCSSPlugin.d.ts","sourceRoot":"","sources":["../../../src/vite/plugins/SSRCSSPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAKjD,wBAAgB,YAAY,CAAC,UAAU,EAAE;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,MAAM,CA8EtE;AAaD,wBAAsB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,mBA4C1E"}