@lwrjs/npm-module-provider 0.10.0 → 0.10.2

package/build/cjs/index.cjs

@@ -29,7 +29,6 @@ __export(exports, {
 var import_path = __toModule(require("path"));
 var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
 var import_resolveNpmModules = __toModule(require("./resolveNpmModules.cjs"));
-var import_resolveNpmModulesDeprecated = __toModule(require("./resolveNpmModulesDeprecated.cjs"));
 var NpmModuleProvider = class {
   constructor(providerConfig = {}, {config: {cacheDir}}) {
     this.name = "npm-module-provider";
@@ -74,8 +73,7 @@ var NpmModuleProvider = class {
         return versions.get(version);
       }
     }
-    const resolveNpm = this.providerConfig.useCompatResolution ? import_resolveNpmModulesDeprecated.resolveNpmModuleSpecifierDeprecated : import_resolveNpmModules.resolveNpmModuleSpecifier;
-    const moduleEntry = await resolveNpm(specifier, this.webModulesCacheDir, this.providerConfig);
+    const moduleEntry = await (0, import_resolveNpmModules.resolveNpmModuleSpecifier)(specifier, this.webModulesCacheDir, this.providerConfig);
     if (!moduleEntry) {
       return;
     }

package/build/es/index.d.ts

@@ -2,7 +2,6 @@ import type { AbstractModuleId, ModuleCompiled, ModuleEntry, ModuleProvider, Mod
 export interface NpmModuleProviderConfig {
     external?: string[];
     polyfillNode?: boolean;
-    useCompatResolution?: boolean;
 }
 export default class NpmModuleProvider implements ModuleProvider {
     name: string;

package/build/es/index.js

@@ -1,7 +1,6 @@
 import path from 'path';
 import { hashContent, readFile } from '@lwrjs/shared-utils';
-import { resolveNpmModuleSpecifier } from './resolveNpmModules.js';
-import { resolveNpmModuleSpecifierDeprecated } from './resolveNpmModulesDeprecated.js';
+import { resolveNpmModuleSpecifier as resolveNpm } from './resolveNpmModules.js';
 export default class NpmModuleProvider {
     constructor(providerConfig = {}, { config: { cacheDir } }) {
         this.name = 'npm-module-provider';
@@ -47,9 +46,6 @@ export default class NpmModuleProvider {
                 return versions.get(version);
             }
         }
-        const resolveNpm = this.providerConfig.useCompatResolution
-            ? resolveNpmModuleSpecifierDeprecated
-            : resolveNpmModuleSpecifier;
         const moduleEntry = await resolveNpm(specifier, this.webModulesCacheDir, this.providerConfig);
         if (!moduleEntry) {
             return;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.10.0",
+    "version": "0.10.2",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -36,13 +36,12 @@
     },
     "dependencies": {
         "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
-        "@lwrjs/shared-utils": "0.10.0",
+        "@lwrjs/shared-utils": "0.10.2",
         "esbuild": "^0.9.7",
-        "esinstall": "^1.1.7",
         "resolve": "^1.22.1"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.10.0",
+        "@lwrjs/types": "0.10.2",
         "jest": "^26.6.3",
         "ts-jest": "^26.5.6"
     },
@@ -52,5 +51,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "e6deaeef3db8aa079acefed508897eca19b3218a"
+    "gitHead": "40988dfc093a3b9dea859f1bf61a49bca1edb0c5"
 }

package/build/cjs/resolveNpmModulesDeprecated.cjs

@@ -1,140 +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/npm-module-provider/src/resolveNpmModulesDeprecated.ts
-__markAsModule(exports);
-__export(exports, {
-  resolveNpmModuleSpecifierBlock: () => resolveNpmModuleSpecifierBlock,
-  resolveNpmModuleSpecifierDeprecated: () => resolveNpmModuleSpecifierDeprecated
-});
-var import_path = __toModule(require("path"));
-var import_esinstall = __toModule(require("esinstall"));
-var import_fs = __toModule(require("fs"));
-var import_resolve = __toModule(require("resolve"));
-var import_shared_utils = __toModule(require("@lwrjs/shared-utils"));
-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;
-}
-function readModuleMapping(moduleMappingPath) {
-  return (0, import_fs.existsSync)(moduleMappingPath) ? JSON.parse((0, import_fs.readFileSync)(moduleMappingPath, "utf-8")) : {imports: {}};
-}
-function writeModuleMapping(loc, importMap) {
-  (0, import_fs.writeFileSync)(loc, JSON.stringify(importMap, void 0, 2), {encoding: "utf-8"});
-}
-async function resolveNpmModuleSpecifierBlock(specifier, dest, config) {
-  try {
-    const tmpFolder = (0, import_path.join)(dest, "__tmp", specifier.replace(/[/|@]/g, "_"));
-    (0, import_fs.mkdirSync)(tmpFolder, {recursive: true});
-    const moduleMappingPath = (0, import_path.join)(dest, "import-map-cache.json");
-    const currentModuleMapping = readModuleMapping(moduleMappingPath);
-    const version = getPkgVersion(specifier);
-    const cacheKey = `${specifier}@${version}`;
-    if (currentModuleMapping.imports[cacheKey]) {
-      return {
-        id: cacheKey,
-        specifier,
-        entry: currentModuleMapping.imports[cacheKey],
-        version
-      };
-    }
-    const external = config.external?.filter((e) => e !== specifier) || [];
-    const polyfillNode = config.polyfillNode ?? true;
-    await (0, import_esinstall.install)([specifier], {
-      dest: tmpFolder,
-      importMap: currentModuleMapping,
-      logger: {
-        debug: () => void 0,
-        log: () => void 0,
-        warn: () => void 0,
-        error: () => void 0
-      },
-      polyfillNode,
-      external
-    });
-    const moduleMapping = readModuleMapping((0, import_path.join)(tmpFolder, "import-map.json"));
-    const moduleRelativePath = moduleMapping.imports[specifier];
-    const moduleAbsPath = (0, import_path.join)(tmpFolder, moduleRelativePath);
-    const moduleEntry = (0, import_path.join)(dest, moduleRelativePath);
-    (0, import_fs.mkdirSync)((0, import_path.dirname)(moduleEntry), {recursive: true});
-    (0, import_fs.copyFileSync)(moduleAbsPath, moduleEntry);
-    const mergedMapping = {
-      imports: {
-        ...currentModuleMapping.imports,
-        [cacheKey]: moduleEntry
-      }
-    };
-    writeModuleMapping(moduleMappingPath, mergedMapping);
-    return {
-      id: cacheKey,
-      entry: moduleEntry,
-      specifier,
-      version
-    };
-  } catch (err) {
-    import_shared_utils.logger.error(`[npm-module-provider][esintsall] resolveNpmModules: ${specifier} ${dest}`, {err});
-  }
-}
-var Queue = class {
-  constructor() {
-    this.queue = [];
-    this.workingOnPromise = false;
-    this.pendingPromise = false;
-  }
-  enqueue(promise) {
-    return new Promise((resolve2, reject) => {
-      this.queue.push({promise, resolve: resolve2, reject});
-      this.dequeue();
-    });
-  }
-  dequeue() {
-    if (this.workingOnPromise) {
-      return false;
-    }
-    const item = this.queue.shift();
-    if (!item) {
-      return false;
-    }
-    this.workingOnPromise = true;
-    try {
-      item.promise().then((value) => {
-        this.workingOnPromise = false;
-        item.resolve(value);
-        this.dequeue();
-      }).catch((err) => {
-        this.workingOnPromise = false;
-        item.reject(err);
-        this.dequeue();
-      });
-    } catch (err) {
-      this.workingOnPromise = false;
-      item.reject(err);
-      this.dequeue();
-    }
-    return true;
-  }
-};
-var RESOLVER_QUEUE = new Queue();
-async function resolveNpmModuleSpecifierDeprecated(specifier, dest, config) {
-  return RESOLVER_QUEUE.enqueue(resolveNpmModuleSpecifierBlock.bind(null, specifier, dest, config));
-}

package/build/es/resolveNpmModulesDeprecated.d.ts

@@ -1,5 +0,0 @@
-import type { FsModuleEntry } from '@lwrjs/types';
-import type { NpmModuleProviderConfig } from './index';
-export declare function resolveNpmModuleSpecifierBlock(specifier: string, dest: string, config: NpmModuleProviderConfig): Promise<FsModuleEntry | undefined>;
-export declare function resolveNpmModuleSpecifierDeprecated(specifier: string, dest: string, config: NpmModuleProviderConfig): Promise<FsModuleEntry | undefined>;
-//# sourceMappingURL=resolveNpmModulesDeprecated.d.ts.map

package/build/es/resolveNpmModulesDeprecated.js

@@ -1,127 +0,0 @@
-/* istanbul ignore file */
-import { dirname, join } from 'path';
-import { install } from 'esinstall';
-import { readFileSync, copyFileSync, mkdirSync, existsSync, writeFileSync } from 'fs';
-import resolve from 'resolve';
-import { logger } from '@lwrjs/shared-utils';
-function getPkgVersion(specifier) {
-    const pkgPath = resolve.sync(join(specifier, '/package.json'));
-    return JSON.parse(readFileSync(pkgPath, 'utf-8')).version;
-}
-function readModuleMapping(moduleMappingPath) {
-    return existsSync(moduleMappingPath)
-        ? JSON.parse(readFileSync(moduleMappingPath, 'utf-8'))
-        : { imports: {} };
-}
-function writeModuleMapping(loc, importMap) {
-    writeFileSync(loc, JSON.stringify(importMap, undefined, 2), { encoding: 'utf-8' });
-}
-export async function resolveNpmModuleSpecifierBlock(specifier, dest, config) {
-    try {
-        // TODO: file an issue on snowpack so they don't wipe the folder every-time
-        // in the mean time we have to do hackery that will be likely to break when upgrading
-        const tmpFolder = join(dest, '__tmp', specifier.replace(/[/|@]/g, '_'));
-        mkdirSync(tmpFolder, { recursive: true });
-        const moduleMappingPath = join(dest, 'import-map-cache.json');
-        const currentModuleMapping = readModuleMapping(moduleMappingPath);
-        const version = getPkgVersion(specifier);
-        const cacheKey = `${specifier}@${version}`;
-        if (currentModuleMapping.imports[cacheKey]) {
-            return {
-                id: cacheKey,
-                specifier,
-                entry: currentModuleMapping.imports[cacheKey],
-                version,
-            };
-        }
-        const external = config.external?.filter((e) => e !== specifier) || [];
-        const polyfillNode = config.polyfillNode ?? true;
-        // Unfortunately esinstall APIs its  not very programatic instead its file oriented...
-        await install([specifier], {
-            dest: tmpFolder,
-            importMap: currentModuleMapping,
-            logger: {
-                debug: () => void 0,
-                log: () => void 0,
-                warn: () => void 0,
-                error: () => void 0,
-            },
-            polyfillNode,
-            external,
-        });
-        // esinstall produces a new module mapping, read it to get the generated file
-        const moduleMapping = readModuleMapping(join(tmpFolder, 'import-map.json'));
-        const moduleRelativePath = moduleMapping.imports[specifier];
-        const moduleAbsPath = join(tmpFolder, moduleRelativePath);
-        const moduleEntry = join(dest, moduleRelativePath);
-        // create module's namespaced dir if it's namespaced, i.e.
-        // no namespace: 'utils' -> web_modules/utils.js
-        // namespace: '@mynamespace/utils' -> web_modules/@mynamespace/utils.js
-        mkdirSync(dirname(moduleEntry), { recursive: true });
-        // copy from _tmp to main folder and update the importMap for caching
-        copyFileSync(moduleAbsPath, moduleEntry);
-        const mergedMapping = {
-            imports: {
-                ...currentModuleMapping.imports,
-                [cacheKey]: moduleEntry,
-            },
-        };
-        writeModuleMapping(moduleMappingPath, mergedMapping);
-        return {
-            id: cacheKey,
-            entry: moduleEntry,
-            specifier,
-            version,
-        };
-    }
-    catch (err) {
-        logger.error(`[npm-module-provider][esintsall] resolveNpmModules: ${specifier} ${dest}`, { err });
-    }
-}
-class Queue {
-    constructor() {
-        this.queue = [];
-        this.workingOnPromise = false;
-        this.pendingPromise = false;
-    }
-    enqueue(promise) {
-        return new Promise((resolve, reject) => {
-            this.queue.push({ promise, resolve, reject });
-            this.dequeue();
-        });
-    }
-    dequeue() {
-        if (this.workingOnPromise) {
-            return false;
-        }
-        const item = this.queue.shift();
-        if (!item) {
-            return false;
-        }
-        this.workingOnPromise = true;
-        try {
-            item.promise()
-                .then((value) => {
-                this.workingOnPromise = false;
-                item.resolve(value);
-                this.dequeue();
-            })
-                .catch((err) => {
-                this.workingOnPromise = false;
-                item.reject(err);
-                this.dequeue();
-            });
-        }
-        catch (err) {
-            this.workingOnPromise = false;
-            item.reject(err);
-            this.dequeue();
-        }
-        return true;
-    }
-}
-const RESOLVER_QUEUE = new Queue();
-export async function resolveNpmModuleSpecifierDeprecated(specifier, dest, config) {
-    return RESOLVER_QUEUE.enqueue(resolveNpmModuleSpecifierBlock.bind(null, specifier, dest, config));
-}
-//# sourceMappingURL=resolveNpmModulesDeprecated.js.map