openmrs 4.1.1-pre.508 → 4.1.1-pre.511

package/.turbo/turbo-build.log

@@ -1 +1 @@
-openmrs:build: cache hit, replaying output 39f564a62b7a9d99
+openmrs:build: cache hit, replaying output 5073aa7565b14358

package/dist/cli.js

@@ -138,10 +138,7 @@ yargs_1.default.command("build", "Builds a new app shell.", (argv) => argv
     .describe("config-path", "The path to a frontend configuration file. Can be used multiple times. The file is copied directly into the build directory.")
     .string("importmap")
     .default("importmap", "importmap.json")
-    .describe("importmap", "The import map to use. Can be a path to an import map to be taken literally, an URL, or a fixed JSON object.")
-    .boolean("download-coreapps")
-    .default("download-coreapps", false)
-    .describe("download-coreapps", "Downloads and bundles the core apps. For cases where the core apps are not in the import map."), (args) => __awaiter(void 0, void 0, void 0, function* () {
+    .describe("importmap", "The import map to use. Can be a path to an import map to be taken literally, an URL, or a fixed JSON object."), (args) => __awaiter(void 0, void 0, void 0, function* () {
     return runCommand("runBuild", Object.assign(Object.assign({ configUrls: args["config-url"], configPaths: args["config-path"].map((p) => (0, path_1.resolve)(process.cwd(), p)) }, args), { importmap: args.importmap, buildConfig: args["build-config"] && (0, path_1.resolve)(process.cwd(), args["build-config"]), target: (0, path_1.resolve)(process.cwd(), args.target) }));
 }));
 yargs_1.default.command("assemble", "Assembles an import map incl. all required resources.", (argv) => argv
@@ -152,7 +149,8 @@ yargs_1.default.command("assemble", "Assembles an import map incl. all required
     coerce: (arg) => (0, path_1.resolve)(process.cwd(), arg),
 })
     .option("registry", {
-    default: "https://registry.npmjs.org/",
+    alias: "reg",
+    default: "",
     description: "The NPM registry used for getting the packages.",
     type: "string",
     coerce: (arg) => (0, utils_1.trimEnd)(arg, "/"),

package/dist/commands/assemble.js

@@ -18,10 +18,12 @@ const path_1 = require("path");
 const inquirer_1 = require("inquirer");
 const rimraf_1 = __importDefault(require("rimraf"));
 const axios_1 = __importDefault(require("axios"));
+const npm_registry_fetch_1 = __importDefault(require("npm-registry-fetch"));
 const pacote_1 = __importDefault(require("pacote"));
 const utils_1 = require("../utils");
 const fs_1 = require("fs");
-function readConfig(mode, config, registry) {
+const npmConfig_1 = require("../utils/npmConfig");
+function readConfig(mode, config, fetchOptions) {
     return __awaiter(this, void 0, void 0, function* () {
         switch (mode) {
             case "config":
@@ -32,9 +34,9 @@ function readConfig(mode, config, registry) {
                 return Object.assign({ baseDir: (0, path_1.dirname)(config) }, JSON.parse(yield (0, promises_1.readFile)(config, "utf8")));
             case "survey":
                 (0, utils_1.logInfo)(`Loading available frontend modules ...`);
-                const packages = yield axios_1.default
-                    .get(`${registry}/-/v1/search?text=keywords:openmrs&size=250`)
-                    .then((res) => res.data)
+                const packages = yield npm_registry_fetch_1.default
+                    .json("/-/v1/search?text=keywords:openmrs&size=500", fetchOptions)
+                    .then((res) => res)
                     .then((res) => res.objects
                     .map((m) => ({
                     name: m.package.name,
@@ -78,7 +80,7 @@ function readConfig(mode, config, registry) {
         };
     });
 }
-function downloadPackage(cacheDir, esmName, esmVersion, baseDir, registry) {
+function downloadPackage(cacheDir, esmName, esmVersion, baseDir, fetchOptions) {
     return __awaiter(this, void 0, void 0, function* () {
         if (esmVersion.startsWith("file:")) {
             const source = (0, path_1.resolve)(baseDir, esmVersion.substr(5));
@@ -96,11 +98,13 @@ function downloadPackage(cacheDir, esmName, esmVersion, baseDir, registry) {
         }
         else {
             const packageName = `${esmName}@${esmVersion}`;
-            const tarManifest = yield pacote_1.default.manifest(packageName, { registry });
-            const tarball = yield pacote_1.default.tarball(tarManifest._resolved, {
-                registry,
-                integrity: tarManifest._integrity,
-            });
+            const tarManifest = yield pacote_1.default.manifest(packageName, fetchOptions);
+            if (!Boolean(tarManifest) ||
+                !Boolean(tarManifest._resolved) ||
+                !Boolean(tarManifest._integrity)) {
+                throw new Error(`Failed to load manifest for ${packageName} from registry ${fetchOptions.registry}`);
+            }
+            const tarball = yield pacote_1.default.tarball(tarManifest._resolved, Object.assign(Object.assign({}, fetchOptions), { integrity: tarManifest._integrity }));
             const filename = `${tarManifest.name}-${tarManifest.version}.tgz`
                 .replace(/^@/, "")
                 .replace(/\//, "-");
@@ -138,7 +142,8 @@ function extractFiles(sourceFile, targetDir) {
 }
 function runAssemble(args) {
     return __awaiter(this, void 0, void 0, function* () {
-        const config = yield readConfig(args.mode, args.config, args.registry);
+        const npmConf = (0, npmConfig_1.getNpmRegistryConfiguration)(args.registry);
+        const config = yield readConfig(args.mode, args.config, npmConf);
         const importmap = {
             imports: {},
         };
@@ -154,7 +159,7 @@ function runAssemble(args) {
         yield (0, promises_1.mkdir)(args.target, { recursive: true });
         yield Promise.all(Object.keys(frontendModules).map((esmName) => __awaiter(this, void 0, void 0, function* () {
             const esmVersion = frontendModules[esmName];
-            const tgzFileName = yield downloadPackage(cacheDir, esmName, esmVersion, config.baseDir, args.registry);
+            const tgzFileName = yield downloadPackage(cacheDir, esmName, esmVersion, config.baseDir, npmConf);
             const dirName = tgzFileName.replace(".tgz", "");
             const [fileName, version] = yield extractFiles((0, path_1.resolve)(cacheDir, tgzFileName), (0, path_1.resolve)(args.target, dirName));
             importmap.imports[esmName] = `${publicUrl}/${dirName}/${fileName}`;

package/dist/commands/build.js

@@ -17,7 +17,6 @@ const fs_1 = require("fs");
 const utils_1 = require("../utils");
 const rimraf_1 = __importDefault(require("rimraf"));
 const path_1 = require("path");
-const child_process_1 = require("child_process");
 function loadBuildConfig(buildConfigPath) {
     if (buildConfigPath) {
         return JSON.parse((0, fs_1.readFileSync)(buildConfigPath, "utf8"));
@@ -26,80 +25,10 @@ function loadBuildConfig(buildConfigPath) {
         return {};
     }
 }
-function extractFiles(sourceFile, targetDir) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        const packageRoot = "package/";
-        const rs = (0, fs_1.createReadStream)(sourceFile);
-        const files = yield (0, utils_1.untar)(rs);
-        const packageJson = JSON.parse(files[`${packageRoot}package.json`].toString("utf8"));
-        const entryModule = (_b = (_a = packageJson.browser) !== null && _a !== void 0 ? _a : packageJson.module) !== null && _b !== void 0 ? _b : packageJson.main;
-        Object.keys(files)
-            .filter((f) => f === "package/package.json" ||
-            f.substr(packageRoot.length) === entryModule)
-            .forEach((f) => {
-            const content = files[f];
-            const fileName = f.replace(packageRoot, "");
-            const targetFile = (0, path_1.resolve)(targetDir, fileName);
-            (0, fs_1.writeFileSync)(targetFile, content);
-        });
-        (0, fs_1.unlinkSync)(sourceFile);
-    });
-}
-function loadCoreApps(registry) {
-    var _a, _b;
-    /*
-     * if the user specified a OMRS_ESM_CORE_APPS_DIR, we assume this has
-     * the necessary coreapps; otherwise, we check if there are any coreapps
-     * available in the places the webpack configuration will check; if there
-     * aren't, we download the apps specified in the app-shell devDependencies
-     */
-    const appsPath = (_a = process.env.OMRS_ESM_CORE_APPS_DIR) !== null && _a !== void 0 ? _a : (0, path_1.resolve)(require.resolve("@openmrs/esm-app-shell"), "..", "..", "apps");
-    let hasApp = false;
-    if ((0, fs_1.existsSync)(appsPath) && (0, fs_1.statSync)(appsPath).isDirectory()) {
-        hasApp = (0, fs_1.readdirSync)(appsPath).some((entry) => {
-            var _a;
-            if ((0, fs_1.statSync)(entry).isDirectory()) {
-                const packageJson = (0, path_1.resolve)(entry, "package.json");
-                if ((0, fs_1.existsSync)(packageJson) && (0, fs_1.statSync)(packageJson).isFile()) {
-                    return (_a = require(packageJson).name) === null || _a === void 0 ? void 0 : _a.endsWith("-app");
-                }
-            }
-        });
-    }
-    if (!hasApp) {
-        (0, utils_1.logInfo)("Fetching core apps...");
-        const devDependencies = require("@openmrs/esm-app-shell/package.json").devDependencies;
-        const apps = Object.keys(devDependencies)
-            .filter((dep) => dep.endsWith("-app"))
-            .map((dep) => [dep, devDependencies[dep]]);
-        if (apps.length > 0) {
-            const cacheDir = (0, path_1.resolve)(process.cwd(), ".cache");
-            if (!(0, fs_1.existsSync)(cacheDir)) {
-                (0, fs_1.mkdirSync)(cacheDir, { recursive: true });
-            }
-            const coreAppsDir = (_b = process.env.OMRS_ESM_CORE_APPS_DIR) !== null && _b !== void 0 ? _b : (0, path_1.resolve)(process.cwd(), ".cache", "apps");
-            rimraf_1.default.sync(coreAppsDir);
-            (0, fs_1.mkdirSync)(coreAppsDir, { recursive: true });
-            apps.forEach(([name, version]) => __awaiter(this, void 0, void 0, function* () {
-                var _c;
-                const packageName = `${name}@${version}`;
-                const command = `npm pack ${packageName} --registry ${registry}`;
-                const result = (0, child_process_1.execSync)(command, {
-                    cwd: cacheDir,
-                });
-                const tgzFile = (_c = result.toString("utf8").split("\n").filter(Boolean).pop()) !== null && _c !== void 0 ? _c : "";
-                const appDirName = tgzFile.replace(".tgz", "");
-                yield extractFiles((0, path_1.resolve)(cacheDir, tgzFile), (0, path_1.resolve)(coreAppsDir, appDirName));
-            }));
-            return coreAppsDir;
-        }
-    }
-}
 function addConfigFilesFromPaths(configPaths, targetDir) {
     for (let configPath of configPaths) {
         const realPath = (0, path_1.resolve)(configPath);
-        (0, fs_1.copyFileSync)(realPath, targetDir + "/" + (0, path_1.basename)(configPath));
+        (0, fs_1.copyFileSync)(realPath, (0, path_1.join)(targetDir, (0, path_1.basename)(configPath)));
     }
 }
 function runBuild(args) {
@@ -111,9 +40,6 @@ function runBuild(args) {
         for (let configPath of buildConfig.configPaths || args.configPaths) {
             configUrls.push((0, path_1.basename)(configPath));
         }
-        const coreAppsDir = args.downloadCoreapps
-            ? loadCoreApps(args.registry)
-            : undefined;
         const config = (0, utils_1.loadWebpackConfig)({
             importmap: yield (0, utils_1.getImportmap)(buildConfig.importmap || args.importmap),
             env: "production",
@@ -122,7 +48,6 @@ function runBuild(args) {
             pageTitle: buildConfig.pageTitle || args.pageTitle,
             supportOffline: (_a = buildConfig.supportOffline) !== null && _a !== void 0 ? _a : args.supportOffline,
             spaPath: buildConfig.spaPath || args.spaPath,
-            coreAppsDir,
         });
         (0, utils_1.logInfo)(`Running build process ...`);
         if (args.fresh && (0, fs_1.existsSync)(args.target)) {

package/dist/utils/npmConfig.js

@@ -0,0 +1,48 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNpmRegistryConfiguration = void 0;
+const npm_conf_1 = __importDefault(require("@pnpm/npm-conf"));
+/**
+ * Utility function to load the appropriate configuration for npmRegistryFetch
+ * from the .npmrc configuration chain. Essentially, this allows us to use .npmrc
+ * files to configure reading from the NPM registry, which is useful when using
+ * a custom registry, especially for private packages.
+ *
+ * This uses the @pnpm/npm-conf library for reading .npmrc files as its both
+ * maintained and sane to work with.
+ *
+ * @param registry The NPM registry to use, if any
+ */
+function getNpmRegistryConfiguration(registry) {
+    var _a;
+    const conf = (0, npm_conf_1.default)();
+    if (!conf) {
+        return {};
+    }
+    if (conf.warnings.length >= 1) {
+        throw new Error(`Warnings while loading .npmrc:\n  ${conf.warnings.join("\n  ")}`);
+    }
+    if (!conf.config) {
+        return {};
+    }
+    // the returned config object uses getters with no list of keys
+    // so to convert this to a "normal" object, we combine all the settings
+    // found; note this relies on the internal structure of the config
+    // object and may not be stable
+    const configuration = Object.assign({}, ...((_a = conf.config.list.slice().reverse()) !== null && _a !== void 0 ? _a : []));
+    if (configuration.__source__) {
+        delete configuration.__source__;
+    }
+    if ("strict-ssl" in configuration) {
+        configuration.strictSSL = configuration["strict-ssl"];
+        delete configuration["strict-ssl"];
+    }
+    if (registry) {
+        configuration.registry = registry;
+    }
+    return configuration;
+}
+exports.getNpmRegistryConfiguration = getNpmRegistryConfiguration;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "4.1.1-pre.508",
+  "version": "4.1.1-pre.511",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",
@@ -30,8 +30,9 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@openmrs/esm-app-shell": "4.1.1-pre.508",
-    "@openmrs/webpack-config": "4.1.1-pre.508",
+    "@openmrs/esm-app-shell": "4.1.1-pre.511",
+    "@openmrs/webpack-config": "4.1.1-pre.511",
+    "@pnpm/npm-conf": "^2.1.0",
     "autoprefixer": "^10.4.2",
     "axios": "^0.21.1",
     "browserslist-config-openmrs": "^1.0.1",
@@ -43,6 +44,7 @@
     "html-webpack-plugin": "^5.5.0",
     "inquirer": "^7.3.3",
     "mini-css-extract-plugin": "^2.4.5",
+    "npm-registry-fetch": "^14.0.3",
     "pacote": "^15.0.0",
     "postcss": "^8.4.6",
     "postcss-loader": "^6.2.1",
@@ -67,5 +69,5 @@
     "@types/systemjs": "^6.1.0",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "c19414d03b7547e0d286d04b8e104823095e99f2"
+  "gitHead": "fd322852e4ce136d34faaf2d89ddfb0c7a83a947"
 }

package/src/cli.ts

@@ -257,12 +257,6 @@ yargs.command(
       .describe(
         "importmap",
         "The import map to use. Can be a path to an import map to be taken literally, an URL, or a fixed JSON object."
-      )
-      .boolean("download-coreapps")
-      .default("download-coreapps", false)
-      .describe(
-        "download-coreapps",
-        "Downloads and bundles the core apps. For cases where the core apps are not in the import map."
       ),
   async (args) =>
     runCommand("runBuild", {
@@ -289,7 +283,8 @@ yargs.command(
         coerce: (arg) => resolve(process.cwd(), arg),
       })
       .option("registry", {
-        default: "https://registry.npmjs.org/",
+        alias: "reg",
+        default: "",
         description: "The NPM registry used for getting the packages.",
         type: "string",
         coerce: (arg) => trimEnd(arg, "/"),

package/src/commands/assemble.ts

@@ -3,15 +3,19 @@ import { resolve, dirname, basename } from "path";
 import { prompt, Question } from "inquirer";
 import rimraf from "rimraf";
 import axios from "axios";
+import npmRegistryFetch from "npm-registry-fetch";
 import pacote from "pacote";
 import { logInfo, untar } from "../utils";
 import { createReadStream, existsSync } from "fs";
+import { getNpmRegistryConfiguration } from "../utils/npmConfig";
+
+/* eslint-disable no-console */
 
 export interface AssembleArgs {
   target: string;
   mode: string;
   config: string;
-  registry: string;
+  registry?: string;
   fresh: boolean;
   manifest: boolean;
 }
@@ -34,7 +38,7 @@ interface AssembleConfig {
 async function readConfig(
   mode: string,
   config: string,
-  registry: string
+  fetchOptions: npmRegistryFetch.Options
 ): Promise<AssembleConfig> {
   switch (mode) {
     case "config":
@@ -51,11 +55,9 @@ async function readConfig(
     case "survey":
       logInfo(`Loading available frontend modules ...`);
 
-      const packages = await axios
-        .get<NpmSearchResult>(
-          `${registry}/-/v1/search?text=keywords:openmrs&size=250`
-        )
-        .then((res) => res.data)
+      const packages = await npmRegistryFetch
+        .json("/-/v1/search?text=keywords:openmrs&size=500", fetchOptions)
+        .then((res) => res as unknown as NpmSearchResult)
         .then((res) =>
           res.objects
             .map((m) => ({
@@ -113,7 +115,7 @@ async function downloadPackage(
   esmName: string,
   esmVersion: string,
   baseDir: string,
-  registry: string
+  fetchOptions: npmRegistryFetch.Options
 ) {
   if (esmVersion.startsWith("file:")) {
     const source = resolve(baseDir, esmVersion.substr(5));
@@ -129,9 +131,20 @@ async function downloadPackage(
     return file;
   } else {
     const packageName = `${esmName}@${esmVersion}`;
-    const tarManifest = await pacote.manifest(packageName, { registry });
+    const tarManifest = await pacote.manifest(packageName, fetchOptions);
+
+    if (
+      !Boolean(tarManifest) ||
+      !Boolean(tarManifest._resolved) ||
+      !Boolean(tarManifest._integrity)
+    ) {
+      throw new Error(
+        `Failed to load manifest for ${packageName} from registry ${fetchOptions.registry}`
+      );
+    }
+
     const tarball = await pacote.tarball(tarManifest._resolved, {
-      registry,
+      ...fetchOptions,
       integrity: tarManifest._integrity,
     });
 
@@ -176,7 +189,9 @@ async function extractFiles(sourceFile: string, targetDir: string) {
 }
 
 export async function runAssemble(args: AssembleArgs) {
-  const config = await readConfig(args.mode, args.config, args.registry);
+  const npmConf = getNpmRegistryConfiguration(args.registry);
+  const config = await readConfig(args.mode, args.config, npmConf);
+
   const importmap = {
     imports: {},
   };
@@ -203,8 +218,9 @@ export async function runAssemble(args: AssembleArgs) {
         esmName,
         esmVersion,
         config.baseDir,
-        args.registry
+        npmConf
       );
+
       const dirName = tgzFileName.replace(".tgz", "");
       const [fileName, version] = await extractFiles(
         resolve(cacheDir, tgzFileName),

package/src/commands/build.ts

@@ -1,18 +1,7 @@
-import {
-  copyFileSync,
-  createReadStream,
-  existsSync,
-  mkdirSync,
-  readdirSync,
-  readFileSync,
-  statSync,
-  unlinkSync,
-  writeFileSync,
-} from "fs";
-import { getImportmap, loadWebpackConfig, logInfo, untar } from "../utils";
+import { copyFileSync, existsSync, readFileSync } from "fs";
+import { getImportmap, loadWebpackConfig, logInfo } from "../utils";
 import rimraf from "rimraf";
-import { basename, resolve } from "path";
-import { execSync } from "child_process";
+import { basename, join, resolve } from "path";
 
 /* eslint-disable no-console */
 
@@ -25,7 +14,6 @@ export interface BuildArgs {
   apiUrl: string;
   pageTitle: string;
   supportOffline?: boolean;
-  downloadCoreapps: boolean;
   configUrls: Array<string>;
   configPaths: Array<string>;
   buildConfig?: string;
@@ -49,103 +37,13 @@ function loadBuildConfig(buildConfigPath?: string): BuildConfig {
   }
 }
 
-async function extractFiles(sourceFile: string, targetDir: string) {
-  const packageRoot = "package/";
-  const rs = createReadStream(sourceFile);
-  const files = await untar(rs);
-  const packageJson = JSON.parse(
-    files[`${packageRoot}package.json`].toString("utf8")
-  );
-  const entryModule =
-    packageJson.browser ?? packageJson.module ?? packageJson.main;
-
-  Object.keys(files)
-    .filter(
-      (f) =>
-        f === "package/package.json" ||
-        f.substr(packageRoot.length) === entryModule
-    )
-    .forEach((f) => {
-      const content = files[f];
-      const fileName = f.replace(packageRoot, "");
-      const targetFile = resolve(targetDir, fileName);
-      writeFileSync(targetFile, content);
-    });
-
-  unlinkSync(sourceFile);
-}
-
-function loadCoreApps(registry: string) {
-  /*
-   * if the user specified a OMRS_ESM_CORE_APPS_DIR, we assume this has
-   * the necessary coreapps; otherwise, we check if there are any coreapps
-   * available in the places the webpack configuration will check; if there
-   * aren't, we download the apps specified in the app-shell devDependencies
-   */
-  const appsPath =
-    process.env.OMRS_ESM_CORE_APPS_DIR ??
-    resolve(require.resolve("@openmrs/esm-app-shell"), "..", "..", "apps");
-
-  let hasApp = false;
-  if (existsSync(appsPath) && statSync(appsPath).isDirectory()) {
-    hasApp = readdirSync(appsPath).some((entry) => {
-      if (statSync(entry).isDirectory()) {
-        const packageJson = resolve(entry, "package.json");
-        if (existsSync(packageJson) && statSync(packageJson).isFile()) {
-          return require(packageJson).name?.endsWith("-app");
-        }
-      }
-    });
-  }
-
-  if (!hasApp) {
-    logInfo("Fetching core apps...");
-    const devDependencies: Record<string, string> =
-      require("@openmrs/esm-app-shell/package.json").devDependencies;
-
-    const apps = Object.keys(devDependencies)
-      .filter((dep) => dep.endsWith("-app"))
-      .map((dep) => [dep, devDependencies[dep]]);
-
-    if (apps.length > 0) {
-      const cacheDir = resolve(process.cwd(), ".cache");
-      if (!existsSync(cacheDir)) {
-        mkdirSync(cacheDir, { recursive: true });
-      }
-      const coreAppsDir =
-        process.env.OMRS_ESM_CORE_APPS_DIR ??
-        resolve(process.cwd(), ".cache", "apps");
-      rimraf.sync(coreAppsDir);
-      mkdirSync(coreAppsDir, { recursive: true });
-
-      apps.forEach(async ([name, version]) => {
-        const packageName = `${name}@${version}`;
-        const command = `npm pack ${packageName} --registry ${registry}`;
-        const result = execSync(command, {
-          cwd: cacheDir,
-        });
-
-        const tgzFile =
-          result.toString("utf8").split("\n").filter(Boolean).pop() ?? "";
-        const appDirName = tgzFile.replace(".tgz", "");
-        await extractFiles(
-          resolve(cacheDir, tgzFile),
-          resolve(coreAppsDir, appDirName)
-        );
-      });
-
-      return coreAppsDir;
-    }
-  }
-}
-
 function addConfigFilesFromPaths(
   configPaths: Array<string>,
   targetDir: string
 ) {
   for (let configPath of configPaths) {
     const realPath = resolve(configPath);
-    copyFileSync(realPath, targetDir + "/" + basename(configPath));
+    copyFileSync(realPath, join(targetDir, basename(configPath)));
   }
 }
 
@@ -156,9 +54,7 @@ export async function runBuild(args: BuildArgs) {
   for (let configPath of buildConfig.configPaths || args.configPaths) {
     configUrls.push(basename(configPath));
   }
-  const coreAppsDir = args.downloadCoreapps
-    ? loadCoreApps(args.registry)
-    : undefined;
+
   const config = loadWebpackConfig({
     importmap: await getImportmap(buildConfig.importmap || args.importmap),
     env: "production",
@@ -167,7 +63,6 @@ export async function runBuild(args: BuildArgs) {
     pageTitle: buildConfig.pageTitle || args.pageTitle,
     supportOffline: buildConfig.supportOffline ?? args.supportOffline,
     spaPath: buildConfig.spaPath || args.spaPath,
-    coreAppsDir,
   });
 
   logInfo(`Running build process ...`);

package/src/commands/debug.ts

@@ -54,5 +54,5 @@ export function runDebug(args: DebugArgs) {
     }
   });
 
-  return new Promise(() => {});
+  return new Promise<void>(() => {});
 }

package/src/commands/develop.ts

@@ -129,5 +129,5 @@ export function runDevelop(args: DevelopArgs) {
     }
   });
 
-  return new Promise(() => {});
+  return new Promise<void>(() => {});
 }

package/src/commands/start.ts

@@ -57,5 +57,5 @@ export function runStart(args: StartArgs) {
     }
   });
 
-  return new Promise(() => {});
+  return new Promise<void>(() => {});
 }

package/src/runner.ts

@@ -1,16 +1,26 @@
 import * as commands from "./commands";
 import { logFail } from "./utils";
 
-process.on("message", async ({ type, args }) => {
-  const command = commands[type];
+type Commands = typeof commands;
+type CommandNames = keyof Commands;
+interface HandleMessageArgs<T extends CommandNames> {
+  type: T;
+  args: Parameters<Commands[T]>[0];
+}
 
-  if (typeof command === "function") {
-    try {
-      await command(args);
-      process.exit(0);
-    } catch (err) {
-      logFail(err.message);
-      process.exit(1);
+process.on(
+  "message",
+  async <T extends CommandNames>({ type, args }: HandleMessageArgs<T>) => {
+    const command: (a: typeof args) => Promise<unknown> = commands[type];
+
+    if (typeof command === "function") {
+      try {
+        await command(args);
+        process.exit(0);
+      } catch (err) {
+        logFail(err.message);
+        process.exit(1);
+      }
     }
   }
-});
+);

package/src/utils/npmConfig.ts

@@ -0,0 +1,57 @@
+import npmRegistryFetch from "npm-registry-fetch";
+import npmConfig from "@pnpm/npm-conf";
+
+/**
+ * Utility function to load the appropriate configuration for npmRegistryFetch
+ * from the .npmrc configuration chain. Essentially, this allows us to use .npmrc
+ * files to configure reading from the NPM registry, which is useful when using
+ * a custom registry, especially for private packages.
+ *
+ * This uses the @pnpm/npm-conf library for reading .npmrc files as its both
+ * maintained and sane to work with.
+ *
+ * @param registry The NPM registry to use, if any
+ */
+export function getNpmRegistryConfiguration(
+  registry?: string | null | undefined
+): npmRegistryFetch.Options {
+  const conf = npmConfig();
+
+  if (!conf) {
+    return {};
+  }
+
+  if (conf.warnings.length >= 1) {
+    throw new Error(
+      `Warnings while loading .npmrc:\n  ${conf.warnings.join("\n  ")}`
+    );
+  }
+
+  if (!conf.config) {
+    return {};
+  }
+
+  // the returned config object uses getters with no list of keys
+  // so to convert this to a "normal" object, we combine all the settings
+  // found; note this relies on the internal structure of the config
+  // object and may not be stable
+  const configuration: npmRegistryFetch.Options = Object.assign(
+    {},
+    ...(conf.config.list.slice().reverse() ?? [])
+  );
+
+  if (configuration.__source__) {
+    delete configuration.__source__;
+  }
+
+  if ("strict-ssl" in configuration) {
+    configuration.strictSSL = configuration["strict-ssl"];
+    delete configuration["strict-ssl"];
+  }
+
+  if (registry) {
+    configuration.registry = registry;
+  }
+
+  return configuration;
+}