@lwrjs/core 0.9.0-alpha.12 → 0.9.0-alpha.13

package/build/es/tools/static-generation.js

@@ -4,7 +4,7 @@ import { join, dirname, extname } from 'path';
 import fs from 'fs-extra';
 import { writeResponse } from './utils/stream.js';
 import { createDir, createResourceDir } from './utils/dir.js';
-import { explodeMode } from '@lwrjs/config';
+import { getRuntimeEnvironment } from '@lwrjs/config';
 export default class SiteGenerator {
     /**
      * Build a static site in the configured directory
@@ -26,18 +26,16 @@ export default class SiteGenerator {
             staticSiteGenerator.outputDir = '__generated_site__';
         }
         const outputDir = join(rootDir, staticSiteGenerator.outputDir);
-        logger.info(`Clear Output Location: ${outputDir}`);
-        fs.rmSync(outputDir, { recursive: true, force: true });
+        if (!staticSiteGenerator.skipCleanOutputDir) {
+            logger.info(`Clearing output directory: ${outputDir}`);
+            fs.rmSync(outputDir, { recursive: true, force: true });
+        }
+        else {
+            logger.info(`Reusing existing output directory: ${outputDir}`);
+        }
         const urlRewriteMap = new Map();
-        const { apiVersion, basePath, lwrVersion, serverMode } = config;
-        const runtimeEnvironment = {
-            ...explodeMode(serverMode),
-            apiVersion,
-            basePath,
-            lwrVersion,
-            debug: false,
-            serverMode,
-        };
+        const { basePath } = config;
+        const runtimeEnvironment = getRuntimeEnvironment(config);
         // For each locale, generate all the modules
         await this.generateRoutes(runtimeEnvironment, staticSiteGenerator, routes, basePath, dispatcher, outputDir, urlRewriteMap);
         // Write redirect files

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.9.0-alpha.12",
+    "version": "0.9.0-alpha.13",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -36,30 +36,31 @@
         "package.cjs"
     ],
     "dependencies": {
-        "@lwrjs/app-service": "0.9.0-alpha.12",
-        "@lwrjs/asset-registry": "0.9.0-alpha.12",
-        "@lwrjs/asset-transformer": "0.9.0-alpha.12",
-        "@lwrjs/base-view-provider": "0.9.0-alpha.12",
-        "@lwrjs/base-view-transformer": "0.9.0-alpha.12",
-        "@lwrjs/client-modules": "0.9.0-alpha.12",
-        "@lwrjs/compiler": "0.9.0-alpha.12",
-        "@lwrjs/config": "0.9.0-alpha.12",
-        "@lwrjs/diagnostics": "0.9.0-alpha.12",
-        "@lwrjs/fs-asset-provider": "0.9.0-alpha.12",
-        "@lwrjs/html-view-provider": "0.9.0-alpha.12",
-        "@lwrjs/loader": "0.9.0-alpha.12",
-        "@lwrjs/lwc-module-provider": "0.9.0-alpha.12",
-        "@lwrjs/markdown-view-provider": "0.9.0-alpha.12",
-        "@lwrjs/module-bundler": "0.9.0-alpha.12",
-        "@lwrjs/module-registry": "0.9.0-alpha.12",
-        "@lwrjs/npm-module-provider": "0.9.0-alpha.12",
-        "@lwrjs/nunjucks-view-provider": "0.9.0-alpha.12",
-        "@lwrjs/o11y": "0.9.0-alpha.12",
-        "@lwrjs/resource-registry": "0.9.0-alpha.12",
-        "@lwrjs/router": "0.9.0-alpha.12",
-        "@lwrjs/server": "0.9.0-alpha.12",
-        "@lwrjs/shared-utils": "0.9.0-alpha.12",
-        "@lwrjs/view-registry": "0.9.0-alpha.12",
+        "@lwrjs/app-service": "0.9.0-alpha.13",
+        "@lwrjs/asset-registry": "0.9.0-alpha.13",
+        "@lwrjs/asset-transformer": "0.9.0-alpha.13",
+        "@lwrjs/base-view-provider": "0.9.0-alpha.13",
+        "@lwrjs/base-view-transformer": "0.9.0-alpha.13",
+        "@lwrjs/client-modules": "0.9.0-alpha.13",
+        "@lwrjs/compiler": "0.9.0-alpha.13",
+        "@lwrjs/config": "0.9.0-alpha.13",
+        "@lwrjs/diagnostics": "0.9.0-alpha.13",
+        "@lwrjs/fs-asset-provider": "0.9.0-alpha.13",
+        "@lwrjs/html-view-provider": "0.9.0-alpha.13",
+        "@lwrjs/loader": "0.9.0-alpha.13",
+        "@lwrjs/lwc-module-provider": "0.9.0-alpha.13",
+        "@lwrjs/markdown-view-provider": "0.9.0-alpha.13",
+        "@lwrjs/module-bundler": "0.9.0-alpha.13",
+        "@lwrjs/module-registry": "0.9.0-alpha.13",
+        "@lwrjs/npm-module-provider": "0.9.0-alpha.13",
+        "@lwrjs/nunjucks-view-provider": "0.9.0-alpha.13",
+        "@lwrjs/o11y": "0.9.0-alpha.13",
+        "@lwrjs/resource-registry": "0.9.0-alpha.13",
+        "@lwrjs/router": "0.9.0-alpha.13",
+        "@lwrjs/server": "0.9.0-alpha.13",
+        "@lwrjs/shared-utils": "0.9.0-alpha.13",
+        "@lwrjs/view-registry": "0.9.0-alpha.13",
+        "chokidar": "^3.5.3",
         "esbuild": "^0.9.7",
         "fs-extra": "^10.1.0",
         "path-to-regexp": "^6.2.0",
@@ -67,7 +68,7 @@
         "ws": "^8.8.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.9.0-alpha.12",
+        "@lwrjs/types": "0.9.0-alpha.13",
         "@types/ws": "^8.5.3"
     },
     "peerDependencies": {
@@ -76,5 +77,5 @@
     "engines": {
         "node": ">=14.15.4 <19"
     },
-    "gitHead": "f532aa80039acf04e9ad511ed090a2b368837014"
+    "gitHead": "fa30915a685f6e8c5c2895d0c053d59145780123"
 }

package/build/cjs/context/configurations.cjs

@@ -1,82 +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/core/src/context/configurations.ts
-__markAsModule(exports);
-__export(exports, {
-  resolveConfigurations: () => resolveConfigurations
-});
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-var import_config = __toModule(require("@lwrjs/config"));
-var import_global_data = __toModule(require("./global-data.cjs"));
-var import_services = __toModule(require("./services.cjs"));
-function normalizeRoutesBootstrap({routes, errorRoutes}) {
-  [...routes, ...errorRoutes].forEach((route) => {
-    if (!route.bootstrap) {
-      route.bootstrap = {...import_shared_utils.DEFAULT_LWR_BOOTSTRAP_CONFIG};
-    }
-  });
-}
-async function runConfigurationsHook(hookPlugins, appConfig, globalData, runtimeEnvironment) {
-  for (const hookPlugin of hookPlugins) {
-    await hookPlugin.initConfigs(appConfig, globalData, runtimeEnvironment);
-  }
-  try {
-    (0, import_config.validateLwrAppConfig)(JSON.stringify(appConfig), "post");
-  } catch (e) {
-    if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === "true") {
-      import_shared_utils.logger.warn("ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution");
-      console.dir(e, {depth: null});
-    } else {
-      throw e;
-    }
-  }
-  normalizeRoutesBootstrap(appConfig);
-  return {
-    appConfig,
-    globalData,
-    runtimeEnvironment
-  };
-}
-async function resolveConfigurations(config) {
-  const {
-    apiVersion,
-    basePath,
-    lwrVersion,
-    serverMode,
-    globalDataDir,
-    globalData: globalDataConfig
-  } = config;
-  const globalData = (0, import_global_data.getGlobalData)(globalDataDir, globalDataConfig);
-  const runtimeEnvironment = {
-    ...(0, import_config.explodeMode)(serverMode),
-    apiVersion,
-    basePath,
-    lwrVersion,
-    debug: false,
-    serverMode,
-    featureFlags: (0, import_shared_utils.getFeatureFlags)()
-  };
-  const hookProviders = await (0, import_services.getServices)(config.hooks, void 0, config);
-  return runConfigurationsHook(hookProviders, config, globalData, runtimeEnvironment);
-}

package/build/cjs/context/global-data.cjs

@@ -1,54 +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/core/src/context/global-data.ts
-__markAsModule(exports);
-__export(exports, {
-  getGlobalData: () => getGlobalData
-});
-var import_fs = __toModule(require("fs"));
-var import_path = __toModule(require("path"));
-function recursiveJsonCollector(resources, currentPath, collector) {
-  for (const resource of resources) {
-    const resourcePath = import_path.default.join(currentPath, resource);
-    if (resource.endsWith(".json")) {
-      const resourceName = import_path.default.basename(resource, ".json");
-      const jsonSource = JSON.parse(import_fs.default.readFileSync(resourcePath, "utf-8"));
-      collector[resourceName] = jsonSource;
-    } else if (import_fs.default.statSync(resourcePath).isDirectory()) {
-      const dirContentList = import_fs.default.readdirSync(resourcePath);
-      collector[resource] = recursiveJsonCollector(dirContentList, resourcePath, {});
-    }
-  }
-  return collector;
-}
-function getGlobalData(globalDataDir, defaultData = {}) {
-  if (!import_fs.default.existsSync(globalDataDir) || !import_fs.default.statSync(globalDataDir).isDirectory()) {
-    return defaultData;
-  }
-  const dirContentList = import_fs.default.readdirSync(globalDataDir);
-  return {
-    ...recursiveJsonCollector(dirContentList, globalDataDir, {}),
-    ...defaultData
-  };
-}

package/build/es/context/configurations.d.ts

@@ -1,9 +0,0 @@
-import { NormalizedLwrGlobalConfig, RuntimeEnvironment, GlobalData } from '@lwrjs/types';
-interface Configurations {
-    appConfig: NormalizedLwrGlobalConfig;
-    globalData: GlobalData;
-    runtimeEnvironment: RuntimeEnvironment;
-}
-export declare function resolveConfigurations(config: NormalizedLwrGlobalConfig): Promise<Configurations>;
-export {};
-//# sourceMappingURL=configurations.d.ts.map

package/build/es/context/configurations.js

@@ -1,53 +0,0 @@
-import { DEFAULT_LWR_BOOTSTRAP_CONFIG, getFeatureFlags, logger } from '@lwrjs/shared-utils';
-import { explodeMode, validateLwrAppConfig } from '@lwrjs/config';
-import { getGlobalData } from './global-data.js';
-import { getServices } from './services.js';
-// Add missing bootstrap objects to routes
-function normalizeRoutesBootstrap({ routes, errorRoutes }) {
-    [...routes, ...errorRoutes].forEach((route) => {
-        if (!route.bootstrap) {
-            route.bootstrap = { ...DEFAULT_LWR_BOOTSTRAP_CONFIG };
-        }
-    });
-}
-async function runConfigurationsHook(hookPlugins, appConfig, globalData, runtimeEnvironment) {
-    for (const hookPlugin of hookPlugins) {
-        // eslint-disable-next-line no-await-in-loop
-        await hookPlugin.initConfigs(appConfig, globalData, runtimeEnvironment);
-    }
-    try {
-        validateLwrAppConfig(JSON.stringify(appConfig), 'post');
-    }
-    catch (e) {
-        // TODO: temporary workaround for https://github.com/salesforce/lwr/issues/825
-        if (process.env.UNSAFE_IGNORE_CONFIG_VALIDATION === 'true') {
-            logger.warn('ignoring config validation errors due to UNSAFE_IGNORE_CONFIG_VALIDATION flag...proceed with caution');
-            console.dir(e, { depth: null });
-        }
-        else {
-            throw e;
-        }
-    }
-    normalizeRoutesBootstrap(appConfig);
-    return {
-        appConfig,
-        globalData,
-        runtimeEnvironment,
-    };
-}
-export async function resolveConfigurations(config) {
-    const { apiVersion, basePath, lwrVersion, serverMode, globalDataDir, globalData: globalDataConfig, } = config;
-    const globalData = getGlobalData(globalDataDir, globalDataConfig);
-    const runtimeEnvironment = {
-        ...explodeMode(serverMode),
-        apiVersion,
-        basePath,
-        lwrVersion,
-        debug: false,
-        serverMode,
-        featureFlags: getFeatureFlags(),
-    };
-    const hookProviders = await getServices(config.hooks, undefined, config);
-    return runConfigurationsHook(hookProviders, config, globalData, runtimeEnvironment);
-}
-//# sourceMappingURL=configurations.js.map

package/build/es/context/global-data.d.ts

@@ -1,3 +0,0 @@
-import { GlobalData } from '@lwrjs/types';
-export declare function getGlobalData(globalDataDir: string, defaultData?: GlobalData): GlobalData;
-//# sourceMappingURL=global-data.d.ts.map

package/build/es/context/global-data.js

@@ -1,29 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function recursiveJsonCollector(resources, currentPath, collector) {
-    for (const resource of resources) {
-        const resourcePath = path.join(currentPath, resource);
-        if (resource.endsWith('.json')) {
-            const resourceName = path.basename(resource, '.json');
-            const jsonSource = JSON.parse(fs.readFileSync(resourcePath, 'utf-8'));
-            collector[resourceName] = jsonSource;
-        }
-        else if (fs.statSync(resourcePath).isDirectory()) {
-            const dirContentList = fs.readdirSync(resourcePath);
-            collector[resource] = recursiveJsonCollector(dirContentList, resourcePath, {});
-        }
-    }
-    return collector;
-}
-export function getGlobalData(globalDataDir, defaultData = {}) {
-    if (!fs.existsSync(globalDataDir) || !fs.statSync(globalDataDir).isDirectory()) {
-        return defaultData;
-    }
-    const dirContentList = fs.readdirSync(globalDataDir);
-    return {
-        ...recursiveJsonCollector(dirContentList, globalDataDir, {}),
-        ...defaultData,
-    };
-}
-//# sourceMappingURL=global-data.js.map

package/build/es/context/services.d.ts

@@ -1,3 +0,0 @@
-import { LwrService, NormalizedLwrGlobalConfig, ProviderContext, ServiceConfig } from '@lwrjs/types';
-export declare function getServices<T extends LwrService>(services: ServiceConfig[], providerContext: ProviderContext | undefined, lwrConfig: NormalizedLwrGlobalConfig): Promise<T[]>;
-//# sourceMappingURL=services.d.ts.map

package/build/es/context/services.js

@@ -1,27 +0,0 @@
-import libPath from 'path';
-import { resolveFileExtension, transpileTs } from '@lwrjs/shared-utils';
-async function getServiceModule(path, { cacheDir, rootDir }) {
-    try {
-        if (path.endsWith('.ts')) {
-            const fullPath = resolveFileExtension(path);
-            path = await transpileTs(fullPath, { rootDir, cacheDir: libPath.join(cacheDir, 'services') });
-        }
-        const moduleEntry = await import(path);
-        return moduleEntry.default || moduleEntry;
-    }
-    catch (err) {
-        console.log(err);
-        throw new Error(`Unable to get Service: ${path}`);
-    }
-}
-// Parse the service constructors and instantiate them
-export async function getServices(services, providerContext, lwrConfig) {
-    return Promise.all(services.map(async (serviceEntry) => {
-        const [serviceName, serviceConfig = {}] = Array.isArray(serviceEntry)
-            ? serviceEntry
-            : [serviceEntry];
-        const ServiceCtor = await getServiceModule(serviceName, lwrConfig);
-        return new ServiceCtor(serviceConfig, providerContext);
-    }));
-}
-//# sourceMappingURL=services.js.map