@marko/vite 2.2.3 → 2.2.7

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 (5) hide show
  1. package/dist/index.js +9 -5
  2. package/dist/index.mjs +8 -5
  3. package/dist/render-assets-transform.js +1 -1
  4. package/dist/render-assets-transform.mjs +1 -1
  5. package/package.json +25 -18
package/dist/index.js CHANGED
@@ -50,10 +50,11 @@ var import_os = __toESM(require("os"));
50
50
  var import_fs = __toESM(require("fs"));
51
51
  var import_path = __toESM(require("path"));
52
52
  var import_crypto = __toESM(require("crypto"));
53
- var import_url = require("url");
54
53
  var import_anymatch = __toESM(require("anymatch"));
54
+ var import_url = require("url");
55
55
  var import_server_entry_template = __toESM(require("./server-entry-template"));
56
56
  var import_manifest_generator = require("./manifest-generator");
57
+ const import_meta = {};
57
58
  const virtualFiles = /* @__PURE__ */ new Map();
58
59
  const queryReg = /\?marko-.+$/;
59
60
  const browserEntryQuery = "?marko-browser-entry";
@@ -62,6 +63,7 @@ const virtualFileQuery = "?marko-virtual";
62
63
  const markoExt = ".marko";
63
64
  const htmlExt = ".html";
64
65
  const resolveOpts = { skipSelf: true };
66
+ const thisFile = typeof __filename === "string" ? __filename : (0, import_url.fileURLToPath)(import_meta.url);
65
67
  let tempDir;
66
68
  function markoPlugin(opts = {}) {
67
69
  var _a;
@@ -104,6 +106,7 @@ function markoPlugin(opts = {}) {
104
106
  output: "hydrate"
105
107
  });
106
108
  let root;
109
+ let devEntryFile;
107
110
  let isBuild = false;
108
111
  let isSSRBuild = false;
109
112
  let devServer;
