From 2be37f72d3030621e2f85b6615731a5af24e0211 Mon Sep 17 00:00:00 2001 From: dpiercey Date: Fri, 13 Dec 2024 09:11:43 -0700 Subject: [PATCH] chore: update references to translators --- .changeset/tall-llamas-sin.md | 8 ++ .sizes.json | 4 +- package-lock.json | 98 ++++--------------- packages/compiler/index.d.ts | 2 +- packages/compiler/package.json | 13 ++- packages/compiler/src/babel-plugin/index.js | 2 +- packages/compiler/src/babel-plugin/parser.js | 2 +- .../src/babel-plugin/plugins/migrate.js | 2 +- .../src/babel-plugin/plugins/transform.js | 2 +- packages/compiler/src/babel-utils/tags.js | 2 +- packages/compiler/src/config.js | 8 +- packages/compiler/src/index.js | 2 +- .../compiler/src/util/try-load-translator.js | 25 +---- packages/runtime-class/package.json | 7 +- packages/runtime-class/src/taglib/index.js | 4 +- .../runtime-class/src/translator/index.js | 4 +- .../src/translator/placeholder/index[html].js | 4 +- .../src/translator/placeholder/index[vdom].js | 2 +- .../src/translator/tag/attribute-tag.js | 4 +- .../tag/attribute/directives/class.js | 6 +- .../attribute/directives/no-update-body-if.js | 2 +- .../tag/attribute/directives/no-update-if.js | 2 +- .../tag/attribute/directives/no-update.js | 5 +- .../tag/attribute/directives/style.js | 6 +- .../src/translator/tag/attribute/index.js | 6 +- .../src/translator/tag/custom-tag.js | 4 +- .../src/translator/tag/dynamic-tag.js | 2 +- .../runtime-class/src/translator/tag/index.js | 4 +- .../src/translator/tag/macro-tag.js | 2 +- .../src/translator/tag/native-tag.js | 2 +- .../tag/native-tag[html]/attributes.js | 4 +- .../translator/tag/native-tag[html]/index.js | 4 +- .../tag/native-tag[vdom]/attributes.js | 2 +- .../translator/tag/native-tag[vdom]/index.js | 5 +- .../runtime-class/src/translator/tag/util.js | 6 +- .../core/conditional/translate-else-if.js | 2 +- .../taglib/core/conditional/translate-else.js | 2 +- .../taglib/core/conditional/translate-if.js | 2 +- .../src/translator/taglib/core/macro/parse.js | 2 +- .../translator/taglib/core/macro/translate.js | 5 +- .../src/translator/taglib/core/parse-class.js | 4 +- .../translator/taglib/core/parse-export.js | 2 +- .../translator/taglib/core/parse-import.js | 2 +- .../translator/taglib/core/parse-static.js | 2 +- .../translator/taglib/core/transform-style.js | 2 +- .../translator/taglib/core/translate-for.js | 5 +- .../taglib/core/translate-html-comment.js | 4 +- .../taglib/core/translate-include-content.js | 5 +- .../translator/taglib/core/translate-while.js | 4 +- .../taglib/migrate/all-templates.js | 2 +- .../src/translator/util/add-dependencies.js | 4 +- .../src/translator/util/html-out-write.js | 2 +- .../src/translator/util/key-manager.js | 4 +- .../translator/util/optimize-html-writes.js | 2 +- .../translator/util/optimize-vdom-create.js | 4 +- .../test/__util__/patch-module.js | 5 +- .../components/hello/transformer.js | 2 +- .../test/translator/index.test.js | 2 +- .../runtime-class/translator/package.json | 47 +-------- packages/runtime-tags/package.json | 4 + packages/runtime-tags/scripts/bundle.ts | 24 ++++- .../components/hello/transformer.ts | 2 +- .../runtime-tags/src/__tests__/main.test.ts | 4 +- .../runtime-tags/src/translator/core/attrs.ts | 4 +- .../src/translator/core/client.ts | 2 +- .../runtime-tags/src/translator/core/const.ts | 8 +- .../runtime-tags/src/translator/core/debug.ts | 6 +- .../src/translator/core/define.ts | 4 +- .../src/translator/core/effect.ts | 6 +- .../src/translator/core/export.ts | 2 +- .../runtime-tags/src/translator/core/for.ts | 4 +- .../src/translator/core/html-comment.ts | 4 +- .../src/translator/core/html-script.ts | 6 +- .../src/translator/core/html-style.ts | 6 +- .../runtime-tags/src/translator/core/id.ts | 6 +- .../runtime-tags/src/translator/core/if.ts | 4 +- .../src/translator/core/import.ts | 2 +- .../runtime-tags/src/translator/core/let.ts | 6 +- .../src/translator/core/lifecycle.ts | 6 +- .../runtime-tags/src/translator/core/log.ts | 6 +- .../src/translator/core/return.ts | 4 +- .../src/translator/core/script.ts | 6 +- .../src/translator/core/server.ts | 2 +- .../src/translator/core/static.ts | 2 +- .../runtime-tags/src/translator/core/style.ts | 4 +- .../src/translator/util/entry-builder.ts | 2 +- .../src/translator/util/evaluate.ts | 2 +- .../src/translator/util/is-core-tag.ts | 2 +- .../translator/util/nested-attribute-tags.ts | 2 +- .../src/translator/util/plugin-hooks.ts | 4 +- .../src/translator/util/runtime.ts | 2 +- .../src/translator/util/sections.ts | 4 +- .../src/translator/util/signals.ts | 2 +- .../src/translator/util/tag-name-type.ts | 6 +- .../src/translator/util/translate-attrs.ts | 2 +- .../src/translator/visitors/function.ts | 2 +- .../translator/visitors/import-declaration.ts | 2 +- .../src/translator/visitors/program/index.ts | 5 +- .../translator/visitors/tag/attribute-tag.ts | 6 +- .../src/translator/visitors/tag/custom-tag.ts | 4 +- .../translator/visitors/tag/dynamic-tag.ts | 4 +- .../src/translator/visitors/tag/index.ts | 6 +- .../src/translator/visitors/tag/native-tag.ts | 4 +- packages/translator-interop/package.json | 5 +- .../src/__tests__/main.test.ts | 12 +-- .../src/feature-detection.ts | 6 +- packages/translator-interop/src/index.ts | 23 +++-- scripts/inspect-compiled-output.ts | 4 +- scripts/pkg-override.js | 23 +++-- scripts/sizes.ts | 2 +- tsconfig.build.json | 3 - 111 files changed, 320 insertions(+), 327 deletions(-) create mode 100644 .changeset/tall-llamas-sin.md diff --git a/.changeset/tall-llamas-sin.md b/.changeset/tall-llamas-sin.md new file mode 100644 index 000000000..5dd8b14f8 --- /dev/null +++ b/.changeset/tall-llamas-sin.md @@ -0,0 +1,8 @@ +--- +"@marko/translator-interop-class-tags": minor +"@marko/runtime-tags": minor +"@marko/compiler": minor +"marko": minor +--- + +Merge translator packages into their respective runtime packages. diff --git a/.sizes.json b/.sizes.json index 88644ec6d..57bbf744d 100644 --- a/.sizes.json +++ b/.sizes.json @@ -1,7 +1,7 @@ { "examples": { - "counter": "./packages/translator-tags/src/__tests__/fixtures/basic-counter/template.marko", - "comments": "./packages/translator-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/template.marko" + "counter": "./packages/runtime-tags/src/__tests__/fixtures/basic-counter/template.marko", + "comments": "./packages/runtime-tags/src/__tests__/fixtures/basic-inert-collapsible-tree/template.marko" }, "results": [ { diff --git a/package-lock.json b/package-lock.json index 8915a5342..dd925f6c8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2975,10 +2975,6 @@ "node": ">=6 <7 || >=8" } }, - "node_modules/@marko/babel-utils": { - "resolved": "packages/babel-utils", - "link": true - }, "node_modules/@marko/compiler": { "resolved": "packages/compiler", "link": true @@ -2987,18 +2983,10 @@ "resolved": "packages/runtime-tags", "link": true }, - "node_modules/@marko/translator-default": { - "resolved": "packages/translator-default", - "link": true - }, "node_modules/@marko/translator-interop-class-tags": { "resolved": "packages/translator-interop", "link": true }, - "node_modules/@marko/translator-tags": { - "resolved": "packages/translator-tags", - "link": true - }, "node_modules/@nicolo-ribaudo/chokidar-2": { "version": "2.1.8-no-fsevents.3", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz", @@ -4057,9 +4045,9 @@ "license": "ISC" }, "node_modules/browserslist": { - "version": "4.24.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz", - "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==", + "version": "4.24.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", + "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", "funding": [ { "type": "opencollective", @@ -4076,9 +4064,9 @@ ], "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001669", - "electron-to-chromium": "^1.5.41", - "node-releases": "^2.0.18", + "caniuse-lite": "^1.0.30001688", + "electron-to-chromium": "^1.5.73", + "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.1" }, "bin": { @@ -6648,9 +6636,9 @@ } }, "node_modules/it-fails": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/it-fails/-/it-fails-1.0.8.tgz", - "integrity": "sha512-ESGoV6kOX6QfDHouMOw15/KYhprCTR//ks8+BbdqnKPlpniRLIM+jmA9SFq2pUrShyZvhhTbAvTCeWddmIpCEA==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/it-fails/-/it-fails-1.0.9.tgz", + "integrity": "sha512-tG508k+ciV1W1hRq79X+h08SGTPiASkgsLjPLIqgsB3fqR+i55o54yS3LZ49D3wemgQrASCnXnvQ0tlv5YqKSA==", "dev": true, "license": "MIT", "dependencies": { @@ -6658,7 +6646,7 @@ "ms": "^2.1.2" }, "peerDependencies": { - "mocha": "4 - 10" + "mocha": "4 - 11" } }, "node_modules/jackspeak": { @@ -7162,7 +7150,7 @@ } }, "node_modules/marko": { - "resolved": "packages/marko", + "resolved": "packages/runtime-class", "link": true }, "node_modules/math-intrinsics": { @@ -10333,20 +10321,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/babel-utils": { - "name": "@marko/babel-utils", - "version": "6.6.3", - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.26.3", - "@babel/runtime": "^7.26.0", - "jsesc": "^3.1.0", - "relative-import-path": "^1.0.0" - }, - "devDependencies": { - "@marko/compiler": "^5.38.5" - } - }, "packages/compiler": { "name": "@marko/compiler", "version": "5.38.5", @@ -10363,7 +10337,6 @@ "@babel/traverse": "^7.26.4", "@babel/types": "^7.26.3", "@luxass/strip-json-comments": "^1.3.2", - "@marko/babel-utils": "^6.6.3", "complain": "^1.6.1", "he": "^1.2.0", "htmljs-parser": "^5.5.3", @@ -10372,20 +10345,22 @@ "lasso-package-root": "^1.0.1", "raptor-regexp": "^1.0.1", "raptor-util": "^3.2.0", + "relative-import-path": "^1.0.0", "resolve-from": "^5.0.0", "self-closing-tags": "^1.0.1", "source-map-support": "^0.5.21" }, "devDependencies": { - "@marko/translator-default": "^6.1.3" + "marko": "^5.36.5" } }, - "packages/marko": { + "packages/runtime-class": { + "name": "marko", "version": "5.36.5", "license": "MIT", "dependencies": { + "@babel/runtime": "^7.26.0", "@marko/compiler": "^5.38.5", - "@marko/translator-default": "^6.1.3", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", @@ -10393,6 +10368,7 @@ "csstype": "^3.1.3", "events-light": "^1.0.5", "listener-tracker": "^2.0.0", + "magic-string": "^0.30.15", "minimatch": "^9.0.5", "raptor-util": "^3.2.0", "resolve-from": "^5.0.0", @@ -10403,14 +10379,14 @@ "markoc": "bin/markoc" } }, - "packages/marko/node_modules/brace-expansion": { + "packages/runtime-class/node_modules/brace-expansion": { "version": "2.0.1", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, - "packages/marko/node_modules/minimatch": { + "packages/runtime-class/node_modules/minimatch": { "version": "9.0.5", "license": "ISC", "dependencies": { @@ -10428,46 +10404,14 @@ "version": "0.2.5", "license": "MIT" }, - "packages/translator-default": { - "name": "@marko/translator-default", - "version": "6.1.3", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.26.0", - "@marko/babel-utils": "^6.6.3", - "magic-string": "^0.30.15", - "self-closing-tags": "^1.0.1" - }, - "devDependencies": { - "@marko/compiler": "^5.38.5", - "marko": "^5.36.5" - }, - "peerDependencies": { - "@marko/compiler": "^5.16.1", - "marko": "^5.17.2" - } - }, "packages/translator-interop": { "name": "@marko/translator-interop-class-tags", "version": "0.1.36", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "@marko/babel-utils": "^6.6.3", - "@marko/translator-default": "^6.1.3", - "@marko/translator-tags": "^0.4.8" - }, - "peerDependencies": { - "@marko/compiler": "^5.23.0" - } - }, - "packages/translator-tags": { - "name": "@marko/translator-tags", - "version": "0.4.8", - "license": "MIT", - "dependencies": { - "@marko/babel-utils": "^6.6.3", - "@marko/runtime-tags": "^0.2.5" + "@marko/runtime-tags": "^0.2.5", + "marko": "^5.36.5" }, "peerDependencies": { "@marko/compiler": "^5.23.0" diff --git a/packages/compiler/index.d.ts b/packages/compiler/index.d.ts index ea42b8fce..714ff5a26 100644 --- a/packages/compiler/index.d.ts +++ b/packages/compiler/index.d.ts @@ -1,4 +1,4 @@ -import { Diagnostic, TaglibLookup } from "@marko/babel-utils"; +import { Diagnostic, TaglibLookup } from "@marko/compiler/babel-utils"; import { SourceMap } from "magic-string"; import * as types from "./babel-types"; diff --git a/packages/compiler/package.json b/packages/compiler/package.json index d385efda3..ca3efbf8c 100644 --- a/packages/compiler/package.json +++ b/packages/compiler/package.json @@ -23,6 +23,10 @@ "types": "./index.d.ts", "default": "./src/index.js" }, + "./babel-utils": { + "types": "./babel-utils.d.ts", + "default": "./src/babel-utils/index.js" + }, "./config": { "types": "./config.d.ts", "default": "./src/config.js" @@ -47,6 +51,7 @@ "modules.js", "index.d.ts", "babel-types.d.ts", + "babel-utils.d.ts", "register.js", "register.d.ts" ], @@ -66,7 +71,6 @@ "@babel/traverse": "^7.26.4", "@babel/types": "^7.26.3", "@luxass/strip-json-comments": "^1.3.2", - "@marko/babel-utils": "^6.6.3", "complain": "^1.6.1", "he": "^1.2.0", "htmljs-parser": "^5.5.3", @@ -75,12 +79,13 @@ "lasso-package-root": "^1.0.1", "raptor-regexp": "^1.0.1", "raptor-util": "^3.2.0", + "relative-import-path": "^1.0.0", "resolve-from": "^5.0.0", "self-closing-tags": "^1.0.1", "source-map-support": "^0.5.21" }, "devDependencies": { - "@marko/translator-default": "^6.1.3" + "marko": "^5.36.5" }, "publishConfig": { "access": "public" @@ -90,6 +95,10 @@ "types": "./index.d.ts", "default": "./dist/index.js" }, + "./babel-utils": { + "types": "./babel-utils.d.ts", + "default": "./dist/babel-utils/index.js" + }, "./config": { "types": "./config.d.ts", "default": "./dist/config.js" diff --git a/packages/compiler/src/babel-plugin/index.js b/packages/compiler/src/babel-plugin/index.js index 309e2c9cd..946ff76d0 100644 --- a/packages/compiler/src/babel-plugin/index.js +++ b/packages/compiler/src/babel-plugin/index.js @@ -1,5 +1,5 @@ import traverse from "@babel/traverse"; -import { diagnosticError, getTemplateId } from "@marko/babel-utils"; +import { diagnosticError, getTemplateId } from "@marko/compiler/babel-utils"; import { createHash } from "crypto"; import path from "path"; diff --git a/packages/compiler/src/babel-plugin/parser.js b/packages/compiler/src/babel-plugin/parser.js index 213f7227c..10c93e71b 100644 --- a/packages/compiler/src/babel-plugin/parser.js +++ b/packages/compiler/src/babel-plugin/parser.js @@ -8,7 +8,7 @@ import { parseTypeArgs, parseTypeParams, parseVar, -} from "@marko/babel-utils"; +} from "@marko/compiler/babel-utils"; import { createParser, TagType } from "htmljs-parser"; import * as t from "../babel-types"; diff --git a/packages/compiler/src/babel-plugin/plugins/migrate.js b/packages/compiler/src/babel-plugin/plugins/migrate.js index fc01f0d80..a8e31626d 100644 --- a/packages/compiler/src/babel-plugin/plugins/migrate.js +++ b/packages/compiler/src/babel-plugin/plugins/migrate.js @@ -1,4 +1,4 @@ -import { getTagDef, getTagDefForTagName } from "@marko/babel-utils"; +import { getTagDef, getTagDefForTagName } from "@marko/compiler/babel-utils"; import * as t from "../../babel-types"; import { enter, exit } from "../util/plugin-hooks"; diff --git a/packages/compiler/src/babel-plugin/plugins/transform.js b/packages/compiler/src/babel-plugin/plugins/transform.js index 5317a44d7..6aa114626 100644 --- a/packages/compiler/src/babel-plugin/plugins/transform.js +++ b/packages/compiler/src/babel-plugin/plugins/transform.js @@ -1,4 +1,4 @@ -import { getTagDef, getTagDefForTagName } from "@marko/babel-utils"; +import { getTagDef, getTagDefForTagName } from "@marko/compiler/babel-utils"; import * as t from "../../babel-types"; import { enter, exit } from "../util/plugin-hooks"; diff --git a/packages/compiler/src/babel-utils/tags.js b/packages/compiler/src/babel-utils/tags.js index e8edf8ada..51d0085c8 100644 --- a/packages/compiler/src/babel-utils/tags.js +++ b/packages/compiler/src/babel-utils/tags.js @@ -112,7 +112,7 @@ export function getMacroIdentifierForName(path, name) { if (!id) { throw new Error( - " was added programmatically, but was not registered via the 'registerMacro' api in @marko/babel-utils.", + " was added programmatically, but was not registered via the 'registerMacro' api in @marko/compiler/babel-utils.", ); } diff --git a/packages/compiler/src/config.js b/packages/compiler/src/config.js index af5f5a1ee..c2d3eb60b 100644 --- a/packages/compiler/src/config.js +++ b/packages/compiler/src/config.js @@ -52,7 +52,7 @@ const config = { * Allows configuring Marko to compile to different runtimes. */ translator: (() => { - const translatorReg = /^(@marko\/|marko-)translator-/; + const translatorReg = /^(?:@marko\/|marko-)(?:translator|runtime)-/; let translator; let pkg; @@ -93,7 +93,11 @@ const config = { } } - return translator || "@marko/translator-default"; + if (translator && translator.endsWith("runtime")) { + translator += "/translator"; + } + + return translator || "marko/translator"; })(), /** diff --git a/packages/compiler/src/index.js b/packages/compiler/src/index.js index 400565625..ad79246e4 100644 --- a/packages/compiler/src/index.js +++ b/packages/compiler/src/index.js @@ -3,7 +3,7 @@ import * as babel from "@babel/core"; import tsSyntaxPlugin from "@babel/plugin-syntax-typescript"; import cjsPlugin from "@babel/plugin-transform-modules-commonjs"; import tsTransformPlugin from "@babel/plugin-transform-typescript"; -import { DiagnosticType } from "@marko/babel-utils"; +import { DiagnosticType } from "@marko/compiler/babel-utils"; import path from "path"; import corePlugin from "./babel-plugin"; diff --git a/packages/compiler/src/util/try-load-translator.js b/packages/compiler/src/util/try-load-translator.js index 16f0bce72..0b5a310fc 100644 --- a/packages/compiler/src/util/try-load-translator.js +++ b/packages/compiler/src/util/try-load-translator.js @@ -4,28 +4,9 @@ const cache = {}; export default function (requested = config.translator) { if (typeof requested === "string") { - const cached = cache[requested]; - if (cached) { - return cached; - } - - let translator; - - try { - translator = markoModules.require(requested); - } catch (err) { - try { - translator = markoModules.require(`@marko/translator-${requested}`); - } catch { - try { - translator = markoModules.require(`marko-translator-${requested}`); - } catch { - throw err; - } - } - } - - return (cache[requested] = translator); + return ( + cache[requested] || (cache[requested] = markoModules.require(requested)) + ); } return requested; diff --git a/packages/runtime-class/package.json b/packages/runtime-class/package.json index ae06432ca..34b117004 100644 --- a/packages/runtime-class/package.json +++ b/packages/runtime-class/package.json @@ -60,14 +60,16 @@ "index-browser.marko", "index.js", "node-require.js", - "tags-html.d.ts" + "tags-html.d.ts", + "translator/package.json", + "translator/index.d.ts" ], "scripts": { "build": "babel ./src --out-dir ./dist --extensions .js --copy-files --config-file ../../babel.config.js --env-name=production" }, "dependencies": { + "@babel/runtime": "^7.26.0", "@marko/compiler": "^5.38.5", - "@marko/translator-default": "^6.1.3", "app-module-path": "^2.2.0", "argly": "^1.2.0", "browser-refresh-client": "1.1.4", @@ -75,6 +77,7 @@ "csstype": "^3.1.3", "events-light": "^1.0.5", "listener-tracker": "^2.0.0", + "magic-string": "^0.30.15", "minimatch": "^9.0.5", "raptor-util": "^3.2.0", "resolve-from": "^5.0.0", diff --git a/packages/runtime-class/src/taglib/index.js b/packages/runtime-class/src/taglib/index.js index 4503212b7..fcbc4a799 100644 --- a/packages/runtime-class/src/taglib/index.js +++ b/packages/runtime-class/src/taglib/index.js @@ -30,11 +30,11 @@ exports.finder = compiler.taglib._finder; exports.lookup = { buildLookup: function (dir, translator) { if (!translator || !Array.isArray(translator.taglibs)) { - translator = require("@marko/translator-default"); + translator = require("../translator"); // eslint-disable-next-line no-constant-condition if ("MARKO_DEBUG") { complain( - "buildTaglibLookup now requires passing in a transltor as the second argument, eg `buildTaglibLookup(dir, require('@marko/translator-default'))`.", + "buildTaglibLookup now requires passing in a transltor as the second argument, eg `buildTaglibLookup(dir, require('marko/translator'))`.", ); } } diff --git a/packages/runtime-class/src/translator/index.js b/packages/runtime-class/src/translator/index.js index 953fa1905..83377c243 100644 --- a/packages/runtime-class/src/translator/index.js +++ b/packages/runtime-class/src/translator/index.js @@ -1,3 +1,4 @@ +import { types as t } from "@marko/compiler"; import { findParentTag, getTagDef, @@ -12,8 +13,7 @@ import { parseStatements, resolveRelativePath, resolveTagImport, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { version } from "marko/package.json"; import { resolve } from "path"; diff --git a/packages/runtime-class/src/translator/placeholder/index[html].js b/packages/runtime-class/src/translator/placeholder/index[html].js index 766c91b6d..41059d838 100644 --- a/packages/runtime-class/src/translator/placeholder/index[html].js +++ b/packages/runtime-class/src/translator/placeholder/index[html].js @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import { computeNode, getTagDef, importDefault, importNamed, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import toString from "marko/src/runtime/helpers/to-string"; import escapeScript from "marko/src/runtime/html/helpers/escape-script-placeholder"; import escapeStyle from "marko/src/runtime/html/helpers/escape-style-placeholder"; diff --git a/packages/runtime-class/src/translator/placeholder/index[vdom].js b/packages/runtime-class/src/translator/placeholder/index[vdom].js index c1dd305b0..1202ae058 100644 --- a/packages/runtime-class/src/translator/placeholder/index[vdom].js +++ b/packages/runtime-class/src/translator/placeholder/index[vdom].js @@ -1,4 +1,4 @@ -import { computeNode } from "@marko/babel-utils"; +import { computeNode } from "@marko/compiler/babel-utils"; import write from "../util/vdom-out-write"; import withPreviousLocation from "../util/with-previous-location"; diff --git a/packages/runtime-class/src/translator/tag/attribute-tag.js b/packages/runtime-class/src/translator/tag/attribute-tag.js index 7a999058b..7e55fcb92 100644 --- a/packages/runtime-class/src/translator/tag/attribute-tag.js +++ b/packages/runtime-class/src/translator/tag/attribute-tag.js @@ -1,3 +1,4 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, findParentTag, @@ -6,8 +7,7 @@ import { importNamed, isAttributeTag, isTransparentTag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { getAttrs } from "./util"; diff --git a/packages/runtime-class/src/translator/tag/attribute/directives/class.js b/packages/runtime-class/src/translator/tag/attribute/directives/class.js index 6898e6fe0..f2945d098 100644 --- a/packages/runtime-class/src/translator/tag/attribute/directives/class.js +++ b/packages/runtime-class/src/translator/tag/attribute/directives/class.js @@ -1,5 +1,9 @@ -import { computeNode, importDefault, isNativeTag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + computeNode, + importDefault, + isNativeTag, +} from "@marko/compiler/babel-utils"; import classToString from "marko/src/runtime/helpers/class-value"; import withPreviousLocation from "../../../util/with-previous-location"; diff --git a/packages/runtime-class/src/translator/tag/attribute/directives/no-update-body-if.js b/packages/runtime-class/src/translator/tag/attribute/directives/no-update-body-if.js index 06fd43fd6..e5f7d8ce5 100644 --- a/packages/runtime-class/src/translator/tag/attribute/directives/no-update-body-if.js +++ b/packages/runtime-class/src/translator/tag/attribute/directives/no-update-body-if.js @@ -1,4 +1,4 @@ -import { getArgOrSequence } from "@marko/babel-utils"; +import { getArgOrSequence } from "@marko/compiler/babel-utils"; import noUpdateTransform from "./no-update"; diff --git a/packages/runtime-class/src/translator/tag/attribute/directives/no-update-if.js b/packages/runtime-class/src/translator/tag/attribute/directives/no-update-if.js index 4ac7c3d05..66b334074 100644 --- a/packages/runtime-class/src/translator/tag/attribute/directives/no-update-if.js +++ b/packages/runtime-class/src/translator/tag/attribute/directives/no-update-if.js @@ -1,4 +1,4 @@ -import { getArgOrSequence } from "@marko/babel-utils"; +import { getArgOrSequence } from "@marko/compiler/babel-utils"; import noUpdateTransform from "./no-update"; diff --git a/packages/runtime-class/src/translator/tag/attribute/directives/no-update.js b/packages/runtime-class/src/translator/tag/attribute/directives/no-update.js index 2db3fa435..8e913b235 100644 --- a/packages/runtime-class/src/translator/tag/attribute/directives/no-update.js +++ b/packages/runtime-class/src/translator/tag/attribute/directives/no-update.js @@ -1,5 +1,8 @@ -import { isNativeTag, normalizeTemplateString } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + isNativeTag, + normalizeTemplateString, +} from "@marko/compiler/babel-utils"; const EMPTY_OBJECT = {}; export default { diff --git a/packages/runtime-class/src/translator/tag/attribute/directives/style.js b/packages/runtime-class/src/translator/tag/attribute/directives/style.js index 6b048b80f..14944b9d8 100644 --- a/packages/runtime-class/src/translator/tag/attribute/directives/style.js +++ b/packages/runtime-class/src/translator/tag/attribute/directives/style.js @@ -1,5 +1,9 @@ -import { computeNode, importDefault, isNativeTag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + computeNode, + importDefault, + isNativeTag, +} from "@marko/compiler/babel-utils"; import styleToString from "marko/src/runtime/helpers/style-value"; import withPreviousLocation from "../../../util/with-previous-location"; diff --git a/packages/runtime-class/src/translator/tag/attribute/index.js b/packages/runtime-class/src/translator/tag/attribute/index.js index ef330c7eb..c058818b9 100644 --- a/packages/runtime-class/src/translator/tag/attribute/index.js +++ b/packages/runtime-class/src/translator/tag/attribute/index.js @@ -1,4 +1,8 @@ -import { getTagDef, importDefault, isNativeTag } from "@marko/babel-utils"; +import { + getTagDef, + importDefault, + isNativeTag, +} from "@marko/compiler/babel-utils"; import directives from "./directives"; import modifiers from "./modifiers"; diff --git a/packages/runtime-class/src/translator/tag/custom-tag.js b/packages/runtime-class/src/translator/tag/custom-tag.js index 7ac8450ea..0f59dec9b 100644 --- a/packages/runtime-class/src/translator/tag/custom-tag.js +++ b/packages/runtime-class/src/translator/tag/custom-tag.js @@ -1,3 +1,4 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, getTagDef, @@ -5,8 +6,7 @@ import { loadFileForTag, resolveRelativePath, resolveTagImport, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import withPreviousLocation from "../util/with-previous-location"; import dynamicTag from "./dynamic-tag"; diff --git a/packages/runtime-class/src/translator/tag/dynamic-tag.js b/packages/runtime-class/src/translator/tag/dynamic-tag.js index 6f6ac9178..47e215cee 100644 --- a/packages/runtime-class/src/translator/tag/dynamic-tag.js +++ b/packages/runtime-class/src/translator/tag/dynamic-tag.js @@ -1,5 +1,5 @@ -import { importDefault } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { importDefault } from "@marko/compiler/babel-utils"; import withPreviousLocation from "../util/with-previous-location"; import { buildEventHandlerArray, getAttrs } from "./util"; diff --git a/packages/runtime-class/src/translator/tag/index.js b/packages/runtime-class/src/translator/tag/index.js index 33fd102e7..46e873055 100644 --- a/packages/runtime-class/src/translator/tag/index.js +++ b/packages/runtime-class/src/translator/tag/index.js @@ -1,3 +1,4 @@ +import { types as t } from "@marko/compiler"; import { assertNoVar, findAttributeTags, @@ -8,8 +9,7 @@ import { isNativeTag, isTransparentTag, resolveTagImport, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import nodePath from "path"; import { getKeyManager } from "../util/key-manager"; diff --git a/packages/runtime-class/src/translator/tag/macro-tag.js b/packages/runtime-class/src/translator/tag/macro-tag.js index e10a6c911..2c3de3841 100644 --- a/packages/runtime-class/src/translator/tag/macro-tag.js +++ b/packages/runtime-class/src/translator/tag/macro-tag.js @@ -1,4 +1,4 @@ -import { getMacroIdentifier } from "@marko/babel-utils"; +import { getMacroIdentifier } from "@marko/compiler/babel-utils"; export default function (path) { path.node.name = getMacroIdentifier(path); diff --git a/packages/runtime-class/src/translator/tag/native-tag.js b/packages/runtime-class/src/translator/tag/native-tag.js index 4b3a52210..9942d1e57 100644 --- a/packages/runtime-class/src/translator/tag/native-tag.js +++ b/packages/runtime-class/src/translator/tag/native-tag.js @@ -2,7 +2,7 @@ import { assertNoArgs, assertNoAttributeTags, assertNoParams, -} from "@marko/babel-utils"; +} from "@marko/compiler/babel-utils"; import nativeTagHtml from "./native-tag[html]"; import nativeTagVdom from "./native-tag[vdom]"; diff --git a/packages/runtime-class/src/translator/tag/native-tag[html]/attributes.js b/packages/runtime-class/src/translator/tag/native-tag[html]/attributes.js index 260f72382..cba7ba36f 100644 --- a/packages/runtime-class/src/translator/tag/native-tag[html]/attributes.js +++ b/packages/runtime-class/src/translator/tag/native-tag[html]/attributes.js @@ -1,9 +1,9 @@ +import { types as t } from "@marko/compiler"; import { importDefault, importNamed, normalizeTemplateString, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import attrHelper from "marko/src/runtime/html/helpers/attr"; import { d as escapeDoubleQuotes } from "marko/src/runtime/html/helpers/escape-quotes"; diff --git a/packages/runtime-class/src/translator/tag/native-tag[html]/index.js b/packages/runtime-class/src/translator/tag/native-tag[html]/index.js index c38ddefe4..c16cbcb4c 100644 --- a/packages/runtime-class/src/translator/tag/native-tag[html]/index.js +++ b/packages/runtime-class/src/translator/tag/native-tag[html]/index.js @@ -1,9 +1,9 @@ +import { types as t } from "@marko/compiler"; import { getTagDef, importDefault, normalizeTemplateString, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { resolve } from "path"; import SELF_CLOSING from "self-closing-tags"; diff --git a/packages/runtime-class/src/translator/tag/native-tag[vdom]/attributes.js b/packages/runtime-class/src/translator/tag/native-tag[vdom]/attributes.js index b14123533..89b81758f 100644 --- a/packages/runtime-class/src/translator/tag/native-tag[vdom]/attributes.js +++ b/packages/runtime-class/src/translator/tag/native-tag[vdom]/attributes.js @@ -1,5 +1,5 @@ -import { importDefault } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { importDefault } from "@marko/compiler/babel-utils"; import { evaluateAttr } from "../util"; diff --git a/packages/runtime-class/src/translator/tag/native-tag[vdom]/index.js b/packages/runtime-class/src/translator/tag/native-tag[vdom]/index.js index 9d4983831..f991e2848 100644 --- a/packages/runtime-class/src/translator/tag/native-tag[vdom]/index.js +++ b/packages/runtime-class/src/translator/tag/native-tag[vdom]/index.js @@ -1,5 +1,8 @@ -import { getTagDef, normalizeTemplateString } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + getTagDef, + normalizeTemplateString, +} from "@marko/compiler/babel-utils"; import * as FLAGS from "../../util/runtime-flags"; import write from "../../util/vdom-out-write"; diff --git a/packages/runtime-class/src/translator/tag/util.js b/packages/runtime-class/src/translator/tag/util.js index 81b116a95..044e266cc 100644 --- a/packages/runtime-class/src/translator/tag/util.js +++ b/packages/runtime-class/src/translator/tag/util.js @@ -1,5 +1,9 @@ -import { computeNode, getTagDef, importNamed } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + computeNode, + getTagDef, + importNamed, +} from "@marko/compiler/babel-utils"; import classToString from "marko/src/runtime/helpers/class-value"; import styleToString from "marko/src/runtime/helpers/style-value"; diff --git a/packages/runtime-class/src/translator/taglib/core/conditional/translate-else-if.js b/packages/runtime-class/src/translator/taglib/core/conditional/translate-else-if.js index bfe9e0413..b61c14926 100644 --- a/packages/runtime-class/src/translator/taglib/core/conditional/translate-else-if.js +++ b/packages/runtime-class/src/translator/taglib/core/conditional/translate-else-if.js @@ -1,4 +1,4 @@ -import { assertNoAttributes } from "@marko/babel-utils"; +import { assertNoAttributes } from "@marko/compiler/babel-utils"; import { buildIfStatement } from "./util"; diff --git a/packages/runtime-class/src/translator/taglib/core/conditional/translate-else.js b/packages/runtime-class/src/translator/taglib/core/conditional/translate-else.js index 37c6a05ea..a393fe085 100644 --- a/packages/runtime-class/src/translator/taglib/core/conditional/translate-else.js +++ b/packages/runtime-class/src/translator/taglib/core/conditional/translate-else.js @@ -1,5 +1,5 @@ -import { assertNoArgs, assertNoAttributes } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { assertNoArgs, assertNoAttributes } from "@marko/compiler/babel-utils"; export function exit(path) { assertNoArgs(path); diff --git a/packages/runtime-class/src/translator/taglib/core/conditional/translate-if.js b/packages/runtime-class/src/translator/taglib/core/conditional/translate-if.js index e62b75944..e511934ed 100644 --- a/packages/runtime-class/src/translator/taglib/core/conditional/translate-if.js +++ b/packages/runtime-class/src/translator/taglib/core/conditional/translate-if.js @@ -1,4 +1,4 @@ -import { assertNoAttributes } from "@marko/babel-utils"; +import { assertNoAttributes } from "@marko/compiler/babel-utils"; import { buildIfStatement } from "./util"; diff --git a/packages/runtime-class/src/translator/taglib/core/macro/parse.js b/packages/runtime-class/src/translator/taglib/core/macro/parse.js index f62d4bfec..6b24e26cc 100644 --- a/packages/runtime-class/src/translator/taglib/core/macro/parse.js +++ b/packages/runtime-class/src/translator/taglib/core/macro/parse.js @@ -1,5 +1,5 @@ -import { registerMacro } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { registerMacro } from "@marko/compiler/babel-utils"; export default function (path) { const attrs = path.node.attributes; diff --git a/packages/runtime-class/src/translator/taglib/core/macro/translate.js b/packages/runtime-class/src/translator/taglib/core/macro/translate.js index 75f2598db..b9bc37794 100644 --- a/packages/runtime-class/src/translator/taglib/core/macro/translate.js +++ b/packages/runtime-class/src/translator/taglib/core/macro/translate.js @@ -1,5 +1,8 @@ -import { diagnosticError, getMacroIdentifierForName } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + diagnosticError, + getMacroIdentifierForName, +} from "@marko/compiler/babel-utils"; import withPreviousLocation from "../../../util/with-previous-location"; diff --git a/packages/runtime-class/src/translator/taglib/core/parse-class.js b/packages/runtime-class/src/translator/taglib/core/parse-class.js index 487b92b13..493db4388 100644 --- a/packages/runtime-class/src/translator/taglib/core/parse-class.js +++ b/packages/runtime-class/src/translator/taglib/core/parse-class.js @@ -1,9 +1,9 @@ +import { types as t } from "@marko/compiler"; import { diagnosticDeprecate, diagnosticError, parseExpression, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import getComponentFiles from "../../util/get-component-files"; diff --git a/packages/runtime-class/src/translator/taglib/core/parse-export.js b/packages/runtime-class/src/translator/taglib/core/parse-export.js index 91eac097c..65a2dbe40 100644 --- a/packages/runtime-class/src/translator/taglib/core/parse-export.js +++ b/packages/runtime-class/src/translator/taglib/core/parse-export.js @@ -1,4 +1,4 @@ -import { parseStatements } from "@marko/babel-utils"; +import { parseStatements } from "@marko/compiler/babel-utils"; export default function (path) { const { diff --git a/packages/runtime-class/src/translator/taglib/core/parse-import.js b/packages/runtime-class/src/translator/taglib/core/parse-import.js index edb081dcf..1dfbf1f10 100644 --- a/packages/runtime-class/src/translator/taglib/core/parse-import.js +++ b/packages/runtime-class/src/translator/taglib/core/parse-import.js @@ -1,4 +1,4 @@ -import { parseStatements } from "@marko/babel-utils"; +import { parseStatements } from "@marko/compiler/babel-utils"; export default function (path) { const { diff --git a/packages/runtime-class/src/translator/taglib/core/parse-static.js b/packages/runtime-class/src/translator/taglib/core/parse-static.js index fac95d913..5e94acd56 100644 --- a/packages/runtime-class/src/translator/taglib/core/parse-static.js +++ b/packages/runtime-class/src/translator/taglib/core/parse-static.js @@ -1,5 +1,5 @@ -import { parseStatements } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { parseStatements } from "@marko/compiler/babel-utils"; export default function (path) { const { diff --git a/packages/runtime-class/src/translator/taglib/core/transform-style.js b/packages/runtime-class/src/translator/taglib/core/transform-style.js index c32083d90..34c024f85 100644 --- a/packages/runtime-class/src/translator/taglib/core/transform-style.js +++ b/packages/runtime-class/src/translator/taglib/core/transform-style.js @@ -1,4 +1,4 @@ -import { getStart } from "@marko/babel-utils"; +import { getStart } from "@marko/compiler/babel-utils"; import path from "path"; import getComponentFiles from "../../util/get-component-files"; diff --git a/packages/runtime-class/src/translator/taglib/core/translate-for.js b/packages/runtime-class/src/translator/taglib/core/translate-for.js index 6a9f54c8a..87cbff99c 100644 --- a/packages/runtime-class/src/translator/taglib/core/translate-for.js +++ b/packages/runtime-class/src/translator/taglib/core/translate-for.js @@ -1,5 +1,8 @@ -import { assertAllowedAttributes, importDefault } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + assertAllowedAttributes, + importDefault, +} from "@marko/compiler/babel-utils"; export function exit(path) { const { node } = path; diff --git a/packages/runtime-class/src/translator/taglib/core/translate-html-comment.js b/packages/runtime-class/src/translator/taglib/core/translate-html-comment.js index d988f384d..33ddf5259 100644 --- a/packages/runtime-class/src/translator/taglib/core/translate-html-comment.js +++ b/packages/runtime-class/src/translator/taglib/core/translate-html-comment.js @@ -1,9 +1,9 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoAttributes, assertNoParams, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import writeHTML from "../../util/html-out-write"; import writeVDOM from "../../util/vdom-out-write"; diff --git a/packages/runtime-class/src/translator/taglib/core/translate-include-content.js b/packages/runtime-class/src/translator/taglib/core/translate-include-content.js index 9c78e6593..fee3e2966 100644 --- a/packages/runtime-class/src/translator/taglib/core/translate-include-content.js +++ b/packages/runtime-class/src/translator/taglib/core/translate-include-content.js @@ -1,5 +1,8 @@ -import { assertNoAttributes, assertNoParams } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + assertNoAttributes, + assertNoParams, +} from "@marko/compiler/babel-utils"; import path from "path"; export function enter(tag) { diff --git a/packages/runtime-class/src/translator/taglib/core/translate-while.js b/packages/runtime-class/src/translator/taglib/core/translate-while.js index a77f932d1..4e8418026 100644 --- a/packages/runtime-class/src/translator/taglib/core/translate-while.js +++ b/packages/runtime-class/src/translator/taglib/core/translate-while.js @@ -1,9 +1,9 @@ +import { types as t } from "@marko/compiler"; import { assertNoAttributes, assertNoParams, getArgOrSequence, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import withPreviousLocation from "../../util/with-previous-location"; diff --git a/packages/runtime-class/src/translator/taglib/migrate/all-templates.js b/packages/runtime-class/src/translator/taglib/migrate/all-templates.js index 06e760238..10ad827f8 100644 --- a/packages/runtime-class/src/translator/taglib/migrate/all-templates.js +++ b/packages/runtime-class/src/translator/taglib/migrate/all-templates.js @@ -1,5 +1,5 @@ -import { diagnosticDeprecate } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { diagnosticDeprecate } from "@marko/compiler/babel-utils"; import withPreviousLocation from "../../util/with-previous-location"; const kHadAssignment = Symbol(); diff --git a/packages/runtime-class/src/translator/util/add-dependencies.js b/packages/runtime-class/src/translator/util/add-dependencies.js index f314f4e67..d047c5c50 100644 --- a/packages/runtime-class/src/translator/util/add-dependencies.js +++ b/packages/runtime-class/src/translator/util/add-dependencies.js @@ -1,9 +1,9 @@ +import { types as t } from "@marko/compiler"; import { loadFileForImport, parseStatements, resolveRelativePath, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import MagicString from "magic-string"; import path from "path"; import resolveFrom from "resolve-from"; diff --git a/packages/runtime-class/src/translator/util/html-out-write.js b/packages/runtime-class/src/translator/util/html-out-write.js index 64fbe4ed3..697a08477 100644 --- a/packages/runtime-class/src/translator/util/html-out-write.js +++ b/packages/runtime-class/src/translator/util/html-out-write.js @@ -1,5 +1,5 @@ -import { normalizeTemplateString } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { normalizeTemplateString } from "@marko/compiler/babel-utils"; export default function write(strings, ...expressions) { const template = normalizeTemplateString(strings, ...expressions); diff --git a/packages/runtime-class/src/translator/util/key-manager.js b/packages/runtime-class/src/translator/util/key-manager.js index c0139f68f..d515ec496 100644 --- a/packages/runtime-class/src/translator/util/key-manager.js +++ b/packages/runtime-class/src/translator/util/key-manager.js @@ -1,9 +1,9 @@ +import { types as t } from "@marko/compiler"; import { isLoopTag, isTransparentTag, normalizeTemplateString, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; const KeyManagerLookup = new WeakMap(); /** diff --git a/packages/runtime-class/src/translator/util/optimize-html-writes.js b/packages/runtime-class/src/translator/util/optimize-html-writes.js index c70df7d82..6310d3a5d 100644 --- a/packages/runtime-class/src/translator/util/optimize-html-writes.js +++ b/packages/runtime-class/src/translator/util/optimize-html-writes.js @@ -1,4 +1,4 @@ -import { normalizeTemplateString } from "@marko/babel-utils"; +import { normalizeTemplateString } from "@marko/compiler/babel-utils"; const mergeWriteCallsVisitor = { ExpressionStatement(path) { diff --git a/packages/runtime-class/src/translator/util/optimize-vdom-create.js b/packages/runtime-class/src/translator/util/optimize-vdom-create.js index 2ff9cf05c..36915d076 100644 --- a/packages/runtime-class/src/translator/util/optimize-vdom-create.js +++ b/packages/runtime-class/src/translator/util/optimize-vdom-create.js @@ -1,11 +1,11 @@ +import { types as t } from "@marko/compiler"; import { computeNode, getTagDef, importDefault, isLoopTag, isNativeTag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { decode } from "he"; import translateAttributes from "../tag/native-tag[vdom]/attributes"; diff --git a/packages/runtime-class/test/__util__/patch-module.js b/packages/runtime-class/test/__util__/patch-module.js index e78960319..0dc870214 100644 --- a/packages/runtime-class/test/__util__/patch-module.js +++ b/packages/runtime-class/test/__util__/patch-module.js @@ -35,7 +35,10 @@ Module._resolveFilename = function (request, parent, isMain) { request = nodePath.join(rootDir, request.substring("marko/".length)); } else if (request === "marko") { request = rootDir; - } else if (request.startsWith("marko/")) { + } else if ( + request !== "marko/package.json" && + request.startsWith("marko/") + ) { request = nodePath.join(markoDir, request.substring("marko/".length)); } } diff --git a/packages/runtime-class/test/translator/fixtures/custom-tag-child-analyze/components/hello/transformer.js b/packages/runtime-class/test/translator/fixtures/custom-tag-child-analyze/components/hello/transformer.js index 35b26a123..05608150d 100644 --- a/packages/runtime-class/test/translator/fixtures/custom-tag-child-analyze/components/hello/transformer.js +++ b/packages/runtime-class/test/translator/fixtures/custom-tag-child-analyze/components/hello/transformer.js @@ -1,4 +1,4 @@ -const { loadFileForTag } = require("@marko/babel-utils"); +const { loadFileForTag } = require("@marko/compiler/babel-utils"); module.exports = (helloTag, t) => { const messageTag = helloTag.getNextSibling(); diff --git a/packages/runtime-class/test/translator/index.test.js b/packages/runtime-class/test/translator/index.test.js index 92000e200..1a0a824c6 100644 --- a/packages/runtime-class/test/translator/index.test.js +++ b/packages/runtime-class/test/translator/index.test.js @@ -12,7 +12,7 @@ const cwdRegExp = new RegExp( "g", ); -describe("translator-class", () => { +describe("runtime-class/translator", () => { autotest("fixtures", { cjs: runTest({ output: "html", modules: "cjs" }), html: runTest({ output: "html" }), diff --git a/packages/runtime-class/translator/package.json b/packages/runtime-class/translator/package.json index e94970b9e..101fa2880 100644 --- a/packages/runtime-class/translator/package.json +++ b/packages/runtime-class/translator/package.json @@ -1,48 +1,5 @@ { - "name": "@marko/translator-default", - "version": "6.1.3", - "description": "Translates Marko templates to the default Marko runtime.", - "keywords": [ - "babel", - "htmljs", - "marko", - "parse", - "parser", - "plugin" - ], - "homepage": "https://github.com/marko-js/marko/blob/main/packages/translator-default/README.md", - "bugs": "https://github.com/marko-js/marko/issues/new?template=Bug_report.md", - "repository": { - "type": "git", - "url": "https://github.com/marko-js/marko/tree/main/packages/translator-default" - }, - "license": "MIT", - "author": "Dylan Piercey ", - "main": "src/index.js", + "main": "../src/translator/index.js", "types": "index.d.ts", - "files": [ - "dist", - "index.d.ts" - ], - "scripts": { - "build": "babel ./src --out-dir ./dist --copy-files --config-file ../../babel.config.js --env-name=production" - }, - "dependencies": { - "@babel/runtime": "^7.26.0", - "@marko/babel-utils": "^6.6.3", - "magic-string": "^0.30.15", - "self-closing-tags": "^1.0.1" - }, - "devDependencies": { - "@marko/compiler": "^5.38.5", - "marko": "^5.36.5" - }, - "peerDependencies": { - "@marko/compiler": "^5.16.1", - "marko": "^5.17.2" - }, - "publishConfig": { - "access": "public" - }, - "main:override": "dist/index.js" + "main:override": "../dist/translator/index.js" } diff --git a/packages/runtime-tags/package.json b/packages/runtime-tags/package.json index 028ddc025..52010c96d 100644 --- a/packages/runtime-tags/package.json +++ b/packages/runtime-tags/package.json @@ -16,6 +16,8 @@ }, "license": "MIT", "exports": { + "./*.d.marko": "./tag-types/*", + "./translator": "./src/translator/index.ts", "./*": "./src/*.ts", "./debug/*": "./src/*.ts" }, @@ -29,7 +31,9 @@ "build": "node -r ~ts ./scripts/bundle.ts" }, "exports:override": { + "./*.d.marko": "./tag-types/*", "./package.json": "./package.json", + "./translator": "./dist/translator/index.js", "./*": { "types": "./dist/*.d.ts", "import": "./dist/*.mjs", diff --git a/packages/runtime-tags/scripts/bundle.ts b/packages/runtime-tags/scripts/bundle.ts index 594004cab..1f9b3c0b8 100644 --- a/packages/runtime-tags/scripts/bundle.ts +++ b/packages/runtime-tags/scripts/bundle.ts @@ -4,8 +4,23 @@ import path from "path"; const absWorkingDir = path.join(__dirname, ".."); -Promise.all( - ["dist/debug", "dist"].flatMap((env) => +Promise.all([ + // Build translator + build({ + format: "cjs", + bundle: true, + absWorkingDir, + outdir: "dist/translator", + sourcemap: false, + platform: "node", + packages: "external", + entryPoints: ["src/translator/index.ts"], + define: { + MARKO_DEBUG: "false", + }, + }), + // Build runtime + ...["dist/debug", "dist"].flatMap((env) => ["dom", "html"].flatMap((name) => { (["esm", "cjs"] as const).map(async (format) => { const isProd = env === "dist"; @@ -34,4 +49,7 @@ Promise.all( }); }), ), -); +]).catch((err) => { + console.error(err); + process.exit(1); +}); diff --git a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/transformer.ts b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/transformer.ts index bb460dcf4..3b8204b30 100644 --- a/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/transformer.ts +++ b/packages/runtime-tags/src/__tests__/fixtures/custom-tag-child-analyze/components/hello/transformer.ts @@ -1,5 +1,5 @@ -import { loadFileForTag } from "@marko/babel-utils"; import type { types } from "@marko/compiler"; +import { loadFileForTag } from "@marko/compiler/babel-utils"; export default (helloTag: types.NodePath, t: typeof types) => { const messageTag = (helloTag as any).getNextSibling(); diff --git a/packages/runtime-tags/src/__tests__/main.test.ts b/packages/runtime-tags/src/__tests__/main.test.ts index d9dc438c7..eb67ce786 100644 --- a/packages/runtime-tags/src/__tests__/main.test.ts +++ b/packages/runtime-tags/src/__tests__/main.test.ts @@ -9,7 +9,7 @@ import path from "path"; import glob from "tiny-glob"; import { isDeepStrictEqual } from "util"; -import * as translator from ".."; +import * as translator from "../translator"; import { bundle } from "./utils/bundle"; import createBrowser from "./utils/create-browser"; import { isThrows, isWait } from "./utils/resolve"; @@ -53,7 +53,7 @@ const htmlConfig: compiler.Config = { ...baseConfig, output: "html" }; const domConfig: compiler.Config = { ...baseConfig, output: "dom" }; const snapCache = new Map(); -describe("translator-tags", () => { +describe("runtime-tags/translator", () => { before(() => { register({ ...htmlConfig, modules: "cjs" }); }); diff --git a/packages/runtime-tags/src/translator/core/attrs.ts b/packages/runtime-tags/src/translator/core/attrs.ts index 5719fcdf8..d690bc131 100644 --- a/packages/runtime-tags/src/translator/core/attrs.ts +++ b/packages/runtime-tags/src/translator/core/attrs.ts @@ -1,3 +1,4 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoAttributes, @@ -5,8 +6,7 @@ import { assertNoParams, diagnosticDeprecate, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { assertNoBodyContent } from "../util/assert"; diff --git a/packages/runtime-tags/src/translator/core/client.ts b/packages/runtime-tags/src/translator/core/client.ts index 3ece54643..03694a689 100644 --- a/packages/runtime-tags/src/translator/core/client.ts +++ b/packages/runtime-tags/src/translator/core/client.ts @@ -1,5 +1,5 @@ -import { parseStatements } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { parseStatements } from "@marko/compiler/babel-utils"; export default { parse(tag: t.NodePath) { const { diff --git a/packages/runtime-tags/src/translator/core/const.ts b/packages/runtime-tags/src/translator/core/const.ts index 1ba2fa8b2..d3927816c 100644 --- a/packages/runtime-tags/src/translator/core/const.ts +++ b/packages/runtime-tags/src/translator/core/const.ts @@ -1,5 +1,9 @@ -import { assertNoArgs, assertNoParams, type Tag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + assertNoArgs, + assertNoParams, + type Tag, +} from "@marko/compiler/babel-utils"; import { assertNoBodyContent } from "../util/assert"; import evaluate from "../util/evaluate"; @@ -83,5 +87,5 @@ export default { descriptionMoreURL: "https://markojs.com/docs/core-tags/#const", }, ], - types: "@marko/translator-tags/tag-types/const.d.marko", + types: "@marko/runtime-tags/tag-types/const.d.marko", } as Tag; diff --git a/packages/runtime-tags/src/translator/core/debug.ts b/packages/runtime-tags/src/translator/core/debug.ts index 1e11d2cc1..a718fc5ce 100644 --- a/packages/runtime-tags/src/translator/core/debug.ts +++ b/packages/runtime-tags/src/translator/core/debug.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoParams, assertNoVar, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { assertNoBodyContent } from "../util/assert"; import { isOutputHTML } from "../util/marko-config"; @@ -60,5 +60,5 @@ export default { descriptionMoreURL: "https://markojs.com/docs/core-tags/#debug", }, ], - types: "@marko/translator-tags/tag-types/debug.d.marko", + types: "@marko/runtime-tags/tag-types/debug.d.marko", } as Tag; diff --git a/packages/runtime-tags/src/translator/core/define.ts b/packages/runtime-tags/src/translator/core/define.ts index f475a7151..d21690c85 100644 --- a/packages/runtime-tags/src/translator/core/define.ts +++ b/packages/runtime-tags/src/translator/core/define.ts @@ -1,5 +1,5 @@ -import { assertNoArgs, type Tag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { assertNoArgs, type Tag } from "@marko/compiler/babel-utils"; import { isOutputHTML } from "../util/marko-config"; import { @@ -87,5 +87,5 @@ export default { descriptionMoreURL: "https://markojs.com/docs/core-tags/#define", }, ], - types: "@marko/translator-tags/tag-types/define.d.marko", + types: "@marko/runtime-tags/tag-types/define.d.marko", } as Tag; diff --git a/packages/runtime-tags/src/translator/core/effect.ts b/packages/runtime-tags/src/translator/core/effect.ts index 123625b69..5c1148a21 100644 --- a/packages/runtime-tags/src/translator/core/effect.ts +++ b/packages/runtime-tags/src/translator/core/effect.ts @@ -1,3 +1,4 @@ +import { types as t } from "@marko/compiler"; import { assertAllowedAttributes, assertNoArgs, @@ -5,8 +6,7 @@ import { assertNoParams, diagnosticDeprecate, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { assertNoBodyContent, assertNoSpreadAttrs } from "../util/assert"; import withPreviousLocation from "../util/with-previous-location"; @@ -39,5 +39,5 @@ export default { }, ], attributes: {}, - types: "@marko/translator-tags/tag-types/effect.d.marko", + types: "@marko/runtime-tags/tag-types/effect.d.marko", } as Tag; diff --git a/packages/runtime-tags/src/translator/core/export.ts b/packages/runtime-tags/src/translator/core/export.ts index 812d14627..0db6d812f 100644 --- a/packages/runtime-tags/src/translator/core/export.ts +++ b/packages/runtime-tags/src/translator/core/export.ts @@ -1,4 +1,4 @@ -import { parseStatements, type Tag } from "@marko/babel-utils"; +import { parseStatements, type Tag } from "@marko/compiler/babel-utils"; export default { parse(tag) { diff --git a/packages/runtime-tags/src/translator/core/for.ts b/packages/runtime-tags/src/translator/core/for.ts index bd4a67ff4..90c2502ea 100644 --- a/packages/runtime-tags/src/translator/core/for.ts +++ b/packages/runtime-tags/src/translator/core/for.ts @@ -1,11 +1,11 @@ +import { types as t } from "@marko/compiler"; import { assertAllowedAttributes, assertNoArgs, assertNoVar, getTagDef, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { AccessorChar, WalkCode } from "@marko/runtime-tags/common/types"; import { assertNoSpreadAttrs } from "../util/assert"; diff --git a/packages/runtime-tags/src/translator/core/html-comment.ts b/packages/runtime-tags/src/translator/core/html-comment.ts index 25ea5d154..81c2cf893 100644 --- a/packages/runtime-tags/src/translator/core/html-comment.ts +++ b/packages/runtime-tags/src/translator/core/html-comment.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoAttributes, assertNoParams, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { WalkCode } from "@marko/runtime-tags/common/types"; import { isOutputHTML } from "../util/marko-config"; diff --git a/packages/runtime-tags/src/translator/core/html-script.ts b/packages/runtime-tags/src/translator/core/html-script.ts index dc1084c5a..7f80fe1b6 100644 --- a/packages/runtime-tags/src/translator/core/html-script.ts +++ b/packages/runtime-tags/src/translator/core/html-script.ts @@ -2,8 +2,12 @@ // we should probably attempt to share that logic where possible. // Also need to ensure it stays in sync. -import { assertNoArgs, assertNoParams, type Tag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + assertNoArgs, + assertNoParams, + type Tag, +} from "@marko/compiler/babel-utils"; import { getEventHandlerName, isEventHandler, diff --git a/packages/runtime-tags/src/translator/core/html-style.ts b/packages/runtime-tags/src/translator/core/html-style.ts index 89b656a9f..89fe478ce 100644 --- a/packages/runtime-tags/src/translator/core/html-style.ts +++ b/packages/runtime-tags/src/translator/core/html-style.ts @@ -2,8 +2,12 @@ // we should probably attempt to share that logic where possible. // Also need to ensure it stays in sync. -import { assertNoArgs, assertNoParams, type Tag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + assertNoArgs, + assertNoParams, + type Tag, +} from "@marko/compiler/babel-utils"; import { getEventHandlerName, isEventHandler, diff --git a/packages/runtime-tags/src/translator/core/id.ts b/packages/runtime-tags/src/translator/core/id.ts index 9e9d38978..d67b897f3 100644 --- a/packages/runtime-tags/src/translator/core/id.ts +++ b/packages/runtime-tags/src/translator/core/id.ts @@ -1,11 +1,11 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoAttributes, assertNoAttributeTags, assertNoParams, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { assertNoBodyContent } from "../util/assert"; import { isOutputHTML } from "../util/marko-config"; @@ -68,5 +68,5 @@ export default { descriptionMoreURL: "https://markojs.com/docs/core-tags/#id", }, ], - types: "@marko/translator-tags/tag-types/id.d.marko", + types: "@marko/runtime-tags/tag-types/id.d.marko", } as Tag; diff --git a/packages/runtime-tags/src/translator/core/if.ts b/packages/runtime-tags/src/translator/core/if.ts index 71a99a5dc..f142b9a0b 100644 --- a/packages/runtime-tags/src/translator/core/if.ts +++ b/packages/runtime-tags/src/translator/core/if.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoParams, assertNoVar, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { AccessorChar, WalkCode } from "@marko/runtime-tags/common/types"; import { assertNoSpreadAttrs } from "../util/assert"; diff --git a/packages/runtime-tags/src/translator/core/import.ts b/packages/runtime-tags/src/translator/core/import.ts index cb8e7cae0..e5eccf00a 100644 --- a/packages/runtime-tags/src/translator/core/import.ts +++ b/packages/runtime-tags/src/translator/core/import.ts @@ -1,4 +1,4 @@ -import { parseStatements, type Tag } from "@marko/babel-utils"; +import { parseStatements, type Tag } from "@marko/compiler/babel-utils"; export default { parse(tag) { diff --git a/packages/runtime-tags/src/translator/core/let.ts b/packages/runtime-tags/src/translator/core/let.ts index 4026d8229..ecca5c237 100644 --- a/packages/runtime-tags/src/translator/core/let.ts +++ b/packages/runtime-tags/src/translator/core/let.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoParams, computeNode, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { AccessorChar } from "@marko/runtime-tags/common/types"; import { assertNoBodyContent, assertNoSpreadAttrs } from "../util/assert"; @@ -152,5 +152,5 @@ export default { descriptionMoreURL: "https://markojs.com/docs/core-tags/#let", }, ], - types: "@marko/translator-tags/tag-types/let.d.marko", + types: "@marko/runtime-tags/tag-types/let.d.marko", } as Tag; diff --git a/packages/runtime-tags/src/translator/core/lifecycle.ts b/packages/runtime-tags/src/translator/core/lifecycle.ts index ec34e7eec..7fa933e53 100644 --- a/packages/runtime-tags/src/translator/core/lifecycle.ts +++ b/packages/runtime-tags/src/translator/core/lifecycle.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoParams, assertNoVar, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { assertNoBodyContent } from "../util/assert"; import { isOutputDOM } from "../util/marko-config"; @@ -113,5 +113,5 @@ export default { descriptionMoreURL: "https://markojs.com/docs/core-tags/#effect", }, ], - types: "@marko/translator-tags/tag-types/lifecycle.d.marko", + types: "@marko/runtime-tags/tag-types/lifecycle.d.marko", } as Tag; diff --git a/packages/runtime-tags/src/translator/core/log.ts b/packages/runtime-tags/src/translator/core/log.ts index c08ebbe8d..e5fa5f47a 100644 --- a/packages/runtime-tags/src/translator/core/log.ts +++ b/packages/runtime-tags/src/translator/core/log.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoParams, assertNoVar, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { assertNoBodyContent } from "../util/assert"; import { isOutputHTML } from "../util/marko-config"; @@ -70,5 +70,5 @@ export default { descriptionMoreURL: "https://markojs.com/docs/core-tags/#log", }, ], - types: "@marko/translator-tags/tag-types/log.d.marko", + types: "@marko/runtime-tags/tag-types/log.d.marko", } as Tag; diff --git a/packages/runtime-tags/src/translator/core/return.ts b/packages/runtime-tags/src/translator/core/return.ts index 807fbcdd8..5aa4afa73 100644 --- a/packages/runtime-tags/src/translator/core/return.ts +++ b/packages/runtime-tags/src/translator/core/return.ts @@ -1,11 +1,11 @@ +import { types as t } from "@marko/compiler"; import { assertAllowedAttributes, assertNoArgs, assertNoParams, assertNoVar, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { AccessorChar } from "@marko/runtime-tags/common/types"; import { assertNoBodyContent } from "../util/assert"; diff --git a/packages/runtime-tags/src/translator/core/script.ts b/packages/runtime-tags/src/translator/core/script.ts index 530208035..0f24ac9f1 100644 --- a/packages/runtime-tags/src/translator/core/script.ts +++ b/packages/runtime-tags/src/translator/core/script.ts @@ -1,11 +1,11 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoAttributeTags, assertNoParams, parseExpression, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { assertNoBodyContent } from "../util/assert"; import { isOutputDOM } from "../util/marko-config"; @@ -160,7 +160,7 @@ export default { descriptionMoreURL: "https://markojs.com/docs/core-tags/#script", }, ], - types: "@marko/translator-tags/tag-types/script.d.marko", + types: "@marko/runtime-tags/tag-types/script.d.marko", } as Tag; function isAwaitExpression(node: t.Node) { diff --git a/packages/runtime-tags/src/translator/core/server.ts b/packages/runtime-tags/src/translator/core/server.ts index d28eabf28..50d26c8e5 100644 --- a/packages/runtime-tags/src/translator/core/server.ts +++ b/packages/runtime-tags/src/translator/core/server.ts @@ -1,5 +1,5 @@ -import { parseStatements } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { parseStatements } from "@marko/compiler/babel-utils"; export default { parse(tag: t.NodePath) { const { diff --git a/packages/runtime-tags/src/translator/core/static.ts b/packages/runtime-tags/src/translator/core/static.ts index fbe3b4c76..ef59f1f93 100644 --- a/packages/runtime-tags/src/translator/core/static.ts +++ b/packages/runtime-tags/src/translator/core/static.ts @@ -1,5 +1,5 @@ -import { parseStatements } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { parseStatements } from "@marko/compiler/babel-utils"; export default { parse(tag: t.NodePath) { const { diff --git a/packages/runtime-tags/src/translator/core/style.ts b/packages/runtime-tags/src/translator/core/style.ts index eb894ff4e..1cfec33cc 100644 --- a/packages/runtime-tags/src/translator/core/style.ts +++ b/packages/runtime-tags/src/translator/core/style.ts @@ -1,3 +1,4 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoAttributeTags, @@ -6,8 +7,7 @@ import { getStart, importDefault, type Tag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import MagicString, { type SourceMap } from "magic-string"; import path from "path"; diff --git a/packages/runtime-tags/src/translator/util/entry-builder.ts b/packages/runtime-tags/src/translator/util/entry-builder.ts index beca28764..2ddf18458 100644 --- a/packages/runtime-tags/src/translator/util/entry-builder.ts +++ b/packages/runtime-tags/src/translator/util/entry-builder.ts @@ -1,5 +1,5 @@ -import { resolveRelativePath } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { resolveRelativePath } from "@marko/compiler/babel-utils"; declare module "@marko/compiler/dist/types" { export interface ProgramExtra { diff --git a/packages/runtime-tags/src/translator/util/evaluate.ts b/packages/runtime-tags/src/translator/util/evaluate.ts index 4aef5cba3..290d54898 100644 --- a/packages/runtime-tags/src/translator/util/evaluate.ts +++ b/packages/runtime-tags/src/translator/util/evaluate.ts @@ -1,5 +1,5 @@ -import { computeNode } from "@marko/babel-utils"; import type { types as t } from "@marko/compiler"; +import { computeNode } from "@marko/compiler/babel-utils"; declare module "@marko/compiler/dist/types" { export interface NodeExtra { diff --git a/packages/runtime-tags/src/translator/util/is-core-tag.ts b/packages/runtime-tags/src/translator/util/is-core-tag.ts index db2b644a2..3b1938d0e 100644 --- a/packages/runtime-tags/src/translator/util/is-core-tag.ts +++ b/packages/runtime-tags/src/translator/util/is-core-tag.ts @@ -1,5 +1,5 @@ -import { getTagDef } from "@marko/babel-utils"; import type { types as t } from "@marko/compiler"; +import { getTagDef } from "@marko/compiler/babel-utils"; import { getTagName } from "./get-tag-name"; export const taglibId = "marko-core"; diff --git a/packages/runtime-tags/src/translator/util/nested-attribute-tags.ts b/packages/runtime-tags/src/translator/util/nested-attribute-tags.ts index 66cc3fbd3..7133b8242 100644 --- a/packages/runtime-tags/src/translator/util/nested-attribute-tags.ts +++ b/packages/runtime-tags/src/translator/util/nested-attribute-tags.ts @@ -1,5 +1,5 @@ -import { isAttributeTag, isLoopTag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { isAttributeTag, isLoopTag } from "@marko/compiler/babel-utils"; import { currentProgramPath } from "../visitors/program"; import { getParentTag } from "./get-parent-tag"; diff --git a/packages/runtime-tags/src/translator/util/plugin-hooks.ts b/packages/runtime-tags/src/translator/util/plugin-hooks.ts index 77e42d274..fc2a81fb9 100644 --- a/packages/runtime-tags/src/translator/util/plugin-hooks.ts +++ b/packages/runtime-tags/src/translator/util/plugin-hooks.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import type { EnterExitPlugin, FunctionPlugin, ModulePlugin, Plugin, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; export function enter( modulePlugin: Plugin | void, diff --git a/packages/runtime-tags/src/translator/util/runtime.ts b/packages/runtime-tags/src/translator/util/runtime.ts index 191c91ebf..eab6cad5f 100644 --- a/packages/runtime-tags/src/translator/util/runtime.ts +++ b/packages/runtime-tags/src/translator/util/runtime.ts @@ -1,5 +1,5 @@ -import { importStar } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { importStar } from "@marko/compiler/babel-utils"; import { attr, classAttr, diff --git a/packages/runtime-tags/src/translator/util/sections.ts b/packages/runtime-tags/src/translator/util/sections.ts index 13f711ba4..8878e8f28 100644 --- a/packages/runtime-tags/src/translator/util/sections.ts +++ b/packages/runtime-tags/src/translator/util/sections.ts @@ -1,9 +1,9 @@ +import { types as t } from "@marko/compiler"; import { isAttributeTag, isNativeTag, loadFileForTag, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { currentProgramPath } from "../visitors/program"; import { isCoreTag } from "./is-core-tag"; diff --git a/packages/runtime-tags/src/translator/util/signals.ts b/packages/runtime-tags/src/translator/util/signals.ts index b1aded742..bc5708ad1 100644 --- a/packages/runtime-tags/src/translator/util/signals.ts +++ b/packages/runtime-tags/src/translator/util/signals.ts @@ -1,5 +1,5 @@ -import { getTemplateId } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { getTemplateId } from "@marko/compiler/babel-utils"; import { AccessorChar } from "@marko/runtime-tags/common/types"; import { returnId } from "../core/return"; diff --git a/packages/runtime-tags/src/translator/util/tag-name-type.ts b/packages/runtime-tags/src/translator/util/tag-name-type.ts index 7a1c03e45..828aa909c 100644 --- a/packages/runtime-tags/src/translator/util/tag-name-type.ts +++ b/packages/runtime-tags/src/translator/util/tag-name-type.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; +import type { MarkoTagExtra } from "@marko/compiler/babel-types"; import { isNativeTag, loadFileForTag, resolveTagImport, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; -import type { MarkoTagExtra } from "@marko/compiler/babel-types"; +} from "@marko/compiler/babel-utils"; import withPreviousLocation from "./with-previous-location"; diff --git a/packages/runtime-tags/src/translator/util/translate-attrs.ts b/packages/runtime-tags/src/translator/util/translate-attrs.ts index 478c46410..342d20056 100644 --- a/packages/runtime-tags/src/translator/util/translate-attrs.ts +++ b/packages/runtime-tags/src/translator/util/translate-attrs.ts @@ -1,5 +1,5 @@ -import { isAttributeTag, isTransparentTag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { isAttributeTag, isTransparentTag } from "@marko/compiler/babel-utils"; import { buildForRuntimeCall, getForType } from "../core/for"; import { scopeIdentifier, type TemplateExports } from "../visitors/program"; diff --git a/packages/runtime-tags/src/translator/visitors/function.ts b/packages/runtime-tags/src/translator/visitors/function.ts index d796cc6a5..28f780aa8 100644 --- a/packages/runtime-tags/src/translator/visitors/function.ts +++ b/packages/runtime-tags/src/translator/visitors/function.ts @@ -1,5 +1,5 @@ -import { getTemplateId, isNativeTag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { getTemplateId, isNativeTag } from "@marko/compiler/babel-utils"; import { getFnRoot, getMarkoRoot } from "../util/get-root"; import { isCoreTagName } from "../util/is-core-tag"; diff --git a/packages/runtime-tags/src/translator/visitors/import-declaration.ts b/packages/runtime-tags/src/translator/visitors/import-declaration.ts index 8047b4e70..227862f2e 100644 --- a/packages/runtime-tags/src/translator/visitors/import-declaration.ts +++ b/packages/runtime-tags/src/translator/visitors/import-declaration.ts @@ -1,5 +1,5 @@ -import { resolveTagImport } from "@marko/babel-utils"; import type { types as t } from "@marko/compiler"; +import { resolveTagImport } from "@marko/compiler/babel-utils"; import type { TemplateVisitor } from "../util/visitors"; diff --git a/packages/runtime-tags/src/translator/visitors/program/index.ts b/packages/runtime-tags/src/translator/visitors/program/index.ts index c92ec0769..abe2bb12c 100644 --- a/packages/runtime-tags/src/translator/visitors/program/index.ts +++ b/packages/runtime-tags/src/translator/visitors/program/index.ts @@ -1,5 +1,8 @@ -import { loadFileForImport, resolveRelativePath } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + loadFileForImport, + resolveRelativePath, +} from "@marko/compiler/babel-utils"; import path from "path"; import { bindingHasDownstreamExpressions } from "../../util/binding-has-downstream-expressions"; diff --git a/packages/runtime-tags/src/translator/visitors/tag/attribute-tag.ts b/packages/runtime-tags/src/translator/visitors/tag/attribute-tag.ts index 726da3468..27fbdc14f 100644 --- a/packages/runtime-tags/src/translator/visitors/tag/attribute-tag.ts +++ b/packages/runtime-tags/src/translator/visitors/tag/attribute-tag.ts @@ -1,5 +1,9 @@ -import { assertNoArgs, assertNoVar, findParentTag } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + assertNoArgs, + assertNoVar, + findParentTag, +} from "@marko/compiler/babel-utils"; import { isOutputHTML } from "../../util/marko-config"; import { BindingType, trackParamsReferences } from "../../util/references"; diff --git a/packages/runtime-tags/src/translator/visitors/tag/custom-tag.ts b/packages/runtime-tags/src/translator/visitors/tag/custom-tag.ts index 8216c60a6..68271c537 100644 --- a/packages/runtime-tags/src/translator/visitors/tag/custom-tag.ts +++ b/packages/runtime-tags/src/translator/visitors/tag/custom-tag.ts @@ -1,3 +1,4 @@ +import { types as t } from "@marko/compiler"; import { assertAttributesOrSingleArg, getTagTemplate, @@ -6,8 +7,7 @@ import { isAttributeTag, loadFileForTag, resolveRelativePath, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import path from "path"; import { getTagName } from "../../util/get-tag-name"; diff --git a/packages/runtime-tags/src/translator/visitors/tag/dynamic-tag.ts b/packages/runtime-tags/src/translator/visitors/tag/dynamic-tag.ts index eceea2cd1..bbcd9c79a 100644 --- a/packages/runtime-tags/src/translator/visitors/tag/dynamic-tag.ts +++ b/packages/runtime-tags/src/translator/visitors/tag/dynamic-tag.ts @@ -1,10 +1,10 @@ +import { type Config, types as t } from "@marko/compiler"; import { assertAttributesOrArgs, importDefault, importNamed, loadFileForTag, -} from "@marko/babel-utils"; -import { type Config, types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { AccessorChar, WalkCode } from "@marko/runtime-tags/common/types"; import { isOutputHTML } from "../../util/marko-config"; diff --git a/packages/runtime-tags/src/translator/visitors/tag/index.ts b/packages/runtime-tags/src/translator/visitors/tag/index.ts index 8da3bf257..3508b90c3 100644 --- a/packages/runtime-tags/src/translator/visitors/tag/index.ts +++ b/packages/runtime-tags/src/translator/visitors/tag/index.ts @@ -1,5 +1,9 @@ -import { getTagDef, isNativeTag, type Plugin } from "@marko/babel-utils"; import { types as t } from "@marko/compiler"; +import { + getTagDef, + isNativeTag, + type Plugin, +} from "@marko/compiler/babel-utils"; import { isOutputHTML } from "../../util/marko-config"; import * as hooks from "../../util/plugin-hooks"; diff --git a/packages/runtime-tags/src/translator/visitors/tag/native-tag.ts b/packages/runtime-tags/src/translator/visitors/tag/native-tag.ts index e87396bc2..dfa9ad561 100644 --- a/packages/runtime-tags/src/translator/visitors/tag/native-tag.ts +++ b/packages/runtime-tags/src/translator/visitors/tag/native-tag.ts @@ -1,10 +1,10 @@ +import { types as t } from "@marko/compiler"; import { assertNoArgs, assertNoAttributeTags, assertNoParams, getTagDef, -} from "@marko/babel-utils"; -import { types as t } from "@marko/compiler"; +} from "@marko/compiler/babel-utils"; import { getEventHandlerName, isEventHandler, diff --git a/packages/translator-interop/package.json b/packages/translator-interop/package.json index b1eee061b..e945880e8 100644 --- a/packages/translator-interop/package.json +++ b/packages/translator-interop/package.json @@ -29,9 +29,8 @@ }, "dependencies": { "@babel/code-frame": "^7.26.2", - "@marko/babel-utils": "^6.6.3", - "@marko/translator-default": "^6.1.3", - "@marko/translator-tags": "^0.4.8" + "@marko/runtime-tags": "^0.2.5", + "marko": "^5.36.5" }, "peerDependencies": { "@marko/compiler": "^5.23.0" diff --git a/packages/translator-interop/src/__tests__/main.test.ts b/packages/translator-interop/src/__tests__/main.test.ts index 4ae6b7247..e56fa8074 100644 --- a/packages/translator-interop/src/__tests__/main.test.ts +++ b/packages/translator-interop/src/__tests__/main.test.ts @@ -1,16 +1,16 @@ import * as compiler from "@marko/compiler"; import register from "@marko/compiler/register"; import type { Input, Template } from "@marko/runtime-tags/common/types"; -import { stripInlineRuntime } from "@marko/translator-tags/src/__tests__/utils/strip-inline-runtime"; import fs from "fs"; import type { DOMWindow } from "jsdom"; import snap from "mocha-snap"; import path from "path"; import glob from "tiny-glob"; -import createBrowser from "../../../translator-tags/src/__tests__/utils/create-browser"; -import { isWait } from "../../../translator-tags/src/__tests__/utils/resolve"; -import createMutationTracker from "../../../translator-tags/src/__tests__/utils/track-mutations"; +import createBrowser from "../../../runtime-tags/src/__tests__/utils/create-browser"; +import { isWait } from "../../../runtime-tags/src/__tests__/utils/resolve"; +import { stripInlineRuntime } from "../../../runtime-tags/src/__tests__/utils/strip-inline-runtime"; +import createMutationTracker from "../../../runtime-tags/src/__tests__/utils/track-mutations"; const baseConfig: compiler.Config = { translator: require.resolve(".."), @@ -45,8 +45,8 @@ type TestConfig = { describe("translator-interop", () => { before(() => { - uncachePackage("@marko/translator-default"); - uncachePackage("@marko/translator-tags"); + uncachePackage("marko/translator"); + uncachePackage("@marko/runtime-tags/translator"); register({ ...htmlConfig, modules: "cjs" }); }); diff --git a/packages/translator-interop/src/feature-detection.ts b/packages/translator-interop/src/feature-detection.ts index 6eda56908..3ed44059d 100644 --- a/packages/translator-interop/src/feature-detection.ts +++ b/packages/translator-interop/src/feature-detection.ts @@ -1,7 +1,7 @@ -import { getTagDef } from "@marko/babel-utils"; import type { types as t } from "@marko/compiler"; -import { taglibs as taglibs5 } from "@marko/translator-default"; -import { taglibs as taglibs6 } from "@marko/translator-tags"; +import { getTagDef } from "@marko/compiler/babel-utils"; +import { taglibs as taglibs6 } from "@marko/runtime-tags/translator"; +import { taglibs as taglibs5 } from "marko/translator"; import { buildAggregateError } from "./build-aggregate-error"; diff --git a/packages/translator-interop/src/index.ts b/packages/translator-interop/src/index.ts index aaa981a33..c45df4673 100644 --- a/packages/translator-interop/src/index.ts +++ b/packages/translator-interop/src/index.ts @@ -1,6 +1,17 @@ import generate from "@babel/generator"; -import { loadFileForImport, resolveRelativePath } from "@marko/babel-utils"; import { type Config, taglib, types as t } from "@marko/compiler"; +import { + loadFileForImport, + resolveRelativePath, +} from "@marko/compiler/babel-utils"; +import { + analyze as analyze6, + getRuntimeEntryFiles as getRuntimeEntryFiles6, + internalEntryBuilder as internalEntryBuilder6, + taglibs as taglibs6, + transform as transform6, + translate as translate6, +} from "@marko/runtime-tags/translator"; import { analyze as analyze5, getRuntimeEntryFiles as getRuntimeEntryFiles5, @@ -9,15 +20,7 @@ import { taglibs as taglibs5, transform as transform5, translate as translate5, -} from "@marko/translator-default"; -import { - analyze as analyze6, - getRuntimeEntryFiles as getRuntimeEntryFiles6, - internalEntryBuilder as internalEntryBuilder6, - taglibs as taglibs6, - transform as transform6, - translate as translate6, -} from "@marko/translator-tags"; +} from "marko/translator"; import path from "path"; import { isTagsAPI } from "./feature-detection"; diff --git a/scripts/inspect-compiled-output.ts b/scripts/inspect-compiled-output.ts index 9aaa76745..a77bf916a 100644 --- a/scripts/inspect-compiled-output.ts +++ b/scripts/inspect-compiled-output.ts @@ -39,8 +39,8 @@ for (const entry of args.positionals) { }, translator: args.values.translator === "class" - ? "@marko/translator-default" - : "@marko/translator-tags", + ? "marko/translator" + : "@marko/runtime-tags/translator", }); fs.writeFileSync(outputFileName, code); diff --git a/scripts/pkg-override.js b/scripts/pkg-override.js index e283a8998..f34397119 100644 --- a/scripts/pkg-override.js +++ b/scripts/pkg-override.js @@ -1,22 +1,31 @@ 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")); + overrideFile(path.join("packages", name, "package.json")); + overrideFile(path.join("packages", name, "translator/package.json")); +} + +function overrideFile(file) { + let details; + try { + details = JSON.parse(fs.readFileSync(file, "utf8")); + } catch { + return; + } if ( [ - override(details, "main"), - override(details, "module"), - override(details, "browser"), - override(details, "exports"), + overrideField(details, "main"), + overrideField(details, "module"), + overrideField(details, "browser"), + overrideField(details, "exports"), ].some(Boolean) ) { fs.writeFileSync(file, `${JSON.stringify(details, null, 2)}\n`); } } -function override(details, field) { +function overrideField(details, field) { const overrideField = `${field}:override`; const currentValue = details[field]; const overrideValue = details[overrideField]; diff --git a/scripts/sizes.ts b/scripts/sizes.ts index d32b0cc58..a0111a7d8 100644 --- a/scripts/sizes.ts +++ b/scripts/sizes.ts @@ -50,7 +50,7 @@ const rootDir = path.join(__dirname, ".."); const runtimePath = path.join(rootDir, "packages/runtime-tags/dist/dom.mjs"); const translatorPath = path.join( rootDir, - "packages/translator-tags/dist/index.js", + "packages/runtime-tags/dist/translator/index.js", ); const configPath = path.join(rootDir, ".sizes.json"); const skipExamples = process.argv.includes("--no-examples"); diff --git a/tsconfig.build.json b/tsconfig.build.json index eabd5b227..d4549adc1 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -8,9 +8,6 @@ "references": [ { "path": "./packages/runtime-tags" - }, - { - "path": "./packages/translator-tags" } ] }