chore: minor cleanup

package.json

@@ -7,7 +7,7 @@
   "scripts": {
     "@ci:build": "npm run build",
     "@ci:lint": "eslint --format unix . && prettier . --check --with-node-modules --log-level=warn",
-    "@ci:release": "npm run build && node scripts/pkg-override && changeset publish && node scripts/pkg-override && npm ci",
+    "@ci:release": "npm run build && node scripts/pkg-toggle && changeset publish && node scripts/pkg-toggle && npm ci",
     "@ci:test": "cross-env NODE_OPTIONS=\"--max-old-space-size=4096\" MARKO_DEBUG=1 c8 npm test",
     "@ci:version": "npm run build && npm run format && changeset version && npm i --package-lock-only",
     "build": "npm run build --ws && tsc -b tsconfig.build.json",
@@ -20,11 +20,13 @@
     "prepare": "husky",
     "report": "open ./coverage/lcov-report/index.html",
     "test": "mocha",
-    "test:update": "UPDATE_EXPECTATIONS=1 mocha --update"
+    "test:update": "UPDATE_EXPECTATIONS=1 mocha --update",
+    "web": "cd website && npm exec marko-run"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.9",
     "@babel/core": "^7.26.0",
+    "@babel/plugin-transform-export-namespace-from": "^7.25.9",
     "@babel/plugin-transform-modules-commonjs": "^7.25.9",
     "@babel/plugin-transform-runtime": "^7.25.9",
     "@babel/preset-env": "^7.26.0",

packages/babel-utils/package.json

@@ -18,7 +18,7 @@
   },
   "license": "MIT",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
-  "main": "src/index.js",
+  "main": "./src/index.js",
   "types": "index.d.ts",
   "files": [
     "dist",
@@ -37,6 +37,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "main:override": "dist/index.js"
+  }
 }

packages/babel-utils/package.toggle.json

@@ -0,0 +1,3 @@
+{
+  "main": "./dist/index.js"
+}

packages/compiler/package.json

@@ -38,8 +38,8 @@
     "./package.json": "./package.json",
     "./*": "./*"
   },
-  "main": "src/index.js",
-  "types": "index.d.ts",
+  "main": "./src/index.js",
+  "types": "./index.d.ts",
   "files": [
     "dist",
     "config.js",
@@ -84,26 +84,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "exports:override": {
-    ".": {
-      "types": "./index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./config": {
-      "types": "./config.d.ts",
-      "default": "./dist/config.js"
-    },
-    "./register": {
-      "types": "./register.d.ts",
-      "default": "./dist/register.js"
-    },
-    "./modules": "./modules.js",
-    "./babel-types": "./babel-types.d.ts",
-    "./dist/types": "./dist/types.d.ts",
-    "./package": "./package.json",
-    "./package.json": "./package.json",
-    "./*": "./*"
-  },
-  "main:override": "dist/index.js"
+  }
 }

packages/compiler/package.toggle.json

@@ -0,0 +1,24 @@
+{
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./config": {
+      "types": "./config.d.ts",
+      "default": "./dist/config.js"
+    },
+    "./register": {
+      "types": "./register.d.ts",
+      "default": "./dist/register.js"
+    },
+    "./modules": "./modules.js",
+    "./babel-types": "./babel-types.d.ts",
+    "./dist/types": "./dist/types.d.ts",
+    "./package": "./package.json",
+    "./package.json": "./package.json",
+    "./*": "./*"
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts"
+}

packages/marko/package.json

@@ -31,14 +31,14 @@
     "Dylan Piercey <pierceydylan@gmail.com>",
     "Martin Aberer"
   ],
-  "main": "index.js",
+  "main": "./index.js",
   "browser": {
     "./compiler.js": "./compiler-browser.marko",
     "./components.js": "./components-browser.marko",
     "./legacy-components.js": "./legacy-components-browser.marko",
     "./index.js": "./index-browser.marko"
   },
-  "types": "index.d.ts",
+  "types": "./index.d.ts",
   "bin": {
     "markoc": "bin/markoc"
   },

