@lwrjs/tools 0.13.0-alpha.2 → 0.13.0-alpha.20

package/build/cjs/index.cjs

@@ -25,7 +25,7 @@ var __toModule = (module2) => {
 __markAsModule(exports);
 __export(exports, {
   buildServer: () => import_server_build.buildServer,
-  dedupeBundles: () => import_dedupe_bundles.dedupeBundles
+  dedupeBundles: () => import_static.dedupeBundles
 });
 var import_server_build = __toModule(require("./server-build.cjs"));
-var import_dedupe_bundles = __toModule(require("./dedupe-bundles.cjs"));
+var import_static = __toModule(require("@lwrjs/static"));

package/build/es/index.d.ts

@@ -1,3 +1,3 @@
 export { buildServer } from './server-build.js';
-export { dedupeBundles } from './dedupe-bundles.js';
+export { dedupeBundles } from '@lwrjs/static';
 //# sourceMappingURL=index.d.ts.map

package/build/es/index.js

@@ -1,3 +1,3 @@
 export { buildServer } from './server-build.js';
-export { dedupeBundles } from './dedupe-bundles.js';
+export { dedupeBundles } from '@lwrjs/static';
 //# sourceMappingURL=index.js.map

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.13.0-alpha.2",
+    "version": "0.13.0-alpha.20",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -18,7 +18,9 @@
     "types": "build/es/index.d.ts",
     "module": "build/es/index.js",
     "scripts": {
-        "build": "tsc -b"
+        "build": "tsc -b",
+        "clean": "rm -rf build node_modules",
+        "test": "jest"
     },
     "exports": {
         ".": {
@@ -32,16 +34,19 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/config": "0.13.0-alpha.2",
-        "@lwrjs/core": "0.13.0-alpha.2",
-        "@lwrjs/diagnostics": "0.13.0-alpha.2",
-        "@lwrjs/shared-utils": "0.13.0-alpha.2",
+        "@lwrjs/config": "0.13.0-alpha.20",
+        "@lwrjs/core": "0.13.0-alpha.20",
+        "@lwrjs/diagnostics": "0.13.0-alpha.20",
+        "@lwrjs/shared-utils": "0.13.0-alpha.20",
+        "@lwrjs/static": "0.13.0-alpha.20",
         "esbuild": "^0.17.4",
         "fs-extra": "^11.2.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.13.0-alpha.2",
-        "mock-fs": "^5.2.0"
+        "@lwrjs/types": "0.13.0-alpha.20",
+        "jest": "^26.6.3",
+        "mock-fs": "^5.2.0",
+        "ts-jest": "^26.5.6"
     },
     "peerDependencies": {
         "lwc": ">= 2.x"
@@ -49,5 +54,8 @@
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "3ae1051ef1eb282f9c1fb54f6aab44ab5ba48480"
+    "volta": {
+        "extends": "../../../package.json"
+    },
+    "gitHead": "2165594f2871f4f20a4083394e4372e67d1fa1b5"
 }

package/build/cjs/dedupe-bundles.cjs

@@ -1,148 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __markAsModule = (target) => __defProp(target, "__esModule", {value: true});
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, {get: all[name], enumerable: true});
-};
-var __exportStar = (target, module2, desc) => {
-  if (module2 && typeof module2 === "object" || typeof module2 === "function") {
-    for (let key of __getOwnPropNames(module2))
-      if (!__hasOwnProp.call(target, key) && key !== "default")
-        __defProp(target, key, {get: () => module2[key], enumerable: !(desc = __getOwnPropDesc(module2, key)) || desc.enumerable});
-  }
-  return target;
-};
-var __toModule = (module2) => {
-  return __exportStar(__markAsModule(__defProp(module2 != null ? __create(__getProtoOf(module2)) : {}, "default", module2 && module2.__esModule && "default" in module2 ? {get: () => module2.default, enumerable: true} : {value: module2, enumerable: true})), module2);
-};
-
-// packages/@lwrjs/tools/src/dedupe-bundles.ts
-__markAsModule(exports);
-__export(exports, {
-  dedupeBundles: () => dedupeBundles
-});
-var import_fs_extra = __toModule(require("fs-extra"));
-var import_path = __toModule(require("path"));
-var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var DEFAULT_KEY = "default";
-async function dedupeBundles(siteRoot, i18n) {
-  const bundleMetadataFilePath = import_path.default.join(siteRoot, "/.metadata/bundle-metadata.json");
-  const siteBundles = await import_fs_extra.default.readJSON(bundleMetadataFilePath);
-  import_diagnostics.logger.info({
-    label: `dedupeBundles`,
-    message: `Deduplicating ${Object.keys(siteBundles.bundles).length} bundles`
-  });
-  const groupedBundles = groupBundlesByLocales(siteBundles);
-  import_diagnostics.logger.debug({
-    label: `dedupeBundles`,
-    message: `Found ${Object.keys(groupedBundles).length} grouped bundles`
-  });
-  const updatedBundleMetadata = {bundles: {}};
-  const updatedBundles = updatedBundleMetadata.bundles;
-  for (const specifier of Object.keys(groupedBundles)) {
-    const variants = groupedBundles[specifier];
-    const defaultVariant = variants[DEFAULT_KEY];
-    if (defaultVariant) {
-      updatedBundles[specifier] = defaultVariant;
-      const defaultSource = String(import_fs_extra.default.readFileSync(import_path.default.join(siteRoot, defaultVariant.path)));
-      for (const variantKey of Object.keys(variants)) {
-        if (variantKey !== DEFAULT_KEY) {
-          let dedupeSource = false;
-          const variant = variants[variantKey];
-          const variantSource = String(import_fs_extra.default.readFileSync(import_path.default.join(siteRoot, variant.path)));
-          const localeId = extractLocale(variantKey);
-          if (localeId) {
-            dedupeSource = await (0, import_shared_utils.walkLocaleFallbacks)(localeId, i18n, async (curLocale) => {
-              if (curLocale === localeId) {
-                return false;
-              }
-              if (curLocale === i18n.defaultLocale) {
-                return variantSource === defaultSource;
-              }
-              const curVariant = variants[`l/${curLocale}`];
-              if (curVariant) {
-                const curPath = import_path.default.join(siteRoot, curVariant.path);
-                if (await import_fs_extra.default.pathExists(curPath)) {
-                  const curVariantSource = String(import_fs_extra.default.readFileSync(curPath));
-                  return variantSource === curVariantSource;
-                }
-              }
-              return false;
-            });
-          }
-          if (dedupeSource) {
-            import_diagnostics.logger.debug({
-              label: `dedupeBundles`,
-              message: `Remove duplicate variant ${specifier}|${variantKey}`
-            });
-            import_fs_extra.default.removeSync(import_path.default.join(siteRoot, variant.path));
-          } else {
-            const variant2 = variants[variantKey];
-            updatedBundles[`${specifier}|${variantKey}`] = variant2;
-          }
-        }
-      }
-    }
-  }
-  import_diagnostics.logger.info({
-    label: `dedupeBundles`,
-    message: `Deduplicated down to ${Object.keys(updatedBundleMetadata.bundles).length} bundles`
-  });
-  await import_fs_extra.default.writeJSON(bundleMetadataFilePath, updatedBundleMetadata, {spaces: 2});
-  deleteEmptyFolders(siteRoot);
-}
-var LOCALE_PATTERN = /(?:^|\/)l\/([\w-_]+)/;
-function extractLocale(variantKey) {
-  const match = variantKey.match(LOCALE_PATTERN);
-  if (match) {
-    return match[1];
-  }
-  return void 0;
-}
-function groupBundlesByLocales(siteBundles) {
-  const groupedBundles = {};
-  for (const specifier of Object.keys(siteBundles.bundles)) {
-    const parts = specifier.split("|");
-    const firstPart = parts[0];
-    const secondPart = parts.length > 1 ? parts[1] : DEFAULT_KEY;
-    import_diagnostics.logger.debug({
-      label: `dedupeBundles`,
-      message: `${specifier} -> groupedBundles[${firstPart}][${secondPart}]`
-    });
-    if (!groupedBundles[firstPart]) {
-      groupedBundles[firstPart] = {};
-    }
-    groupedBundles[firstPart][secondPart] = siteBundles.bundles[specifier];
-  }
-  return groupedBundles;
-}
-function deleteEmptyFolders(directory) {
-  if (!import_fs_extra.default.existsSync(directory)) {
-    import_diagnostics.logger.warn({label: `dedupeBundles`, message: `Directory does not exist: ${directory}`});
-    return;
-  }
-  const files = import_fs_extra.default.readdirSync(directory);
-  if (files.length === 0) {
-    import_fs_extra.default.rmdirSync(directory);
-    import_diagnostics.logger.debug({label: `dedupeBundles`, message: `Deleted empty folder: ${directory}`});
-    return;
-  }
-  files.forEach((file) => {
-    const filePath = import_path.default.join(directory, file);
-    const isDirectory = import_fs_extra.default.statSync(filePath).isDirectory();
-    if (isDirectory) {
-      deleteEmptyFolders(filePath);
-    }
-  });
-  const updatedFiles = import_fs_extra.default.readdirSync(directory);
-  if (updatedFiles.length === 0) {
-    import_fs_extra.default.rmdirSync(directory);
-    import_diagnostics.logger.debug({label: `dedupeBundles`, message: `Deleted empty folder: ${directory}`});
-  }
-}

