@marko/vite 2.1.0 → 2.1.1

package/dist/index.js

@@ -22,9 +22,6 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name in all)
@@ -53,7 +50,7 @@ var import_anymatch = __toModule(require("anymatch"));
 var import_server_entry_template = __toModule(require("./server-entry-template"));
 var import_manifest_generator = __toModule(require("./manifest-generator"));
 const import_meta = {};
-const virtualFiles = new Map();
+const virtualFiles = /* @__PURE__ */ new Map();
 const queryReg = /\?marko-.+$/;
 const browserEntryQuery = "?marko-browser-entry";
 const serverEntryQuery = "?marko-server-entry";
@@ -70,7 +67,7 @@ function markoPlugin(opts = {}) {
     runtimeId,
     sourceMaps: true,
     writeVersionComment: false,
-    cache: new Map(),
+    cache: /* @__PURE__ */ new Map(),
     babelConfig: __spreadProps(__spreadValues({}, opts.babelConfig), {
       caller: __spreadValues({
         name: "@marko/vite",
@@ -108,8 +105,8 @@ function markoPlugin(opts = {}) {
   let devServer;
   let registeredTag = false;
   let serverManifest;
-  const transformWatchFiles = new Map();
-  const transformOptionalFiles = new Map();
+  const transformWatchFiles = /* @__PURE__ */ new Map();
+  const transformOptionalFiles = /* @__PURE__ */ new Map();
   return [
     {
       name: "marko-vite:pre",
@@ -201,25 +198,33 @@ function markoPlugin(opts = {}) {
         }
       },
       async resolveId(importee, importer, _importOpts, ssr) {
+        var _a2;
         const importeeIsAbsolute = import_path.default.isAbsolute(importee);
-        if (!importeeIsAbsolute || importee.startsWith(root)) {
-          let importeeQuery = getMarkoQuery(importee);
-          if (importeeQuery) {
-            importee = importee.slice(0, -importeeQuery.length);
-          } else if (ssr && linked && importer && isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
-            importeeQuery = serverEntryQuery;
-          } else if (virtualFiles.has(importee)) {
-            return importee;
-          }
-          if (importeeQuery) {
-            const resolved = importeeIsAbsolute ? { id: importee } : importee[0] === "." ? {
-              id: importer ? import_path.default.resolve(importer, "..", importee) : import_path.default.resolve(root, importee)
-            } : await this.resolve(importee, importer, resolveOpts);
-            if (resolved) {
-              resolved.id += importeeQuery;
+        let importeeQuery = getMarkoQuery(importee);
+        if (importeeIsAbsolute && !importee.startsWith(root)) {
+          importee = (await this.resolve(importee, importer, resolveOpts)).id;
+        }
+        if (importeeQuery) {
+          importee = importee.slice(0, -importeeQuery.length);
+        } else if (virtualFiles.has(importee)) {
+          return importee;
+        } else if (isMarkoFile(importee)) {
+          if (ssr) {
+            if (linked && importer && !isMarkoFile(importer.replace(queryReg, ""))) {
+              importeeQuery = serverEntryQuery;
             }
-            return resolved;
+          } else if (!importer || ((_a2 = this.getModuleInfo(importer)) == null ? void 0 : _a2.isEntry)) {
+            importeeQuery = browserEntryQuery;
+          }
+        }
+        if (importeeQuery) {
+          const resolved = importeeIsAbsolute ? { id: importee } : importee[0] === "." ? {
+            id: importer ? import_path.default.resolve(importer, "..", importee) : import_path.default.resolve(root, importee)
+          } : await this.resolve(importee, importer, resolveOpts);
+          if (resolved) {
+            resolved.id += importeeQuery;
           }
+          return resolved;
         }
         return null;
       },
@@ -243,7 +248,7 @@ function markoPlugin(opts = {}) {
                 serverManifest.entries[entryId] = relativeFileName;
                 entryData = JSON.stringify(entryId);
               } else {
-                entryData = JSON.stringify(await (0, import_manifest_generator.generateDocManifest)(await devServer.transformIndexHtml("/", (0, import_manifest_generator.generateInputDoc)(fileNameToURL(fileName, root) + browserEntryQuery))));
+                entryData = JSON.stringify(await (0, import_manifest_generator.generateDocManifest)(await devServer.transformIndexHtml("/", (0, import_manifest_generator.generateInputDoc)(fileNameToURL(fileName, root)))));
               }
               return (0, import_server_entry_template.default)({
                 fileName,
@@ -356,7 +361,7 @@ function toHTMLEntries(root, serverEntries) {
     const markoFile = import_path.default.join(root, serverEntries[id]);
     const htmlFile = markoFile + htmlExt;
     virtualFiles.set(htmlFile, {
-      code: (0, import_manifest_generator.generateInputDoc)(markoFile + browserEntryQuery)
+      code: (0, import_manifest_generator.generateInputDoc)(markoFile)
     });
     result.push(htmlFile);
   }

package/dist/index.mjs

@@ -22,9 +22,6 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 var __reExport = (target, module, desc) => {
   if (module && typeof module === "object" || typeof module === "function") {
     for (let key of __getOwnPropNames(module))
@@ -47,7 +44,7 @@ import {
   generateInputDoc,
   generateDocManifest
 } from "./manifest-generator";
-const virtualFiles = new Map();
+const virtualFiles = /* @__PURE__ */ new Map();
 const queryReg = /\?marko-.+$/;
 const browserEntryQuery = "?marko-browser-entry";
 const serverEntryQuery = "?marko-server-entry";
@@ -64,7 +61,7 @@ function markoPlugin(opts = {}) {
     runtimeId,
     sourceMaps: true,
     writeVersionComment: false,
-    cache: new Map(),
+    cache: /* @__PURE__ */ new Map(),
     babelConfig: __spreadProps(__spreadValues({}, opts.babelConfig), {
       caller: __spreadValues({
         name: "@marko/vite",
@@ -102,8 +99,8 @@ function markoPlugin(opts = {}) {
   let devServer;
   let registeredTag = false;
   let serverManifest;
-  const transformWatchFiles = new Map();
-  const transformOptionalFiles = new Map();
+  const transformWatchFiles = /* @__PURE__ */ new Map();
+  const transformOptionalFiles = /* @__PURE__ */ new Map();
   return [
     {
       name: "marko-vite:pre",
@@ -195,25 +192,33 @@ function markoPlugin(opts = {}) {
         }
       },
       async resolveId(importee, importer, _importOpts, ssr) {
+        var _a2;
         const importeeIsAbsolute = path.isAbsolute(importee);
-        if (!importeeIsAbsolute || importee.startsWith(root)) {
-          let importeeQuery = getMarkoQuery(importee);
-          if (importeeQuery) {
-            importee = importee.slice(0, -importeeQuery.length);
-          } else if (ssr && linked && importer && isMarkoFile(importee) && !isMarkoFile(importer.replace(queryReg, ""))) {
-            importeeQuery = serverEntryQuery;
-          } else if (virtualFiles.has(importee)) {
-            return importee;
-          }
-          if (importeeQuery) {
-            const resolved = importeeIsAbsolute ? { id: importee } : importee[0] === "." ? {
-              id: importer ? path.resolve(importer, "..", importee) : path.resolve(root, importee)
-            } : await this.resolve(importee, importer, resolveOpts);
-            if (resolved) {
-              resolved.id += importeeQuery;
+        let importeeQuery = getMarkoQuery(importee);
+        if (importeeIsAbsolute && !importee.startsWith(root)) {
+          importee = (await this.resolve(importee, importer, resolveOpts)).id;
+        }
+        if (importeeQuery) {
+          importee = importee.slice(0, -importeeQuery.length);
+        } else if (virtualFiles.has(importee)) {
+          return importee;
+        } else if (isMarkoFile(importee)) {
+          if (ssr) {
+            if (linked && importer && !isMarkoFile(importer.replace(queryReg, ""))) {
+              importeeQuery = serverEntryQuery;
             }
-            return resolved;
+          } else if (!importer || ((_a2 = this.getModuleInfo(importer)) == null ? void 0 : _a2.isEntry)) {
+            importeeQuery = browserEntryQuery;
+          }
+        }
+        if (importeeQuery) {
+          const resolved = importeeIsAbsolute ? { id: importee } : importee[0] === "." ? {
+            id: importer ? path.resolve(importer, "..", importee) : path.resolve(root, importee)
+          } : await this.resolve(importee, importer, resolveOpts);
+          if (resolved) {
+            resolved.id += importeeQuery;
           }
+          return resolved;
         }
         return null;
       },
@@ -237,7 +242,7 @@ function markoPlugin(opts = {}) {
                 serverManifest.entries[entryId] = relativeFileName;
                 entryData = JSON.stringify(entryId);
               } else {
-                entryData = JSON.stringify(await generateDocManifest(await devServer.transformIndexHtml("/", generateInputDoc(fileNameToURL(fileName, root) + browserEntryQuery))));
+                entryData = JSON.stringify(await generateDocManifest(await devServer.transformIndexHtml("/", generateInputDoc(fileNameToURL(fileName, root)))));
               }
               return getServerEntryTemplate({
                 fileName,
@@ -350,7 +355,7 @@ function toHTMLEntries(root, serverEntries) {
     const markoFile = path.join(root, serverEntries[id]);
     const htmlFile = markoFile + htmlExt;
     virtualFiles.set(htmlFile, {
-      code: generateInputDoc(markoFile + browserEntryQuery)
+      code: generateInputDoc(markoFile)
     });
     result.push(htmlFile);
   }

package/dist/manifest-generator.js

@@ -5,9 +5,6 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name in all)

package/dist/render-assets-transform.js

@@ -1,8 +1,5 @@
 var __defProp = Object.defineProperty;
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name in all)

package/dist/serializer.js

@@ -5,9 +5,6 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name in all)
@@ -28,7 +25,7 @@ __export(exports, {
   default: () => serialize
 });
 var import_domelementtype = __toModule(require("domelementtype"));
-const voidElements = new Set([
+const voidElements = /* @__PURE__ */ new Set([
   "area",
   "base",
   "br",

package/dist/serializer.mjs

@@ -1,5 +1,5 @@
 import { ElementType } from "domelementtype";
-const voidElements = new Set([
+const voidElements = /* @__PURE__ */ new Set([
   "area",
   "base",
   "br",

package/dist/server-entry-template.js

@@ -5,9 +5,6 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __markAsModule = (target) => __defProp(target, "__esModule", { value: true });
-var __require = typeof require !== "undefined" ? require : (x) => {
-  throw new Error('Dynamic require of "' + x + '" is not supported');
-};
 var __export = (target, all) => {
   __markAsModule(target);
   for (var name in all)

package/package.json

@@ -1,41 +1,40 @@
 {
   "name": "@marko/vite",
   "description": "A Marko plugin for Vite",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
   "bugs": "https://github.com/marko-js/vite/issues",
   "dependencies": {
     "anymatch": "^3.1.2",
     "domelementtype": "^2.2.0",
-    "domhandler": "^4.2.2",
-    "htmlparser2": "^7.1.1"
+    "domhandler": "^4.3.0",
+    "htmlparser2": "^7.2.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^13.1.0",
-    "@commitlint/config-conventional": "^13.1.0",
-    "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@marko/compiler": "^5.15.10",
+    "@commitlint/cli": "^15.0.0",
+    "@commitlint/config-conventional": "^15.0.0",
+    "@istanbuljs/nyc-config-typescript": "^1.0.2",
+    "@marko/compiler": "^5.17.4",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^16.9.4",
-    "@typescript-eslint/eslint-plugin": "^4.31.1",
-    "@typescript-eslint/parser": "^4.31.1",
-    "codecov": "^3.8.3",
-    "esbuild": "^0.12.28",
-    "esbuild-register": "^3.0.0",
-    "eslint": "^7.32.0",
+    "@types/node": "^16.11.11",
+    "@typescript-eslint/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/parser": "^5.5.0",
+    "esbuild": "^0.14.2",
+    "esbuild-register": "^3.2.0",
+    "eslint": "^8.4.0",
     "eslint-config-prettier": "^8.3.0",
     "fast-glob": "^3.2.7",
     "fixpack": "^4.0.0",
-    "husky": "^7.0.2",
-    "lint-staged": "^11.1.2",
-    "marko": "^5.15.10",
-    "mocha": "^9.1.1",
-    "mocha-snap": "^4.0.2",
+    "husky": "^7.0.4",
+    "lint-staged": "^12.1.2",
+    "marko": "^5.17.5",
+    "mocha": "^9.1.3",
+    "mocha-snap": "^4.2.1",
     "nyc": "^15.1.0",
-    "prettier": "^2.4.1",
-    "semantic-release": "^18.0.0",
-    "typescript": "^4.4.3",
-    "vite": "^2.5.3"
+    "prettier": "^2.5.1",
+    "semantic-release": "^18.0.1",
+    "typescript": "^4.5.2",
+    "vite": "^2.6.14"
   },
   "files": [
     "dist",
@@ -54,8 +53,8 @@
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "peerDependencies": {
-    "@marko/compiler": "^5.15.10",
-    "vite": "^2.5.10"
+    "@marko/compiler": "^5",
+    "vite": "^2"
   },
   "repository": {
     "type": "git",
@@ -63,7 +62,6 @@
   },
   "scripts": {
     "build": "tsc -b && node -r esbuild-register build",
-    "ci:report": "codecov",
     "ci:test": "nyc npm run mocha -- --forbid-pending --forbid-only",
     "format": "npm run lint:eslint -- --fix && npm run lint:prettier -- --write && (fixpack || true)",
     "lint": "tsc -b && npm run lint:eslint && npm run lint:prettier -- -l && fixpack",