@@ -118,11 +121,12 @@ function markoPlugin(opts = {}) {
118
121
  async config(config, env) {
119
122
  compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
120
123
  root = config.root || process.cwd();
124
+ devEntryFile = import_path.default.join(root, "index.html");
121
125
  isBuild = env.command === "build";
122
126
  isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
123
127
  if (!registeredTag) {
124
- const transformer = import_path.default.resolve(__filename, "../render-assets-transform");
125
- registeredTag = import_path.default.resolve(__filename, "../components", isBuild ? "vite.marko" : "vite-watch.marko");
128
+ const transformer = import_path.default.resolve(thisFile, "../render-assets-transform");
129
+ registeredTag = import_path.default.resolve(thisFile, "../components", isBuild ? "vite.marko" : "vite-watch.marko");
126
130
  compiler.taglib.register("@marko/vite", {
127
131
  "<_vite>": { template: registeredTag },
128
132
  "<head>": { transformer },
@@ -156,7 +160,7 @@ function markoPlugin(opts = {}) {
156
160
  const ssr = config.ssr ?? (config.ssr = {});
157
161
  ssr.external ?? (ssr.external = []);
158
162
  ssr.external = ssr.external.concat(serverDeps);
159
- (await import("@marko/compiler/register")).default(__spreadProps(__spreadValues({}, ssrConfig), {
163
+ (await import("@marko/compiler/register.js")).default(__spreadProps(__spreadValues({}, ssrConfig), {
160
164
  sourceMaps: "inline",
161
165
  modules: "cjs"
162
166
  }));
@@ -208,7 +212,7 @@ function markoPlugin(opts = {}) {
208
212
  let importeeQuery = getMarkoQuery(importee);
209
213
  if (importeeQuery) {
210
214
  importee = importee.slice(0, -importeeQuery.length);
211
- } else if (ssr && linked && importer && isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
215
+ } else if (ssr && linked && importer && importer !== devEntryFile && isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
212
216
  importeeQuery = serverEntryQuery;
213
217
  } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a2 = this.getModuleInfo(importer)) == null ? void 0 : _a2.isEntry)) {
214
218
  importeeQuery = browserEntryQuery;
package/dist/index.mjs CHANGED
@@ -16,8 +16,8 @@ import os from "os";
16
16
  import fs from "fs";
17
17
  import path from "path";
18
18
  import crypto from "crypto";
19
- import { pathToFileURL } from "url";
20
19
  import anyMatch from "anymatch";
20
+ import { pathToFileURL, fileURLToPath } from "url";
21
21
  var virtualFiles = /* @__PURE__ */ new Map();
22
22
  var queryReg = /\?marko-.+$/;
23
23
  var browserEntryQuery = "?marko-browser-entry";
@@ -26,6 +26,7 @@ var virtualFileQuery = "?marko-virtual";
26
26
  var markoExt = ".marko";
27
27
  var htmlExt = ".html";
28
28
  var resolveOpts = { skipSelf: true };
29
+ var thisFile = typeof __filename === "string" ? __filename : fileURLToPath(import.meta.url);
29
30
  var tempDir;
30
31
  function markoPlugin(opts = {}) {
31
32
  var _a;
@@ -68,6 +69,7 @@ function markoPlugin(opts = {}) {
68
69
  output: "hydrate"
69
70
  });
70
71
  let root;
72
+ let devEntryFile;
71
73
  let isBuild = false;
72
74
  let isSSRBuild = false;
73
75
  let devServer;
@@ -82,11 +84,12 @@ function markoPlugin(opts = {}) {
82
84
  async config(config, env) {
83
85
  compiler ?? (compiler = await import(opts.compiler || "@marko/compiler"));
84
86
  root = config.root || process.cwd();
87
+ devEntryFile = path.join(root, "index.html");
85
88
  isBuild = env.command === "build";
86
89
  isSSRBuild = isBuild && linked && Boolean(config.build.ssr);
87
90
  if (!registeredTag) {
88
- const transformer = path.resolve(import.meta.url, "../render-assets-transform");
89
- registeredTag = path.resolve(import.meta.url, "../components", isBuild ? "vite.marko" : "vite-watch.marko");
91
+ const transformer = path.resolve(thisFile, "../render-assets-transform");
92
+ registeredTag = path.resolve(thisFile, "../components", isBuild ? "vite.marko" : "vite-watch.marko");
90
93
  compiler.taglib.register("@marko/vite", {
91
94
  "<_vite>": { template: registeredTag },
92
95
  "<head>": { transformer },
@@ -120,7 +123,7 @@ function markoPlugin(opts = {}) {
120
123
  const ssr = config.ssr ?? (config.ssr = {});
121
124
  ssr.external ?? (ssr.external = []);
122
125
  ssr.external = ssr.external.concat(serverDeps);
123
- (await import("@marko/compiler/register")).default(__spreadProps(__spreadValues({}, ssrConfig), {
126
+ (await import("@marko/compiler/register.js")).default(__spreadProps(__spreadValues({}, ssrConfig), {
124
127
  sourceMaps: "inline",
125
128
  modules: "cjs"
126
129
  }));
@@ -172,7 +175,7 @@ function markoPlugin(opts = {}) {
172
175
  let importeeQuery = getMarkoQuery(importee);
173
176
  if (importeeQuery) {
174
177
  importee = importee.slice(0, -importeeQuery.length);
175
- } else if (ssr && linked && importer && isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
178
+ } else if (ssr && linked && importer && importer !== devEntryFile && isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
176
179
  importeeQuery = serverEntryQuery;
177
180
  } else if (!ssr && isBuild && importer && isMarkoFile(importee) && ((_a2 = this.getModuleInfo(importer)) == null ? void 0 : _a2.isEntry)) {
178
181
  importeeQuery = browserEntryQuery;
package/dist/render-assets-transform.js CHANGED
@@ -31,7 +31,7 @@ var render_assets_transform_default = (tag, t) => {
31
31
  body.pushContainer("body", renderAssetsCall(t, tagName));
32
32
  };
33
33
  function renderAssetsCall(t, slot) {
34
- return t.callExpression(t.memberExpression(t.memberExpression(t.identifier("out"), t.identifier("global")), t.identifier("___viteRenderAssets")), [t.identifier("out"), t.stringLiteral(slot)]);
34
+ return t.expressionStatement(t.callExpression(t.memberExpression(t.memberExpression(t.identifier("out"), t.identifier("global")), t.identifier("___viteRenderAssets")), [t.identifier("out"), t.stringLiteral(slot)]));
35
35
  }
36
36
  module.exports = __toCommonJS(render_assets_transform_exports);
37
37
  // Annotate the CommonJS export names for ESM import in node:
package/dist/render-assets-transform.mjs CHANGED
@@ -8,7 +8,7 @@ var render_assets_transform_default = (tag, t) => {
8
8
  body.pushContainer("body", renderAssetsCall(t, tagName));
9
9
  };
10
10
  function renderAssetsCall(t, slot) {
11
- return t.callExpression(t.memberExpression(t.memberExpression(t.identifier("out"), t.identifier("global")), t.identifier("___viteRenderAssets")), [t.identifier("out"), t.stringLiteral(slot)]);
11
+ return t.expressionStatement(t.callExpression(t.memberExpression(t.memberExpression(t.identifier("out"), t.identifier("global")), t.identifier("___viteRenderAssets")), [t.identifier("out"), t.stringLiteral(slot)]));
12
12
  }
13
13
  export {
14
14
  render_assets_transform_default as default
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.2.3",
4
+ "version": "2.2.7",
5
5
  "author": "Dylan Piercey <dpiercey@ebay.com>",
6
6
  "bugs": "https://github.com/marko-js/vite/issues",
7
7
  "dependencies": {
@@ -11,29 +11,36 @@
11
11
  "htmlparser2": "^7.2.0"
12
12
  },
13
13
  "devDependencies": {
14
- "@commitlint/cli": "^16.0.1",
14
+ "@commitlint/cli": "^16.1.0",
15
15
  "@commitlint/config-conventional": "^16.0.0",
16
- "@marko/compiler": "^5.17.6",
17
- "@types/mocha": "^9.0.0",
18
- "@types/node": "^17.0.6",
19
- "@typescript-eslint/eslint-plugin": "^5.8.1",
20
- "@typescript-eslint/parser": "^5.8.1",
21
- "esbuild": "^0.14.10",
22
- "esbuild-register": "^3.3.1",
23
- "eslint": "^8.6.0",
16
+ "@marko/compiler": "^5.19.1",
17
+ "@marko/fixture-snapshots": "^2.1.6",
18
+ "@marko/testing-library": "^6.0.0",
19
+ "@types/jsdom": "^16.2.14",
20
+ "@types/mocha": "^9.1.0",
21
+ "@types/node": "^17.0.15",
22
+ "@types/serve-handler": "^6.1.1",
23
+ "@typescript-eslint/eslint-plugin": "^5.10.2",
24
+ "@typescript-eslint/parser": "^5.10.2",
25
+ "esbuild": "^0.14.20",
26
+ "esbuild-register": "^3.3.2",
27
+ "eslint": "^8.8.0",
24
28
  "eslint-config-prettier": "^8.3.0",
25
- "fast-glob": "^3.2.7",
29
+ "fast-glob": "^3.2.11",
26
30
  "fixpack": "^4.0.0",
27
31
  "husky": "^7.0.4",
28
- "lint-staged": "^12.1.4",
29
- "marko": "^5.17.6",
30
- "mocha": "^9.1.3",
31
- "mocha-snap": "^4.2.1",
32
+ "jsdom": "^19.0.0",
33
+ "lint-staged": "^12.3.3",
34
+ "marko": "^5.19.0",
35
+ "mocha": "^9.2.0",
36
+ "mocha-snap": "^4.2.4",
32
37
  "nyc": "^15.1.0",
38
+ "playwright": "^1.18.1",
33
39
  "prettier": "^2.5.1",
34
- "semantic-release": "^18.0.1",
35
- "typescript": "^4.5.4",
36
- "vite": "^2.7.10"
40
+ "semantic-release": "^19.0.2",
41
+ "serve-handler": "^6.1.3",
42
+ "typescript": "^4.5.5",
43
+ "vite": "^2.7.13"
37
44
  },
38
45
  "exports": {
39
46
  ".": {