@marko/vite 2.3.7 → 2.3.8

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.js +13 -16
  2. package/dist/index.mjs +13 -16
  3. package/package.json +1 -1
package/dist/index.js CHANGED
@@ -102,7 +102,7 @@ function markoPlugin(opts = {}) {
102
102
  let devServer;
103
103
  let registeredTag = false;
104
104
  let serverManifest;
105
- const devEntryFileSources = /* @__PURE__ */ new Map();
105
+ const entrySources = /* @__PURE__ */ new Map();
106
106
  const transformWatchFiles = /* @__PURE__ */ new Map();
107
107
  const transformOptionalFiles = /* @__PURE__ */ new Map();
108
108
  return [
@@ -169,7 +169,7 @@ function markoPlugin(opts = {}) {
169
169
  devServer = _server;
170
170
  devServer.watcher.on("all", (type, filename) => {
171
171
  if (type === "unlink") {
172
- devEntryFileSources.delete(filename);
172
+ entrySources.delete(filename);
173
173
  }
174
174
  for (const [id, files] of transformWatchFiles) {
175
175
  if ((0, import_anymatch.default)(files, filename)) {
@@ -197,6 +197,9 @@ function markoPlugin(opts = {}) {
197
197
  try {
198
198
  serverManifest = JSON.parse(await import_fs.default.promises.readFile(serverMetaFile, "utf-8"));
199
199
  inputOptions.input = toHTMLEntries(root, serverManifest.entries);
200
+ for (const entry in serverManifest.entrySources) {
201
+ entrySources.set(import_path.default.resolve(root, entry), serverManifest.entrySources[entry]);
202
+ }
200
203
  } catch (err) {
201
204
  this.error(`You must run the "ssr" build before the "browser" build.`);
202
205
  }
@@ -246,17 +249,18 @@ function markoPlugin(opts = {}) {
246
249
  case serverEntryQuery: {
247
250
  const fileName = id.slice(0, -serverEntryQuery.length);
248
251
  let entryData;
252
+ entrySources.set(fileName, "");
249
253
  if (isBuild) {
250
254
  const relativeFileName = import_path.default.posix.relative(root, fileName);
251
255
  const entryId = toEntryId(relativeFileName);
252
256
  serverManifest ?? (serverManifest = {
253
257
  entries: {},
258
+ entrySources: {},
254
259
  chunksNeedingAssets: []
255
260
  });
256
261
  serverManifest.entries[entryId] = relativeFileName;
257
262
  entryData = JSON.stringify(entryId);
258
263
  } else {
259
- devEntryFileSources.set(fileName, "");
260
264
  entryData = JSON.stringify(await (0, import_manifest_generator.generateDocManifest)(await devServer.transformIndexHtml("/", (0, import_manifest_generator.generateInputDoc)(fileNameToURL(fileName, root)))));
261
265
  }
262
266
  return (0, import_server_entry_template.default)({
@@ -266,17 +270,7 @@ function markoPlugin(opts = {}) {
266
270
  });
267
271
  }
268
272
  case browserEntryQuery: {
269
- const realId = id.slice(0, -browserEntryQuery.length);
270
- if (isBuild) {
271
- const {
272
- meta: { source }
273
- } = await this.load({
274
- id: realId,
275
- resolveDependencies: false
276
- });
277
- return source;
278
- }
279
- return devEntryFileSources.get(realId);
273
+ return entrySources.get(id.slice(0, -browserEntryQuery.length));
280
274
  }
281
275
  }
282
276
  return virtualFiles.get(id) || null;
@@ -298,8 +292,11 @@ function markoPlugin(opts = {}) {
298
292
  if (!isMarkoFile(id)) {
299
293
  return null;
300
294
  }
301
- if (ssr && !isBuild && devEntryFileSources.has(id)) {
302
- devEntryFileSources.set(id, source);
295
+ if (ssr && entrySources.has(id)) {
296
+ entrySources.set(id, source);
297
+ if (serverManifest) {
298
+ serverManifest.entrySources[import_path.default.relative(root, id)] = source;
299
+ }
303
300
  }
304
301
  const compiled = await compiler.compile(source, id, (typeof ssr === "object" ? ssr.ssr : ssr) ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig);
305
302
  const { map, meta } = compiled;
package/dist/index.mjs CHANGED
@@ -85,7 +85,7 @@ function markoPlugin(opts = {}) {
85
85
  let devServer;
86
86
  let registeredTag = false;
87
87
  let serverManifest;
88
- const devEntryFileSources = /* @__PURE__ */ new Map();
88
+ const entrySources = /* @__PURE__ */ new Map();
89
89
  const transformWatchFiles = /* @__PURE__ */ new Map();
90
90
  const transformOptionalFiles = /* @__PURE__ */ new Map();
91
91
  return [
@@ -152,7 +152,7 @@ function markoPlugin(opts = {}) {
152
152
  devServer = _server;
153
153
  devServer.watcher.on("all", (type, filename) => {
154
154
  if (type === "unlink") {
155
- devEntryFileSources.delete(filename);
155
+ entrySources.delete(filename);
156
156
  }
157
157
  for (const [id, files] of transformWatchFiles) {
158
158
  if (anyMatch(files, filename)) {
@@ -180,6 +180,9 @@ function markoPlugin(opts = {}) {
180
180
  try {
181
181
  serverManifest = JSON.parse(await fs.promises.readFile(serverMetaFile, "utf-8"));
182
182
  inputOptions.input = toHTMLEntries(root, serverManifest.entries);
183
+ for (const entry in serverManifest.entrySources) {
184
+ entrySources.set(path.resolve(root, entry), serverManifest.entrySources[entry]);
185
+ }
183
186
  } catch (err) {
184
187
  this.error(`You must run the "ssr" build before the "browser" build.`);
185
188
  }
@@ -229,17 +232,18 @@ function markoPlugin(opts = {}) {
229
232
  case serverEntryQuery: {
230
233
  const fileName = id.slice(0, -serverEntryQuery.length);
231
234
  let entryData;
235
+ entrySources.set(fileName, "");
232
236
  if (isBuild) {
233
237
  const relativeFileName = path.posix.relative(root, fileName);
234
238
  const entryId = toEntryId(relativeFileName);
235
239
  serverManifest ?? (serverManifest = {
236
240
  entries: {},
241
+ entrySources: {},
237
242
  chunksNeedingAssets: []
238
243
  });
239
244
  serverManifest.entries[entryId] = relativeFileName;
240
245
  entryData = JSON.stringify(entryId);
241
246
  } else {
242
- devEntryFileSources.set(fileName, "");
243
247
  entryData = JSON.stringify(await generateDocManifest(await devServer.transformIndexHtml("/", generateInputDoc(fileNameToURL(fileName, root)))));
244
248
  }
245
249
  return server_entry_template_default({
@@ -249,17 +253,7 @@ function markoPlugin(opts = {}) {
249
253
  });
250
254
  }
251
255
  case browserEntryQuery: {
252
- const realId = id.slice(0, -browserEntryQuery.length);
253
- if (isBuild) {
254
- const {
255
- meta: { source }
256
- } = await this.load({
257
- id: realId,
258
- resolveDependencies: false
259
- });
260
- return source;
261
- }
262
- return devEntryFileSources.get(realId);
256
+ return entrySources.get(id.slice(0, -browserEntryQuery.length));
263
257
  }
264
258
  }
265
259
  return virtualFiles.get(id) || null;
@@ -281,8 +275,11 @@ function markoPlugin(opts = {}) {
281
275
  if (!isMarkoFile(id)) {
282
276
  return null;
283
277
  }
284
- if (ssr && !isBuild && devEntryFileSources.has(id)) {
285
- devEntryFileSources.set(id, source);
278
+ if (ssr && entrySources.has(id)) {
279
+ entrySources.set(id, source);
280
+ if (serverManifest) {
281
+ serverManifest.entrySources[path.relative(root, id)] = source;
282
+ }
286
283
  }
287
284
  const compiled = await compiler.compile(source, id, (typeof ssr === "object" ? ssr.ssr : ssr) ? ssrConfig : query === browserEntryQuery ? hydrateConfig : domConfig);
288
285
  const { map, meta } = compiled;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@marko/vite",
3
3
  "description": "A Marko plugin for Vite",
4
- "version": "2.3.7",
4
+ "version": "2.3.8",
5
5
  "author": "Dylan Piercey <dpiercey@ebay.com>",
6
6
  "bugs": "https://github.com/marko-js/vite/issues",
7
7
  "dependencies": {