@lwrjs/app-service 0.6.0-alpha.9 → 0.6.2

package/build/cjs/moduleProvider/utils.cjs

@@ -81,6 +81,7 @@ function createAppRouteViewBootstrapModule(route, options, lockerConfig) {
   const bootstrapModule = experimentalSSR ? "lwr/initSsr" : "lwr/init";
   return [
     "/* This module is generated */",
+    isESM && `import { getClientBootstrapConfig } from 'lwr/preInit';`,
     syntheticShadow && `import '@lwc/synthetic-shadow';`,
     services && services.length && `import { services } from '${serviceApiModule}';`,
     servicesSource,
@@ -91,17 +92,16 @@ function createAppRouteViewBootstrapModule(route, options, lockerConfig) {
 import { registerLockerDefine } from 'lwr/lockerDefine';
 registerLockerDefine(${JSON.stringify(lockerConfig.trustedComponents)});
         `,
+    isESM && `const clientBootstrapConfig = getClientBootstrapConfig()`,
+    isAMD && `const clientBootstrapConfig = globalThis.LWR`,
     isESM && `
-const { imports, index, importMappings, endpoints } = globalThis.LWR;
+const { imports, index, importMappings, endpoints } = clientBootstrapConfig;
 esmLoaderInit({ imports, index, importMappings, endpoints });`,
     `
 // initialize additional non-configured root components
-const { rootComponents } = globalThis.LWR;
+const { rootComponents } = clientBootstrapConfig;
 Promise.all(rootComponents.map(async (rootSpecifier) => {
     const element = toKebabCase(rootSpecifier);
-    if (globalThis.performance) {
-        globalThis.performance.measure('${import_shared_utils.ON_APP_LOAD}');
-    }
     return import(rootSpecifier).then(({default: Ctor}) => {
         init([[element, Ctor]]);
     });
@@ -110,9 +110,8 @@ Promise.all(rootComponents.map(async (rootSpecifier) => {
     isESM && options.hmrEnabled && `
 // HMR related initialization
 const viewMetadata = globalThis._lwrRuntimeDebug.viewMetadata;
-const hmrEndpoint = globalThis.LWR.endpoints.uris.hmr;
+const hmrEndpoint = clientBootstrapConfig.endpoints.uris.hmr;
 initHMR(hmrEndpoint, viewMetadata);`,
-    isESM && `delete globalThis.LWR;`,
     isAMD && `
 globalThis.LWR = Object.freeze({
     define: globalThis.LWR.define,

package/build/es/moduleProvider/utils.js

@@ -1,4 +1,4 @@
-import { DEFAULT_LWR_BOOTSTRAP_CONFIG, ON_APP_LOAD } from '@lwrjs/shared-utils';
+import { DEFAULT_LWR_BOOTSTRAP_CONFIG } from '@lwrjs/shared-utils';
 function getDefaultImportName(service) {
     return `loaderService_${service.replace(/\//gi, '_').replace(/@/gi, '')}`;
 }
@@ -68,9 +68,12 @@ export function createAppRouteViewBootstrapModule(route, options, lockerConfig)
     const bootstrapModule = experimentalSSR ? 'lwr/initSsr' : 'lwr/init';
     return [
         '/* This module is generated */',
+        // pre app initialization step
+        // TODO: enable for AMD once https://github.com/salesforce/lwr/issues/1087 is implemented
+        isESM && `import { getClientBootstrapConfig } from 'lwr/preInit';`,
         // conditional shadow
         syntheticShadow && `import '@lwc/synthetic-shadow';`,
-        // Import loader services
+        // Import bootstrap services
         services && services.length && `import { services } from '${serviceApiModule}';`,
         // import and register the configured services
         servicesSource,
@@ -89,19 +92,20 @@ export function createAppRouteViewBootstrapModule(route, options, lockerConfig)
 import { registerLockerDefine } from 'lwr/lockerDefine';
 registerLockerDefine(${JSON.stringify(lockerConfig.trustedComponents)});
         `,
+        // grab client bootstrap config
+        isESM && `const clientBootstrapConfig = getClientBootstrapConfig()`,
+        // TODO: https://github.com/salesforce/lwr/issues/1087
+        isAMD && `const clientBootstrapConfig = globalThis.LWR`,
         // Initialize the ESM loader with the Client Bootstrap Config
         isESM &&
             `
-const { imports, index, importMappings, endpoints } = globalThis.LWR;
+const { imports, index, importMappings, endpoints } = clientBootstrapConfig;
 esmLoaderInit({ imports, index, importMappings, endpoints });`,
         `
 // initialize additional non-configured root components
-const { rootComponents } = globalThis.LWR;
+const { rootComponents } = clientBootstrapConfig;
 Promise.all(rootComponents.map(async (rootSpecifier) => {
     const element = toKebabCase(rootSpecifier);
-    if (globalThis.performance) {
-        globalThis.performance.measure('${ON_APP_LOAD}');
-    }
     return import(rootSpecifier).then(({default: Ctor}) => {
         init([[element, Ctor]]);
     });
@@ -112,10 +116,9 @@ Promise.all(rootComponents.map(async (rootSpecifier) => {
             `
 // HMR related initialization
 const viewMetadata = globalThis._lwrRuntimeDebug.viewMetadata;
-const hmrEndpoint = globalThis.LWR.endpoints.uris.hmr;
+const hmrEndpoint = clientBootstrapConfig.endpoints.uris.hmr;
 initHMR(hmrEndpoint, viewMetadata);`,
-        // LAST TASK: Cleanup globalThis.LWR in ESM (the shim does this for AMD)
-        isESM && `delete globalThis.LWR;`,
+        // TODO: can be removed following https://github.com/salesforce/lwr/issues/1092
         // LAST TASK: Cleanup globalThis.LWR in AMD
         isAMD &&
             `

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.9",
+    "version": "0.6.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,14 +33,14 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.6.0-alpha.9",
-        "@lwrjs/shared-utils": "0.6.0-alpha.9"
+        "@lwrjs/diagnostics": "0.6.2",
+        "@lwrjs/shared-utils": "0.6.2"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.0-alpha.9"
+        "@lwrjs/types": "0.6.2"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "9cb371a5d01ef345660138a48fe0b3f0119d0799"
+    "gitHead": "ef85bdc48adde58b7c648561d67acbb408bbe189"
 }