@marko/compiler 5.37.1 → 5.37.2

package/config.d.ts

@@ -24,7 +24,7 @@ declare const Config: {
   hydrateIncludeImports?: RegExp | ((request: string) => boolean);
   hydrateInit?: boolean;
   optimize?: boolean;
-  optimizedRegistryIds?: Map<string, string>;
+  optimizeKnownTemplates?: string[];
   cache?: Map<unknown, unknown>;
   hot?: boolean;
   /** @deprecated */

package/dist/config.js

@@ -210,10 +210,10 @@ var _config = _interopRequireDefault(require("./taglib/config"));const config =
    * Enables production mode optimizations if true, or not if false.
    * If left as undefined checks for env === "production".
    */optimize: undefined, /**
-   * If `optimize` is enabled you can provide a Map which the compiler will
-   * use to store shorter registry/template id's in. This can only be used
-   * if the same `optimizedRegistryIds` are used for both server and client compilations.
-   */optimizedRegistryIds: undefined, /**
+   * If `optimize` is enabled you can provide an array of template paths which the compiler will
+   * use to generate shorter registry/template ids using incrementing ids. This can only be used
+   * if the same `optimizeKnownTemplates` are used for both server and client compilations.
+   */optimizeKnownTemplates: undefined, /**
    * This option should be set if `hydrate` output is specified.
    * Maps a virtual dependency to a resolved file which can be implemented
    * for specific bundlers.

package/dist/taglib/finder/index.js

@@ -127,7 +127,9 @@ function find(dirname, registeredTaglibs) {
     });
   }
 
-  found = found.concat(registeredTaglibs);
+  for (const registeredTaglib of registeredTaglibs) {
+    helper.addTaglib(registeredTaglib);
+  }
 
   findCache[dirname] = found;
 

package/dist/taglib/index.js

@@ -1,4 +1,5 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._loader = exports._finder = void 0;exports.buildLookup = buildLookup;exports.clearCaches = clearCaches;exports.excludePackage = exports.excludeDir = void 0;exports.register = register;var _path = _interopRequireDefault(require("path"));
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._loader = exports._finder = void 0;exports.buildLookup = buildLookup;exports.clearCaches = clearCaches;exports.excludePackage = exports.excludeDir = void 0;exports.register = register;exports.resolveOptionalTaglibs = resolveOptionalTaglibs;var _path = _interopRequireDefault(require("path"));
+var _lassoPackageRoot = require("lasso-package-root");
 var _modules = _interopRequireDefault(require("../../modules"));
 var _tryLoadTranslator = _interopRequireDefault(require("../util/try-load-translator"));
 var _config = _interopRequireDefault(require("./config"));
@@ -35,7 +36,9 @@ function buildLookup(dirname, requestedTranslator, onError) {
     loadedTranslatorsTaglibs.set(
       translator,
       taglibsForDir = registeredTaglibs.concat(
-        translator.taglibs.map(([id, props]) => loadTaglib(id, props))
+        resolveOptionalTaglibs(translator.optionalTaglibs || []).
+        concat(translator.taglibs).
+        map(([id, props]) => loadTaglib(id, props))
       )
     );
   }
@@ -80,21 +83,8 @@ function buildLookup(dirname, requestedTranslator, onError) {
 
 function register(id, props) {
   if (typeof props === "undefined") {
-    switch (id[0]) {
-      case ".":
-      case "/":
-      case "\\":
-        break;
-      default:
-        if (!id.endsWith(".json")) {
-          id = _path.default.join(id, "marko.json");
-        }
-        break;
-    }
-    id = _modules.default.require.resolve(id);
-    props = _modules.default.require(id);
+    [id, props] = resolveTaglib(id);
   }
-
   registeredTaglibs.push(loadTaglib(id, props));
 }
 
@@ -104,10 +94,43 @@ function clearCaches() {
   lookupCache = Object.create(null);
 }
 
+function resolveOptionalTaglibs(taglibIds) {
+  const resolvedTaglibs = [];
+  for (const id of taglibIds) {
+    if (hasRootDependency(id)) {
+      resolvedTaglibs.push(resolveTaglib(id));
+    }
+  }
+
+  return resolvedTaglibs;
+}
+
 // Used by legacy compiler api.
 const _loader = exports._loader = _loader2.default;
 const _finder = exports._finder = _finder2.default;
 
 function loadTaglib(id, props) {
   return _loader2.default.loadTaglibFromProps(_loader2.default.createTaglib(id), props);
+}
+
+function resolveTaglib(id) {
+  switch (id[0]) {
+    case ".":
+    case "/":
+    case "\\":
+      break;
+    default:
+      if (!id.endsWith(".json")) {
+        id = _path.default.join(id, "marko.json");
+      }
+      break;
+  }
+
+  const resolved = _modules.default.require.resolve(id);
+  return [resolved, _modules.default.require(resolved)];
+}
+
+function hasRootDependency(id) {
+  const pkg = (0, _lassoPackageRoot.getRootPackage)(process.cwd());
+  return !!(pkg && pkg.dependencies?.[id] || pkg.devDependencies?.[id]);
 }

package/index.d.ts

@@ -67,6 +67,9 @@ export function getRuntimeEntryFiles(
 ): string[];
 
 export namespace taglib {
+  export function resolveOptionalTaglibs(
+    taglibIds: string[],
+  ): [id: string, props: { [x: string]: unknown }][];
   export function excludeDir(dirname: string): void;
   export function excludePackage(packageName: string): void;
   export function register(id: string): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.37.1",
+  "version": "5.37.2",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -80,7 +80,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "@marko/translator-default": "^6.0.2"
+    "@marko/translator-default": "^6.0.3"
   },
   "publishConfig": {
     "access": "public"