openmrs 4.0.3-pre.389 → 4.0.3-pre.392

package/.turbo/turbo-build.log

@@ -1 +1 @@
-openmrs:build: cache hit, replaying output fe305f0a7e255423
+openmrs:build: cache hit, replaying output 2c31e9e62e88b750

package/dist/commands/assemble.js

@@ -15,11 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runAssemble = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
-const child_process_1 = require("child_process");
 const inquirer_1 = require("inquirer");
-const utils_1 = require("../utils");
 const rimraf_1 = __importDefault(require("rimraf"));
 const axios_1 = __importDefault(require("axios"));
+const pacote_1 = __importDefault(require("pacote"));
+const utils_1 = require("../utils");
 function readConfig(mode, config, registry) {
     return __awaiter(this, void 0, void 0, function* () {
         switch (mode) {
@@ -78,7 +78,6 @@ function readConfig(mode, config, registry) {
     });
 }
 function downloadPackage(cacheDir, esmName, esmVersion, baseDir, registry) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         if (esmVersion.startsWith("file:")) {
             const source = (0, path_1.resolve)(baseDir, esmVersion.substr(5));
@@ -96,12 +95,17 @@ function downloadPackage(cacheDir, esmName, esmVersion, baseDir, registry) {
         }
         else {
             const packageName = `${esmName}@${esmVersion}`;
-            const command = `npm pack ${packageName} --registry ${registry}`;
-            (0, fs_1.mkdirSync)(cacheDir, { recursive: true });
-            const result = (0, child_process_1.execSync)(command, {
-                cwd: cacheDir,
+            const tarManifest = yield pacote_1.default.manifest(packageName, { registry });
+            const tarball = yield pacote_1.default.tarball(tarManifest._resolved, {
+                registry,
+                integrity: tarManifest._integrity,
             });
-            return (_a = result.toString("utf8").split("\n").filter(Boolean).pop()) !== null && _a !== void 0 ? _a : "";
+            const filename = `${tarManifest.name}-${tarManifest.version}.tgz`
+                .replace(/^@/, "")
+                .replace(/\//, "-");
+            (0, fs_1.mkdirSync)(cacheDir, { recursive: true });
+            (0, fs_1.writeFileSync)((0, path_1.resolve)(cacheDir, filename), tarball);
+            return filename;
         }
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmrs",
-  "version": "4.0.3-pre.389",
+  "version": "4.0.3-pre.392",
   "license": "MPL-2.0",
   "main": "dist/index.js",
   "bin": "./dist/cli.js",
@@ -30,8 +30,8 @@
   ],
   "homepage": "https://github.com/openmrs/openmrs-esm-core#readme",
   "dependencies": {
-    "@openmrs/esm-app-shell": "4.0.3-pre.389",
-    "@openmrs/webpack-config": "4.0.3-pre.389",
+    "@openmrs/esm-app-shell": "4.0.3-pre.392",
+    "@openmrs/webpack-config": "4.0.3-pre.392",
     "autoprefixer": "^10.4.2",
     "axios": "^0.21.1",
     "browserslist-config-openmrs": "^1.0.1",
@@ -42,6 +42,7 @@
     "html-webpack-plugin": "^5.5.0",
     "inquirer": "^7.3.3",
     "mini-css-extract-plugin": "^2.4.5",
+    "pacote": "^15.0.0",
     "postcss": "^8.4.6",
     "postcss-loader": "^6.2.1",
     "rimraf": "^3.0.2",
@@ -60,10 +61,11 @@
     "@types/glob": "^7.1.1",
     "@types/inquirer": "^6.5.0",
     "@types/node": "12.12.2",
+    "@types/pacote": "^11.1.5",
     "@types/react": "^18.0.9",
     "@types/rimraf": "^2.0.2",
     "@types/systemjs": "^6.1.0",
     "@types/tar": "^4.0.3"
   },
-  "gitHead": "4261ef4b3d40829a76b4ef82f77c169006322910"
+  "gitHead": "ca2a1b3f51fbda1af1b46b40174321035785479d"
 }

package/src/commands/assemble.ts

@@ -8,11 +8,11 @@ import {
   copyFileSync,
 } from "fs";
 import { resolve, dirname, basename } from "path";
-import { execSync } from "child_process";
 import { prompt, Question } from "inquirer";
-import { logInfo, untar } from "../utils";
 import rimraf from "rimraf";
 import axios from "axios";
+import pacote from "pacote";
+import { logInfo, untar } from "../utils";
 
 export interface AssembleArgs {
   target: string;
@@ -135,12 +135,20 @@ async function downloadPackage(
     return file;
   } else {
     const packageName = `${esmName}@${esmVersion}`;
-    const command = `npm pack ${packageName} --registry ${registry}`;
-    mkdirSync(cacheDir, { recursive: true });
-    const result = execSync(command, {
-      cwd: cacheDir,
+    const tarManifest = await pacote.manifest(packageName, { registry });
+    const tarball = await pacote.tarball(tarManifest._resolved, {
+      registry,
+      integrity: tarManifest._integrity,
     });
-    return result.toString("utf8").split("\n").filter(Boolean).pop() ?? "";
+
+    const filename = `${tarManifest.name}-${tarManifest.version}.tgz`
+      .replace(/^@/, "")
+      .replace(/\//, "-");
+
+    mkdirSync(cacheDir, { recursive: true });
+    writeFileSync(resolve(cacheDir, filename), tarball);
+
+    return filename;
   }
 }