packages/runtime-tags/package.json

@@ -27,18 +27,5 @@
   ],
   "scripts": {
     "build": "node -r ~ts ./scripts/bundle.ts"
-  },
-  "exports:override": {
-    "./package.json": "./package.json",
-    "./*": {
-      "types": "./dist/*.d.ts",
-      "import": "./dist/*.mjs",
-      "default": "./dist/*.js"
-    },
-    "./debug/*": {
-      "types": "./dist/*.d.ts",
-      "import": "./dist/debug/*.mjs",
-      "default": "./dist/debug/*.js"
-    }
   }
 }

packages/runtime-tags/package.toggle.json

@@ -0,0 +1,15 @@
+{
+  "exports": {
+    "./package.json": "./package.json",
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.mjs",
+      "default": "./dist/*.js"
+    },
+    "./debug/*": {
+      "types": "./dist/*.d.ts",
+      "import": "./dist/debug/*.mjs",
+      "default": "./dist/debug/*.js"
+    }
+  }
+}

packages/runtime-tags/src/dom/resume.ts

@@ -24,11 +24,11 @@ class Render implements RenderData {
   declare i: RenderData["i"];
   declare v: RenderData["v"];
   declare r?: RenderData["r"];
-  private declare ___currentScopeId: number | undefined;
-  private declare ___data: RenderData;
-  private declare ___renders: Renders;
-  private declare ___runtimeId: string;
-  private declare ___renderId: string;
+  declare private ___currentScopeId: number | undefined;
+  declare private ___data: RenderData;
+  declare private ___renders: Renders;
+  declare private ___runtimeId: string;
+  declare private ___renderId: string;
   private ___scopeStack: number[] = [];
   private ___scopeLookup: Record<number | string, Scope> = {};
   private ___serializeContext: Record<string, unknown> = {

packages/translator-default/package.json

@@ -18,8 +18,8 @@
   },
   "license": "MIT",
   "author": "Dylan Piercey <dpiercey@ebay.com>",
-  "main": "src/index.js",
-  "types": "index.d.ts",
+  "main": "./src/index.js",
+  "types": "./index.d.ts",
   "files": [
     "dist",
     "index.d.ts"
@@ -30,7 +30,7 @@
   "dependencies": {
     "@babel/runtime": "^7.26.0",
     "@marko/babel-utils": "^6.6.0",
-    "magic-string": "^0.30.12",
+    "magic-string": "^0.30.14",
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
@@ -43,6 +43,5 @@
   },
   "publishConfig": {
     "access": "public"
-  },
-  "main:override": "dist/index.js"
+  }
 }

packages/translator-default/package.toggle.json

@@ -0,0 +1,3 @@
+{
+  "main": "./dist/index.js"
+}

packages/translator-interop/package.json

@@ -18,7 +18,7 @@
     "url": "https://github.com/marko-js/marko/tree/main/packages/translator-interop"
   },
   "license": "MIT",
-  "main": "src/index.ts",
+  "main": "./src/index.ts",
   "files": [
     "dist",
     "!**/__tests__",
@@ -33,8 +33,10 @@
     "@marko/translator-default": "^6.1.0",
     "@marko/translator-tags": "^0.4.0"
   },
+  "devDependencies": {
+    "@marko/compiler": "^5.38.2"
+  },
   "peerDependencies": {
     "@marko/compiler": "^5.23.0"
-  },
-  "main:override": "dist/index.js"
+  }
 }

packages/translator-interop/package.toggle.json

@@ -0,0 +1,3 @@
+{
+  "main": "./dist/index.js"
+}

packages/translator-tags/package.json

@@ -18,7 +18,7 @@
     "url": "https://github.com/marko-js/marko/tree/main/packages/translator-tags"
   },
   "license": "MIT",
