@lwrjs/npm-module-provider 0.6.0-alpha.7 → 0.6.0

package/build/cjs/resolveNpmModules.cjs

@@ -28,7 +28,6 @@ __export(exports, {
   resolveNpmModuleSpecifierBlock: () => resolveNpmModuleSpecifierBlock
 });
 var import_path = __toModule(require("path"));
-var import_fs = __toModule(require("fs"));
 var import_resolve = __toModule(require("resolve"));
 var import_esbuild = __toModule(require("esbuild"));
 var import_node_modules_polyfill = __toModule(require("@esbuild-plugins/node-modules-polyfill"));
@@ -39,10 +38,6 @@ if (!import_esbuild.default) {
   } catch {
   }
 }
-function getPkgVersion(specifier) {
-  const pkgPath = import_resolve.default.sync((0, import_path.join)(specifier, "/package.json"));
-  return JSON.parse((0, import_fs.readFileSync)(pkgPath, "utf-8")).version;
-}
 var NodePolyfillsPlugin = import_node_modules_polyfill.default.default || import_node_modules_polyfill.default;
 var ExternalsPlugin = function({external}) {
   return {
@@ -58,6 +53,7 @@ var ExternalsPlugin = function({external}) {
 };
 async function resolveNpmModuleSpecifierBlock(specifier, dest, config) {
   try {
+    let pkgVersion;
     const res = import_resolve.default.sync(specifier, {
       packageFilter: function(pkg) {
         const {exports: exports2, browser} = pkg;
@@ -69,12 +65,15 @@ async function resolveNpmModuleSpecifierBlock(specifier, dest, config) {
         } else if (pkg.module) {
           pkg.main = pkg.module;
         }
+        pkgVersion = pkg.version;
         return pkg;
       }
     });
+    if (pkgVersion === void 0) {
+      throw new Error("Failed to find version in package.json");
+    }
     const outfile = (0, import_path.join)(dest, specifier, "_bundle.js");
-    const version = getPkgVersion(specifier);
-    const cacheKey = `${specifier}@${version}`;
+    const cacheKey = `${specifier}@${pkgVersion}`;
     await esbuild.build({
       entryPoints: [res],
       format: "esm",
@@ -92,7 +91,7 @@ async function resolveNpmModuleSpecifierBlock(specifier, dest, config) {
       id: cacheKey,
       entry: outfile,
       specifier,
-      version
+      version: pkgVersion
     };
   } catch (err) {
     console.log("[ERROR]resolveNpmModules(esbuild): ", {specifier, dest});

package/build/es/resolveNpmModules.js

@@ -1,5 +1,4 @@
 import { join } from 'path';
-import { readFileSync } from 'fs';
 import resolve from 'resolve';
 import esbuildEsm from 'esbuild';
 import NodeModulesPolyfills from '@esbuild-plugins/node-modules-polyfill';
@@ -14,10 +13,6 @@ if (!esbuildEsm) {
         /* this is to support mjs/cjs dual impl */
     }
 }
-function getPkgVersion(specifier) {
-    const pkgPath = resolve.sync(join(specifier, '/package.json'));
-    return JSON.parse(readFileSync(pkgPath, 'utf-8')).version;
-}
 const NodePolyfillsPlugin = NodeModulesPolyfills.default || NodeModulesPolyfills;
 const ExternalsPlugin = function ({ external }) {
     return {
@@ -33,6 +28,7 @@ const ExternalsPlugin = function ({ external }) {
 };
 export async function resolveNpmModuleSpecifierBlock(specifier, dest, config) {
     try {
+        let pkgVersion;
         const res = resolve.sync(specifier, {
             packageFilter: function (pkg) {
                 const { exports, browser } = pkg;
@@ -46,12 +42,17 @@ export async function resolveNpmModuleSpecifierBlock(specifier, dest, config) {
                 else if (pkg.module) {
                     pkg.main = pkg.module;
                 }
+                // grab package.json version before we go
+                pkgVersion = pkg.version;
                 return pkg;
             },
         });
+        // ensure package version is set
+        if (pkgVersion === undefined) {
+            throw new Error('Failed to find version in package.json');
+        }
         const outfile = join(dest, specifier, '_bundle.js');
-        const version = getPkgVersion(specifier);
-        const cacheKey = `${specifier}@${version}`;
+        const cacheKey = `${specifier}@${pkgVersion}`;
         await esbuild.build({
             entryPoints: [res],
             format: 'esm',
@@ -69,7 +70,7 @@ export async function resolveNpmModuleSpecifierBlock(specifier, dest, config) {
             id: cacheKey,
             entry: outfile,
             specifier,
-            version,
+            version: pkgVersion,
         };
     }
     catch (err) {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.6.0-alpha.7",
+    "version": "0.6.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -31,16 +31,16 @@
     ],
     "dependencies": {
         "@esbuild-plugins/node-modules-polyfill": "^0.0.2",
-        "@lwrjs/shared-utils": "0.6.0-alpha.7",
+        "@lwrjs/shared-utils": "0.6.0",
         "esbuild": "^0.9.7",
         "esinstall": "^1.0.5",
         "resolve": "^1.19.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.6.0-alpha.7"
+        "@lwrjs/types": "0.6.0"
     },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "dc066450384dc1e27064b46ddd5f24543758a414"
+    "gitHead": "31769655f0155ad7e54cf37bccdf72d0baaf44ab"
 }