package/build/es/dedupe-bundles.d.ts

@@ -1,8 +0,0 @@
-import type { I18NConfig } from '@lwrjs/types';
-/**
- * De-duplicate generated bundles
- *
- * @param siteRoot The root folder for generated bundles
- */
-export declare function dedupeBundles(siteRoot: string, i18n: I18NConfig): Promise<void>;
-//# sourceMappingURL=dedupe-bundles.d.ts.map

package/build/es/dedupe-bundles.js

@@ -1,145 +0,0 @@
-import fs from 'fs-extra';
-import path from 'path';
-import { logger } from '@lwrjs/diagnostics';
-import { walkLocaleFallbacks } from '@lwrjs/shared-utils';
-const DEFAULT_KEY = 'default';
-/**
- * De-duplicate generated bundles
- *
- * @param siteRoot The root folder for generated bundles
- */
-export async function dedupeBundles(siteRoot, i18n) {
-    // Read the bundle site metadata
-    const bundleMetadataFilePath = path.join(siteRoot, '/.metadata/bundle-metadata.json');
-    const siteBundles = await fs.readJSON(bundleMetadataFilePath);
-    logger.info({
-        label: `dedupeBundles`,
-        message: `Deduplicating ${Object.keys(siteBundles.bundles).length} bundles`,
-    });
-    // Group the bundles by locale
-    const groupedBundles = groupBundlesByLocales(siteBundles);
-    logger.debug({
-        label: `dedupeBundles`,
-        message: `Found ${Object.keys(groupedBundles).length} grouped bundles`,
-    });
-    const updatedBundleMetadata = { bundles: {} };
-    const updatedBundles = updatedBundleMetadata.bundles;
-    for (const specifier of Object.keys(groupedBundles)) {
-        const variants = groupedBundles[specifier];
-        const defaultVariant = variants[DEFAULT_KEY];
-        if (defaultVariant) {
-            updatedBundles[specifier] = defaultVariant;
-            const defaultSource = String(fs.readFileSync(path.join(siteRoot, defaultVariant.path)));
-            // Wite out each variant
-            for (const variantKey of Object.keys(variants)) {
-                if (variantKey !== DEFAULT_KEY) {
-                    // Find the first source that does not match its parent
-                    let dedupeSource = false;
-                    // Read the current variant source
-                    const variant = variants[variantKey];
-                    const variantSource = String(fs.readFileSync(path.join(siteRoot, variant.path)));
-                    const localeId = extractLocale(variantKey);
-                    // If this locale is n
-                    if (localeId) {
-                        // eslint-disable-next-line no-await-in-loop
-                        dedupeSource = await walkLocaleFallbacks(localeId, i18n, async (curLocale) => {
-                            // If this is the current locale skip
-                            if (curLocale === localeId) {
-                                return false;
-                            }
-                            // If this is a default local test against the read default
-                            if (curLocale === i18n.defaultLocale) {
-                                return variantSource === defaultSource;
-                            }
-                            // See if there is a variant for the current locale
-                            const curVariant = variants[`l/${curLocale}`];
-                            if (curVariant) {
-                                const curPath = path.join(siteRoot, curVariant.path);
-                                if (await fs.pathExists(curPath)) {
-                                    const curVariantSource = String(fs.readFileSync(curPath));
-                                    return variantSource === curVariantSource;
-                                }
-                            }
-                            return false;
-                        });
-                    }
-                    if (dedupeSource) {
-                        logger.debug({
-                            label: `dedupeBundles`,
-                            message: `Remove duplicate variant ${specifier}|${variantKey}`,
-                        });
-                        fs.removeSync(path.join(siteRoot, variant.path));
-                    }
-                    else {
-                        // keep the variant in the metadata
-                        const variant = variants[variantKey];
-                        updatedBundles[`${specifier}|${variantKey}`] = variant;
-                    }
-                }
-            }
-        }
-    }
-    logger.info({
-        label: `dedupeBundles`,
-        message: `Deduplicated down to ${Object.keys(updatedBundleMetadata.bundles).length} bundles`,
-    });
-    // Save the updated bundle metadata
-    await fs.writeJSON(bundleMetadataFilePath, updatedBundleMetadata, { spaces: 2 });
-    // Clean up empty folders
-    deleteEmptyFolders(siteRoot);
-}
-const LOCALE_PATTERN = /(?:^|\/)l\/([\w-_]+)/;
-/**
- * Extract the locale definition from a variant key 'l/{localeId}'
- */
-function extractLocale(variantKey) {
-    const match = variantKey.match(LOCALE_PATTERN);
-    if (match) {
-        return match[1]; // The 'key' is captured in the first capture group
-    }
-    return undefined;
-}
-function groupBundlesByLocales(siteBundles) {
-    const groupedBundles = {};
-    for (const specifier of Object.keys(siteBundles.bundles)) {
-        const parts = specifier.split('|');
-        // Extract the desired parts
-        const firstPart = parts[0];
-        const secondPart = parts.length > 1 ? parts[1] : DEFAULT_KEY;
-        logger.debug({
-            label: `dedupeBundles`,
-            message: `${specifier} -> groupedBundles[${firstPart}][${secondPart}]`,
-        });
-        if (!groupedBundles[firstPart]) {
-            groupedBundles[firstPart] = {};
-        }
-        groupedBundles[firstPart][secondPart] = siteBundles.bundles[specifier];
-    }
-    return groupedBundles;
-}
-function deleteEmptyFolders(directory) {
-    if (!fs.existsSync(directory)) {
-        logger.warn({ label: `dedupeBundles`, message: `Directory does not exist: ${directory}` });
-        return;
-    }
-    const files = fs.readdirSync(directory);
-    if (files.length === 0) {
-        fs.rmdirSync(directory);
-        logger.debug({ label: `dedupeBundles`, message: `Deleted empty folder: ${directory}` });
-        return;
-    }
-    files.forEach((file) => {
-        const filePath = path.join(directory, file);
-        const isDirectory = fs.statSync(filePath).isDirectory();
-        if (isDirectory) {
-            deleteEmptyFolders(filePath);
-        }
-    });
-    // Check if the directory is empty after deleting its subdirectories
-    const updatedFiles = fs.readdirSync(directory);
-    if (updatedFiles.length === 0) {
-        fs.rmdirSync(directory);
-        logger.debug({ label: `dedupeBundles`, message: `Deleted empty folder: ${directory}` });
-    }
-}
-//# sourceMappingURL=dedupe-bundles.js.map