-  "main": "src/index.ts",
+  "main": "./src/index.ts",
   "files": [
     "dist",
     "tag-types",
@@ -31,10 +31,13 @@
   },
   "dependencies": {
     "@marko/babel-utils": "^6.6.1",
-    "@marko/runtime-tags": "^0.2.2"
+    "@marko/runtime-tags": "^0.2.2",
+    "magic-string": "^0.30.14"
+  },
+  "devDependencies": {
+    "@marko/compiler": "^5.38.2"
   },
   "peerDependencies": {
     "@marko/compiler": "^5.23.0"
-  },
-  "main:override": "dist/index.js"
+  }
 }

packages/translator-tags/package.toggle.json

@@ -0,0 +1,3 @@
+{
+  "main": "./dist/index.js"
+}

scripts/pkg-override.js

@@ -1,30 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-for (const name of fs.readdirSync("packages")) {
-  const file = path.join("packages", name, "package.json");
-  const details = JSON.parse(fs.readFileSync(file, "utf8"));
-
-  if (
-    [
-      override(details, "main"),
-      override(details, "module"),
-      override(details, "browser"),
-      override(details, "exports"),
-    ].some(Boolean)
-  ) {
-    fs.writeFileSync(file, `${JSON.stringify(details, null, 2)}\n`);
-  }
-}
-
-function override(details, field) {
-  const overrideField = `${field}:override`;
-  const currentValue = details[field];
-  const overrideValue = details[overrideField];
-  if (overrideValue) {
-    details[field] = overrideValue;
-    details[overrideField] = currentValue;
-    return true;
-  }
-
-  return false;
-}

scripts/pkg-toggle.js

@@ -0,0 +1,24 @@
+const fs = require("fs");
+const path = require("path");
+for (const name of fs.readdirSync("packages")) {
+  const toggleFile = path.join("packages", name, "package.toggle.json");
+  if (!fs.existsSync(toggleFile)) continue;
+
+  const toggleData = readJSON(toggleFile);
+  const targetFile = path.join("packages", name, "package.json");
+  const targetData = readJSON(targetFile);
+  for (const key in toggleData) {
+    [targetData[key], toggleData[key]] = [toggleData[key], targetData[key]];
+  }
+
+  writeJSON(targetFile, targetData);
+  writeJSON(toggleFile, toggleData);
+}
+
+function readJSON(filename) {
+  return JSON.parse(fs.readFileSync(filename, "utf8"));
+}
+
+function writeJSON(filename, data) {
+  fs.writeFileSync(filename, `${JSON.stringify(data, null, 2)}\n`);
+}

website/install.sh

@@ -1,10 +1,10 @@
-mkdir -p node_modules/.dev &&
+rm -rf node_modules/.dev && mkdir -p node_modules/.dev &&
 (
   cd .. &&
     npm run build &&
-    node scripts/pkg-override &&
+    node scripts/pkg-toggle &&
     npm -ws pack --pack-destination website/node_modules/.dev &&
-    node scripts/pkg-override
+    node scripts/pkg-toggle
 ) &&
 find node_modules/.dev -type f -name "*-[0-9]*.[0-9]*.[0-9]*.tgz" -exec sh -c 'mv "$0" "${0/-[0-9]*.[0-9]*.[0-9]*/}.tgz"' {} \; &&
 npm i

website/package-lock.json

@@ -9,6 +9,7 @@
         "@marko/babel-utils": "./node_modules/.dev/marko-babel-utils.tgz",
         "@marko/compiler": "./node_modules/.dev/marko-compiler.tgz",
         "@marko/run": "^0.5.4",
+        "@marko/runtime-tags": "./node_modules/.dev/marko-runtime-tags.tgz",
         "@marko/translator-tags": "./node_modules/.dev/marko-translator-tags.tgz"
       }
     },
