@rindo/core 4.18.3-dev.1734304270.ca7046f → 4.19.0-dev.1734909053.96af66b

package/cli/index.cjs

@@ -1,5 +1,5 @@
 /*!
- Rindo CLI (CommonJS) v4.18.3-dev.1734304270.ca7046f | MIT Licensed | https://rindojs.web.app
+ Rindo CLI (CommonJS) v4.19.0-dev.1734909053.96af66b | MIT Licensed | https://rindojs.web.app
  */
 "use strict";
 var __create = Object.create;
@@ -3617,8 +3617,14 @@ var taskGenerate = async (config) => {
     config.logger.error(tagError);
     return config.sys.exit(1);
   }
-  const filesToGenerateExt = await chooseFilesToGenerate();
-  if (void 0 === filesToGenerateExt) {
+  let cssExtension = "css";
+  if (!!config.plugins.find((plugin) => plugin.name === "sass")) {
+    cssExtension = await chooseSassExtension();
+  } else if (!!config.plugins.find((plugin) => plugin.name === "less")) {
+    cssExtension = "less";
+  }
+  const filesToGenerateExt = await chooseFilesToGenerate(cssExtension);
+  if (!filesToGenerateExt) {
     return;
   }
   const extensionsToGenerate = ["tsx", ...filesToGenerateExt];
@@ -3632,7 +3638,13 @@ var taskGenerate = async (config) => {
   await checkForOverwrite(filesToGenerate, config);
   const writtenFiles = await Promise.all(
     filesToGenerate.map(
-      (file) => getBoilerplateAndWriteFile(config, componentName, extensionsToGenerate.includes("css"), file)
+      (file) => getBoilerplateAndWriteFile(
+        config,
+        componentName,
+        extensionsToGenerate.includes("css") || extensionsToGenerate.includes("sass") || extensionsToGenerate.includes("scss") || extensionsToGenerate.includes("less"),
+        file,
+        cssExtension
+      )
     )
   ).catch((error) => config.logger.error(error));
   if (!writtenFiles) {
@@ -3645,22 +3657,34 @@ var taskGenerate = async (config) => {
   const absoluteRootDir = config.rootDir;
   writtenFiles.map((file) => console.log(`  - ${(0, import_path2.relative)(absoluteRootDir, file)}`));
 };
-var chooseFilesToGenerate = async () => {
+var chooseFilesToGenerate = async (cssExtension) => {
   const { prompt } = await Promise.resolve().then(() => __toESM(require_lib()));
   return (await prompt({
     name: "filesToGenerate",
     type: "multiselect",
     message: "Which additional files do you want to generate?",
     choices: [
-      { value: "css", title: "Stylesheet (.css)", selected: true },
+      { value: cssExtension, title: `Stylesheet (.${cssExtension})`, selected: true },
       { value: "spec.tsx", title: "Spec Test  (.spec.tsx)", selected: true },
       { value: "e2e.ts", title: "E2E Test (.e2e.ts)", selected: true }
     ]
   })).filesToGenerate;
 };
+var chooseSassExtension = async () => {
+  const { prompt } = await Promise.resolve().then(() => __toESM(require_lib()));
+  return (await prompt({
+    name: "sassFormat",
+    type: "select",
+    message: "Which Sass format would you like to use? (More info: https://sass-lang.com/documentation/syntax/#the-indented-syntax)",
+    choices: [
+      { value: "sass", title: `*.sass Format`, selected: true },
+      { value: "scss", title: "*.scss Format" }
+    ]
+  })).sassFormat;
+};
 var getFilepathForFile = (filePath, componentName, extension) => isTest2(extension) ? normalizePath((0, import_path2.join)(filePath, "test", `${componentName}.${extension}`)) : normalizePath((0, import_path2.join)(filePath, `${componentName}.${extension}`));
-var getBoilerplateAndWriteFile = async (config, componentName, withCss, file) => {
-  const boilerplate = getBoilerplateByExtension(componentName, file.extension, withCss);
+var getBoilerplateAndWriteFile = async (config, componentName, withCss, file, styleExtension) => {
+  const boilerplate = getBoilerplateByExtension(componentName, file.extension, withCss, styleExtension);
   await config.sys.writeFile(normalizePath(file.path), boilerplate);
   return file.path;
 };
@@ -3684,12 +3708,15 @@ var checkForOverwrite = async (files, config) => {
 var isTest2 = (extension) => {
   return extension === "e2e.ts" || extension === "spec.tsx";
 };
-var getBoilerplateByExtension = (tagName, extension, withCss) => {
+var getBoilerplateByExtension = (tagName, extension, withCss, styleExtension) => {
   switch (extension) {
     case "tsx":
-      return getComponentBoilerplate(tagName, withCss);
+      return getComponentBoilerplate(tagName, withCss, styleExtension);
     case "css":
-      return getStyleUrlBoilerplate();
+    case "less":
+    case "sass":
+    case "scss":
+      return getStyleUrlBoilerplate(styleExtension);
     case "spec.tsx":
       return getSpecTestBoilerplate(tagName);
     case "e2e.ts":
@@ -3698,11 +3725,11 @@ var getBoilerplateByExtension = (tagName, extension, withCss) => {
       throw new Error(`Unkown extension "${extension}".`);
   }
 };
-var getComponentBoilerplate = (tagName, hasStyle) => {
+var getComponentBoilerplate = (tagName, hasStyle, styleExtension) => {
   const decorator = [`{`];
   decorator.push(`  tag: '${tagName}',`);
   if (hasStyle) {
-    decorator.push(`  styleUrl: '${tagName}.css',`);
+    decorator.push(`  styleUrl: '${tagName}.${styleExtension}',`);
   }
   decorator.push(`  shadow: true,`);
   decorator.push(`}`);
@@ -3710,7 +3737,6 @@ var getComponentBoilerplate = (tagName, hasStyle) => {
 
 @Component(${decorator.join("\n")})
 export class ${toPascalCase(tagName)} {
-
   render() {
     return (
       <Host>
@@ -3718,11 +3744,12 @@ export class ${toPascalCase(tagName)} {
       </Host>
     );
   }
-
 }
 `;
 };
-var getStyleUrlBoilerplate = () => `:host {
+var getStyleUrlBoilerplate = (ext) => ext === "sass" ? `:host
+  display: block
+` : `:host {
   display: block;
 }
 `;

package/cli/index.js

@@ -1,5 +1,5 @@
 /*!
- Rindo CLI v4.18.3-dev.1734304270.ca7046f | MIT Licensed | https://rindojs.web.app
+ Rindo CLI v4.19.0-dev.1734909053.96af66b | MIT Licensed | https://rindojs.web.app
  */
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -3611,8 +3611,14 @@ var taskGenerate = async (config) => {
     config.logger.error(tagError);
     return config.sys.exit(1);
   }
-  const filesToGenerateExt = await chooseFilesToGenerate();
-  if (void 0 === filesToGenerateExt) {
+  let cssExtension = "css";
+  if (!!config.plugins.find((plugin) => plugin.name === "sass")) {
+    cssExtension = await chooseSassExtension();
+  } else if (!!config.plugins.find((plugin) => plugin.name === "less")) {
+    cssExtension = "less";
+  }
+  const filesToGenerateExt = await chooseFilesToGenerate(cssExtension);
+  if (!filesToGenerateExt) {
     return;
   }
   const extensionsToGenerate = ["tsx", ...filesToGenerateExt];
@@ -3626,7 +3632,13 @@ var taskGenerate = async (config) => {
   await checkForOverwrite(filesToGenerate, config);
   const writtenFiles = await Promise.all(
     filesToGenerate.map(
-      (file) => getBoilerplateAndWriteFile(config, componentName, extensionsToGenerate.includes("css"), file)
+      (file) => getBoilerplateAndWriteFile(
+        config,
+        componentName,
+        extensionsToGenerate.includes("css") || extensionsToGenerate.includes("sass") || extensionsToGenerate.includes("scss") || extensionsToGenerate.includes("less"),
+        file,
+        cssExtension
+      )
     )
   ).catch((error) => config.logger.error(error));
   if (!writtenFiles) {
@@ -3639,22 +3651,34 @@ var taskGenerate = async (config) => {
   const absoluteRootDir = config.rootDir;
   writtenFiles.map((file) => console.log(`  - ${relative(absoluteRootDir, file)}`));
 };
-var chooseFilesToGenerate = async () => {
+var chooseFilesToGenerate = async (cssExtension) => {
   const { prompt } = await Promise.resolve().then(() => __toESM(require_lib()));
   return (await prompt({
     name: "filesToGenerate",
     type: "multiselect",
     message: "Which additional files do you want to generate?",
     choices: [
-      { value: "css", title: "Stylesheet (.css)", selected: true },
+      { value: cssExtension, title: `Stylesheet (.${cssExtension})`, selected: true },
       { value: "spec.tsx", title: "Spec Test  (.spec.tsx)", selected: true },
       { value: "e2e.ts", title: "E2E Test (.e2e.ts)", selected: true }
     ]
   })).filesToGenerate;
 };
+var chooseSassExtension = async () => {
+  const { prompt } = await Promise.resolve().then(() => __toESM(require_lib()));
+  return (await prompt({
+    name: "sassFormat",
+    type: "select",
+    message: "Which Sass format would you like to use? (More info: https://sass-lang.com/documentation/syntax/#the-indented-syntax)",
+    choices: [
+      { value: "sass", title: `*.sass Format`, selected: true },
+      { value: "scss", title: "*.scss Format" }
+    ]
+  })).sassFormat;
+};
 var getFilepathForFile = (filePath, componentName, extension) => isTest2(extension) ? normalizePath(join2(filePath, "test", `${componentName}.${extension}`)) : normalizePath(join2(filePath, `${componentName}.${extension}`));
-var getBoilerplateAndWriteFile = async (config, componentName, withCss, file) => {
-  const boilerplate = getBoilerplateByExtension(componentName, file.extension, withCss);
+var getBoilerplateAndWriteFile = async (config, componentName, withCss, file, styleExtension) => {
+  const boilerplate = getBoilerplateByExtension(componentName, file.extension, withCss, styleExtension);
   await config.sys.writeFile(normalizePath(file.path), boilerplate);
   return file.path;
 };
@@ -3678,12 +3702,15 @@ var checkForOverwrite = async (files, config) => {
 var isTest2 = (extension) => {
   return extension === "e2e.ts" || extension === "spec.tsx";
 };
-var getBoilerplateByExtension = (tagName, extension, withCss) => {
+var getBoilerplateByExtension = (tagName, extension, withCss, styleExtension) => {
   switch (extension) {
     case "tsx":
-      return getComponentBoilerplate(tagName, withCss);
+      return getComponentBoilerplate(tagName, withCss, styleExtension);
     case "css":
-      return getStyleUrlBoilerplate();
+    case "less":
+    case "sass":
+    case "scss":
+      return getStyleUrlBoilerplate(styleExtension);
     case "spec.tsx":
       return getSpecTestBoilerplate(tagName);
     case "e2e.ts":
@@ -3692,11 +3719,11 @@ var getBoilerplateByExtension = (tagName, extension, withCss) => {
       throw new Error(`Unkown extension "${extension}".`);
   }
 };
-var getComponentBoilerplate = (tagName, hasStyle) => {
+var getComponentBoilerplate = (tagName, hasStyle, styleExtension) => {
   const decorator = [`{`];
   decorator.push(`  tag: '${tagName}',`);
   if (hasStyle) {
-    decorator.push(`  styleUrl: '${tagName}.css',`);
+    decorator.push(`  styleUrl: '${tagName}.${styleExtension}',`);
   }
   decorator.push(`  shadow: true,`);
   decorator.push(`}`);
@@ -3704,7 +3731,6 @@ var getComponentBoilerplate = (tagName, hasStyle) => {
 
 @Component(${decorator.join("\n")})
 export class ${toPascalCase(tagName)} {
-
   render() {
     return (
       <Host>
@@ -3712,11 +3738,12 @@ export class ${toPascalCase(tagName)} {
       </Host>
     );
   }
-
 }
 `;
 };
-var getStyleUrlBoilerplate = () => `:host {
+var getStyleUrlBoilerplate = (ext) => ext === "sass" ? `:host
+  display: block
+` : `:host {
   display: block;
 }
 `;

package/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rindo/core/cli",
-  "version": "4.18.3-dev.1734304270.ca7046f",
+  "version": "4.19.0-dev.1734909053.96af66b",
   "description": "Rindo CLI.",
   "main": "./index.cjs",
   "module": "./index.js",

package/compiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rindo/core/compiler",
-  "version": "4.18.3-dev.1734304270.ca7046f",
+  "version": "4.19.0-dev.1734909053.96af66b",
   "description": "Rindo Compiler.",
   "main": "./rindo.js",
   "types": "./rindo.d.ts",

package/compiler/rindo.js

@@ -1,5 +1,5 @@
 /*!
- Rindo Compiler v4.18.3-dev.1734304270.ca7046f | MIT Licensed | https://rindojs.web.app
+ Rindo Compiler v4.19.0-dev.1734909053.96af66b | MIT Licensed | https://rindojs.web.app
  */
 "use strict";
 var __create = Object.create;
@@ -115662,18 +115662,18 @@ ${lanes.join("\n")}
           0
           /* Call */
         );
-        const isPromise2 = !!getAwaitedTypeOfPromise(type);
-        if (callSignatures.length === 0 && !isPromise2) {
+        const isPromise = !!getAwaitedTypeOfPromise(type);
+        if (callSignatures.length === 0 && !isPromise) {
           return;
         }
         const testedNode = isIdentifier(location) ? location : isPropertyAccessExpression(location) ? location.name : void 0;
         const testedSymbol = testedNode && getSymbolAtLocation(testedNode);
-        if (!testedSymbol && !isPromise2) {
+        if (!testedSymbol && !isPromise) {
           return;
         }
         const isUsed = testedSymbol && isBinaryExpression(condExpr2.parent) && isSymbolUsedInBinaryExpressionChain(condExpr2.parent, testedSymbol) || testedSymbol && body2 && isSymbolUsedInConditionBody(condExpr2, body2, testedNode, testedSymbol);
         if (!isUsed) {
-          if (isPromise2) {
+          if (isPromise) {
             errorAndMaybeSuggestAwait(
               location,
               /*maybeMissingAwait*/
@@ -231091,7 +231091,7 @@ ${e.message}`;
 var typescript_5_4_5_bundle_cache_min_default = ts;
 
 // src/version.ts
-var buildId = "1734304270";
+var buildId = "1734909053";
 var minfyJsId = "terser5.31.1_7";
 var optimizeCssId = "autoprefixer10.4.19_postcss8.4.38_7";
 var parse5Version = "7.1.2";
@@ -231099,8 +231099,8 @@ var rollupVersion = "2.56.3";
 var jqueryVersion = "4.0.0-pre";
 var terserVersion = "5.31.1";
 var typescriptVersion = "5.4.5";
-var vermoji = "\u{1F3C6}";
-var version = "4.18.3-dev.1734304270.ca7046f";
+var vermoji = "\u{1F3CF}";
+var version = "4.19.0-dev.1734909053.96af66b";
 var versions = {
   rindo: version,
   parse5: parse5Version,
@@ -231392,7 +231392,6 @@ var isNumber = (v) => typeof v === "number";
 var isObject = (val) => val != null && typeof val === "object" && Array.isArray(val) === false;
 var isString = (v) => typeof v === "string";
 var isIterable = (v) => isDefined(v) && isFunction(v[Symbol.iterator]);
-var isPromise = (v) => !!v && (typeof v === "object" || typeof v === "function") && typeof v.then === "function";
 
 // src/utils/is-glob.ts
 var isGlob = (str) => {
@@ -234128,7 +234127,7 @@ var TYPE_LIBRARY = {};
 function addToLibrary(type, typeName, checker, pathToTypeModule) {
   pathToTypeModule = relative(process.cwd(), pathToTypeModule);
   if (pathToTypeModule.startsWith("node_modules")) {
-    return "";
+    return "node_modules::" + typeName;
   }
   const id = getTypeId(pathToTypeModule, typeName);
   if (!type.isTypeParameter() && !(id in TYPE_LIBRARY)) {
@@ -248054,10 +248053,17 @@ import { createWorker } from '${WORKER_HELPER_ID}';
 export const workerName = '${workerName}';
 export const workerMsgId = '${workerMsgId}';
 export const workerPath = /*@__PURE__*/import.meta.ROLLUP_FILE_URL_${referenceId};
-const blob = new Blob(['importScripts("' + workerPath + '")'], { type: 'text/javascript' });
-const url = URL.createObjectURL(blob);
-export const worker = /*@__PURE__*/createWorker(url, workerName, workerMsgId);
-URL.revokeObjectURL(url);
+export let worker;
+try {
+  // first try directly starting the worker with the URL
+  worker = /*@__PURE__*/createWorker(workerPath, workerName, workerMsgId);
+} catch(e) {
+  // probably a cross-origin issue, try using a Blob instead
+  const blob = new Blob(['importScripts("' + workerPath + '")'], { type: 'text/javascript' });
+  const url = URL.createObjectURL(blob);
+  worker = /*@__PURE__*/createWorker(url, workerName, workerMsgId);
+  URL.revokeObjectURL(url);
+}
 `;
 };
 var getMockedWorkerMain = () => {
@@ -248189,7 +248195,8 @@ var getRollupOptions = (config, compilerCtx, buildCtx, bundleOpts) => {
     treeshake: getTreeshakeOption(config, bundleOpts),
     preserveEntrySignatures: (_c = bundleOpts.preserveEntrySignatures) != null ? _c : "strict",
     onwarn: createOnWarnFn(buildCtx.diagnostics),
-    cache: compilerCtx.rollupCache.get(bundleOpts.id)
+    cache: compilerCtx.rollupCache.get(bundleOpts.id),
+    external: config.rollupConfig.inputOptions.external
   };
   return rollupOptions;
 };
@@ -249782,7 +249789,7 @@ var getBuildFeatures = (cmps) => {
     member: cmps.some((c) => c.hasMember),
     method: cmps.some((c) => c.hasMethod),
     mode: cmps.some((c) => c.hasMode),
-    observeAttribute: cmps.some((c) => c.hasAttribute),
+    observeAttribute: cmps.some((c) => c.hasAttribute || c.hasWatchCallback),
     prop: cmps.some((c) => c.hasProp),
     propBoolean: cmps.some((c) => c.hasPropBoolean),
     propNumber: cmps.some((c) => c.hasPropNumber),
@@ -250584,12 +250591,17 @@ var writeHydrateOutputs = (config, compilerCtx, buildCtx, outputTargets, rollupO
 var writeHydrateOutput = async (config, compilerCtx, buildCtx, outputTarget, rollupOutput) => {
   const hydratePackageName = await getHydratePackageName(config, compilerCtx);
   const hydrateAppDirPath = outputTarget.dir;
+  if (!hydrateAppDirPath) {
+    throw new Error(`outputTarget config missing the "dir" property`);
+  }
   const hydrateCoreIndexPath = join(hydrateAppDirPath, "index.js");
+  const hydrateCoreIndexPathESM = join(hydrateAppDirPath, "index.mjs");
   const hydrateCoreIndexDtsFilePath = join(hydrateAppDirPath, "index.d.ts");
   const pkgJsonPath = join(hydrateAppDirPath, "package.json");
   const pkgJsonCode = getHydratePackageJson(
     config,
     hydrateCoreIndexPath,
+    hydrateCoreIndexPathESM,
     hydrateCoreIndexDtsFilePath,
     hydratePackageName
   );
@@ -250608,24 +250620,32 @@ var writeHydrateOutput = async (config, compilerCtx, buildCtx, outputTarget, rol
     })
   );
 };
-var getHydratePackageJson = (config, hydrateAppFilePath, hydrateDtsFilePath, hydratePackageName) => {
+var getHydratePackageJson = (config, hydrateAppFilePathCJS, hydrateAppFilePathESM, hydrateDtsFilePath, hydratePackageName) => {
   const pkg = {
     name: hydratePackageName,
     description: `${config.namespace} component hydration app.`,
-    main: (0, import_path26.basename)(hydrateAppFilePath),
-    types: (0, import_path26.basename)(hydrateDtsFilePath)
+    main: (0, import_path26.basename)(hydrateAppFilePathCJS),
+    types: (0, import_path26.basename)(hydrateDtsFilePath),
+    exports: {
+      ".": {
+        require: `./${(0, import_path26.basename)(hydrateAppFilePathCJS)}`,
+        import: `./${(0, import_path26.basename)(hydrateAppFilePathESM)}`
+      }
+    }
   };
   return JSON.stringify(pkg, null, 2);
 };
 var getHydratePackageName = async (config, compilerCtx) => {
+  const directoryName = (0, import_path26.basename)(config.rootDir);
   try {
     const rootPkgFilePath = join(config.rootDir, "package.json");
     const pkgStr = await compilerCtx.fs.readFile(rootPkgFilePath);
     const pkgData = JSON.parse(pkgStr);
-    return `${pkgData.name}/hydrate`;
+    const scope = pkgData.name || directoryName;
+    return `${scope}/hydrate`;
   } catch (e) {
   }
-  return `${config.fsNamespace}/hydrate`;
+  return `${config.fsNamespace || directoryName}/hydrate`;
 };
 var copyHydrateRunnerDts = async (config, compilerCtx, hydrateAppDirPath) => {
   const packageDir = join(config.sys.getCompilerExecutingPath(), "..", "..");
@@ -250635,6 +250655,15 @@ var copyHydrateRunnerDts = async (config, compilerCtx, hydrateAppDirPath) => {
 };
 
 // src/compiler/output-targets/dist-hydrate-script/generate-hydrate-app.ts
+var buildHydrateAppFor = async (format, rollupBuild, config, compilerCtx, buildCtx, outputTargets) => {
+  const file = format === "esm" ? "index.mjs" : "index.js";
+  const rollupOutput = await rollupBuild.generate({
+    banner: generatePreamble(config),
+    format,
+    file
+  });
+  await writeHydrateOutputs(config, compilerCtx, buildCtx, outputTargets, rollupOutput);
+};
 var generateHydrateApp = async (config, compilerCtx, buildCtx, outputTargets) => {
   try {
     const packageDir = join(config.sys.getCompilerExecutingPath(), "..", "..");
@@ -250642,6 +250671,7 @@ var generateHydrateApp = async (config, compilerCtx, buildCtx, outputTargets) =>
     const mockDoc = join(packageDir, "mock-doc", "index.js");
     const rollupOptions = {
       ...config.rollupConfig.inputOptions,
+      external: ["stream"],
       input,
       inlineDynamicImports: true,
       plugins: [
@@ -250668,12 +250698,10 @@ var generateHydrateApp = async (config, compilerCtx, buildCtx, outputTargets) =>
       onwarn: createOnWarnFn(buildCtx.diagnostics)
     };
     const rollupAppBuild = await rollup(rollupOptions);
-    const rollupOutput = await rollupAppBuild.generate({
-      banner: generatePreamble(config),
-      format: "cjs",
-      file: "index.js"
-    });
-    await writeHydrateOutputs(config, compilerCtx, buildCtx, outputTargets, rollupOutput);
+    await Promise.all([
+      buildHydrateAppFor("cjs", rollupAppBuild, config, compilerCtx, buildCtx, outputTargets),
+      buildHydrateAppFor("esm", rollupAppBuild, config, compilerCtx, buildCtx, outputTargets)
+    ]);
   } catch (e) {
     if (!buildCtx.hasError) {
       loadRollupDiagnostics(config, compilerCtx, buildCtx, e);
@@ -252653,7 +252681,7 @@ var validateRollupConfig = (config) => {
   if (rollupConfig.inputOptions && isObject(rollupConfig.inputOptions)) {
     cleanRollupConfig = {
       ...cleanRollupConfig,
-      inputOptions: pluck(rollupConfig.inputOptions, ["context", "moduleContext", "treeshake"])
+      inputOptions: pluck(rollupConfig.inputOptions, ["context", "moduleContext", "treeshake", "external"])
     };
   }
   if (rollupConfig.outputOptions && isObject(rollupConfig.outputOptions)) {
@@ -254203,6 +254231,9 @@ export interface CustomElementsDefineOptions {
   rel?: (el: EventTarget, eventName: string, listener: EventListenerOrEventListenerObject, options: boolean | AddEventListenerOptions) => void;
 }
 export declare function defineCustomElements(win?: Window, opts?: CustomElementsDefineOptions): void;
+/**
+ * @deprecated
+ */
 export declare function applyPolyfills(): Promise<void>;
 
 /**
@@ -254398,7 +254429,7 @@ var updateTypeName = (currentTypeName, typeAlias) => {
     return currentTypeName;
   }
   const endingStrChar = "(?!(\"|'|`))";
-  const typeNameRegex = new RegExp(`${typeAlias.localName}\\b${endingStrChar}`, "g");
+  const typeNameRegex = new RegExp(`\\b${typeAlias.localName}\\b${endingStrChar}`, "g");
   return currentTypeName.replace(typeNameRegex, typeAlias.importName);
 };
 var copyRindoCoreDts = async (config, compilerCtx) => {
@@ -254693,6 +254724,9 @@ var updateImportReferenceFactory = (typeCounts, filePath, config) => {
       }
       const newTypeName = getIncrementTypeName(typeName);
       existingTypeImportData[importResolvedFile].push({
+        // Since we create a unique ID for each type for documentation generation purposes, we can parse
+        // that ID to get the original name for the export
+        originalName: typeReference.id.split("::").pop(),
         localName: typeName,
         importName: newTypeName
       });
@@ -254744,10 +254778,10 @@ var generateComponentTypesFile = (config, buildCtx, areTypesInternal) => {
       importFilePath = normalizePath("./" + relative(config.srcDir, filePath)).replace(/\.(tsx|ts)$/, "");
     }
     return `{ ${typeData.sort(sortImportNames).map((td2) => {
-      if (td2.localName === td2.importName) {
-        return `${td2.importName}`;
+      if (td2.originalName === td2.importName) {
+        return `${td2.originalName}`;
       } else {
-        return `${td2.localName} as ${td2.importName}`;
+        return `${td2.originalName} as ${td2.importName}`;
       }
     }).join(`, `)} } from "${importFilePath}";`;
   });
@@ -261945,10 +261979,7 @@ var prerenderWorker = async (sys, prerenderRequest) => {
     }
     if (typeof prerenderConfig.beforeHydrate === "function") {
       try {
-        const rtn = prerenderConfig.beforeHydrate(doc, url);
-        if (isPromise(rtn)) {
-          await rtn;
-        }
+        await prerenderConfig.beforeHydrate(doc, url);
       } catch (e) {
         catchError(results.diagnostics, e);
       }
@@ -261973,7 +262004,7 @@ var prerenderWorker = async (sys, prerenderRequest) => {
         excludeStaticComponents(doc, hydrateOpts, hydrateResults);
       }
       if (hydrateOpts.addModulePreloads) {
-        if (!prerenderRequest.isDebug) {
+        if (!prerenderRequest.isDebug && componentGraph) {
           addModulePreloads(doc, hydrateOpts, hydrateResults, componentGraph);
         }
       } else {
@@ -262010,10 +262041,7 @@ var prerenderWorker = async (sys, prerenderRequest) => {
     }
     if (typeof prerenderConfig.afterHydrate === "function") {
       try {
-        const rtn = prerenderConfig.afterHydrate(doc, url, results);
-        if (isPromise(rtn)) {
-          await rtn;
-        }
+        await prerenderConfig.afterHydrate(doc, url, results);
       } catch (e) {
         catchError(results.diagnostics, e);
       }
@@ -262025,7 +262053,7 @@ var prerenderWorker = async (sys, prerenderRequest) => {
       }
       return results;
     }
-    const html = hydrateApp.serializeDocumentToString(doc, hydrateOpts);
+    const html = await hydrateApp.serializeDocumentToString(doc, hydrateOpts);
     prerenderEnsureDir(sys, prerenderCtx2, results.filePath);
     const writePromise = sys.writeFile(results.filePath, html);
     if (Array.isArray(hydrateResults.staticData) && hydrateResults.staticData.length > 0) {
@@ -262725,17 +262753,13 @@ var prerenderUrl = async (results, manager, url) => {
 var import_mock_doc3 = require("../mock-doc/index.cjs");
 var generateTemplateHtml = async (config, prerenderConfig, diagnostics, isDebug, srcIndexHtmlPath, outputTarget, hydrateOpts, manager) => {
   try {
-    if (!isString(srcIndexHtmlPath)) {
+    if (!isString(srcIndexHtmlPath) && outputTarget.indexHtml) {
       srcIndexHtmlPath = outputTarget.indexHtml;
     }
     let templateHtml;
     if (isFunction(prerenderConfig.loadTemplate)) {
       const loadTemplateResult = prerenderConfig.loadTemplate(srcIndexHtmlPath);
-      if (isPromise(loadTemplateResult)) {
-        templateHtml = await loadTemplateResult;
-      } else {
-        templateHtml = loadTemplateResult;
-      }
+      templateHtml = await loadTemplateResult;
     } else {
       templateHtml = await config.sys.readFile(srcIndexHtmlPath);
     }
@@ -262748,7 +262772,7 @@ var generateTemplateHtml = async (config, prerenderConfig, diagnostics, isDebug,
       staticSite = !hasRindoScript(doc);
     }
     doc.documentElement.classList.add("hydrated");
-    if (hydrateOpts.inlineExternalStyleSheets && !isDebug) {
+    if (hydrateOpts.inlineExternalStyleSheets && !isDebug && outputTarget.appDir) {
       try {
         await inlineExternalStyleSheets(config.sys, outputTarget.appDir, doc);
       } catch (e) {
@@ -262762,7 +262786,7 @@ var generateTemplateHtml = async (config, prerenderConfig, diagnostics, isDebug,
         catchError(diagnostics, e);
       }
     }
-    if (hydrateOpts.minifyStyleElements && !isDebug) {
+    if (hydrateOpts.minifyStyleElements && !isDebug && outputTarget.baseUrl) {
       try {
         const baseUrl = new URL(outputTarget.baseUrl, manager.devServerHostUrl);
         await minifyStyleElements(config.sys, outputTarget.appDir, doc, baseUrl, true);
@@ -262772,20 +262796,12 @@ var generateTemplateHtml = async (config, prerenderConfig, diagnostics, isDebug,
     }
     if (isFunction(prerenderConfig.beforeSerializeTemplate)) {
       const beforeSerializeResults = prerenderConfig.beforeSerializeTemplate(doc);
-      if (isPromise(beforeSerializeResults)) {
-        doc = await beforeSerializeResults;
-      } else {
-        doc = beforeSerializeResults;
-      }
+      doc = await beforeSerializeResults;
     }
     let html = (0, import_mock_doc3.serializeNodeToHtml)(doc);
     if (isFunction(prerenderConfig.afterSerializeTemplate)) {
       const afterSerializeResults = prerenderConfig.afterSerializeTemplate(html);
-      if (isPromise(afterSerializeResults)) {
-        html = await afterSerializeResults;
-      } else {
-        html = afterSerializeResults;
-      }
+      html = await afterSerializeResults;
     }
     return {
       html,

package/dev-server/client/index.js

@@ -1,5 +1,5 @@
 /*!
- Rindo Dev Server Client v4.18.3-dev.1734304270.ca7046f | MIT Licensed | https://rindojs.web.app
+ Rindo Dev Server Client v4.19.0-dev.1734909053.96af66b | MIT Licensed | https://rindojs.web.app
  */
 
 // src/dev-server/client/app-error.css

package/dev-server/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rindo/core/dev-server/client",
-  "version": "4.18.3-dev.1734304270.ca7046f",
+  "version": "4.19.0-dev.1734909053.96af66b",
   "description": "Rindo Dev Server Client.",
   "main": "./index.js",
   "types": "./index.d.ts",