@@ -931,7 +932,7 @@
     "node_modules/@marko/babel-utils": {
       "version": "6.6.1",
       "resolved": "file:node_modules/.dev/marko-babel-utils.tgz",
-      "integrity": "sha512-zZ9pVbzTRSr+LUDTecaFUgxt/oMAm6Zto9G2QNIUft/JhrWsShuOltIC9zs1K5kP1icq7RWwzzvo0/Y1hIBbJg==",
+      "integrity": "sha512-p4EPqgPOInmdA0ya7IaGr8QbYlWy+ePWD3WfFHQx5KO2uip9qIe8WfDHp13wP8ObgjwnOPhVTT14cHiXcBgC8w==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.26.0",
@@ -942,7 +943,7 @@
     "node_modules/@marko/compiler": {
       "version": "5.38.2",
       "resolved": "file:node_modules/.dev/marko-compiler.tgz",
-      "integrity": "sha512-sg4xohEfMko4vXdC4FMUK5aGhDdNKEUDHVK8/UFELFAFao7jp26uhs1iU3VwerZubOLyeyqIWvSNzscGcnjUxw==",
+      "integrity": "sha512-XzsIUNQTUjXK8YxfA6uIqMN7e3dBuWZsO9MRNDNrll3UCBgQvWkpyY7dpoxk/AebVMrAuAzGQYPp4H7U77IJyQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.26.2",
@@ -1012,8 +1013,8 @@
     },
     "node_modules/@marko/runtime-tags": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/@marko/runtime-tags/-/runtime-tags-0.2.2.tgz",
-      "integrity": "sha512-6fucBKqgiMJExrPgGaFUvhQM8Xm9LfIQYo5psTP1/9EcQOiRH8JReiEgy8AFC98QGaLUk41ZuLbftcmjxkMphw==",
+      "resolved": "file:node_modules/.dev/marko-runtime-tags.tgz",
+      "integrity": "sha512-d/XtZiRxUiVjmPUepK7ESWqRyPU9GFz554y9FRDlGv2Vu6ayzUa6CJCA4Xu6TBw8hJmOxkDuVQF331Dm2KlxaQ==",
       "license": "MIT"
     },
     "node_modules/@marko/translator-default": {
@@ -1035,11 +1036,12 @@
     "node_modules/@marko/translator-tags": {
       "version": "0.4.3",
       "resolved": "file:node_modules/.dev/marko-translator-tags.tgz",
-      "integrity": "sha512-xzTVtWIgeuHIt5tySKanjgU4kW/c2vJD7l/hhuRfmNLT4sOih91jIVCMQRox2HZE+qfaZksm4ELQQAr3B4WNOA==",
+      "integrity": "sha512-wj3vH1QA1TiQQwCwJYc5/Iiel/xTWK3YYDaRyzDce4IRE/TIFSYhopPEQ/hEZZ9eV6qUOyIFGxNWBKQXQeEpHQ==",
       "license": "MIT",
       "dependencies": {
         "@marko/babel-utils": "^6.6.1",
-        "@marko/runtime-tags": "^0.2.2"
+        "@marko/runtime-tags": "^0.2.2",
+        "magic-string": "^0.30.14"
       },
       "peerDependencies": {
         "@marko/compiler": "^5.23.0"
@@ -1792,9 +1794,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.66",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.66.tgz",
-      "integrity": "sha512-pI2QF6+i+zjPbqRzJwkMvtvkdI7MjVbSh2g8dlMguDJIXEPw+kwasS1Jl+YGPEBfGVxsVgGUratAKymPdPo2vQ==",
+      "version": "1.5.67",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.67.tgz",
+      "integrity": "sha512-nz88NNBsD7kQSAGGJyp8hS6xSPtWwqNogA0mjtc2nUYeEf3nURK9qpV18TuBdDmEDgVWotS8Wkzf+V52dSQ/LQ==",
       "license": "ISC"
     },
     "node_modules/emoji-regex": {

website/package.json

@@ -5,6 +5,7 @@
     "@marko/babel-utils": "./node_modules/.dev/marko-babel-utils.tgz",
     "@marko/compiler": "./node_modules/.dev/marko-compiler.tgz",
     "@marko/run": "^0.5.4",
+    "@marko/runtime-tags": "./node_modules/.dev/marko-runtime-tags.tgz",
     "@marko/translator-tags": "./node_modules/.dev/marko-translator-tags.tgz"
   }
 }