nativescript 9.1.0 → 9.1.1-dev.0

package/lib/base-package-manager.js

@@ -53,7 +53,9 @@ class BasePackageManager {
     }
     async processPackageManagerInstall(packageName, params, opts) {
         const npmExecutable = this.getPackageManagerExecutableName();
-        const stdioValue = (0, helpers_1.isInteractive)() ? "inherit" : "pipe";
+        const stdioValue = (0, helpers_1.isInteractive)()
+            ? "inherit"
+            : ["ignore", "pipe", "pipe"];
         await this.$childProcess.spawnFromEvent(npmExecutable, params, "close", {
             cwd: opts.cwd,
             stdio: stdioValue,

package/lib/pnpm-package-manager.d.ts

@@ -13,4 +13,5 @@ export declare class PnpmPackageManager extends BasePackageManager {
     searchNpms(keyword: string): Promise<INpmsResult>;
     getRegistryPackageData(packageName: string): Promise<any>;
     getCachePath(): Promise<string>;
+    private projectManagesOwnHoisting;
 }

package/lib/pnpm-package-manager.js

@@ -28,10 +28,16 @@ class PnpmPackageManager extends base_package_manager_1.BasePackageManager {
         if (config.ignoreScripts) {
             config["ignore-scripts"] = true;
         }
+        delete config.ignoreScripts;
+        delete config.path;
+        delete config.frameworkPath;
         const packageJsonPath = path.join(pathToSave, "package.json");
         const jsonContentBefore = this.$fs.readJson(packageJsonPath);
         const flags = this.getFlagsString(config, true);
-        let params = ["i", "--shamefully-hoist"];
+        let params = ["i"];
+        if (!this.projectManagesOwnHoisting(pathToSave)) {
+            params.push("--shamefully-hoist");
+        }
         const isInstallingAllDependencies = packageName === pathToSave;
         if (!isInstallingAllDependencies) {
             params.push(packageName);
@@ -92,7 +98,38 @@ class PnpmPackageManager extends base_package_manager_1.BasePackageManager {
     }
     async getCachePath() {
         const cachePath = await this.$childProcess.exec(`pnpm config get cache`);
-        return path.join(cachePath.trim(), constants_1.CACACHE_DIRECTORY_NAME);
+        const cacheDir = cachePath && cachePath.trim();
+        if (cacheDir && cacheDir !== "undefined" && cacheDir !== "null") {
+            return path.join(cacheDir, constants_1.CACACHE_DIRECTORY_NAME);
+        }
+        const storePath = await this.$childProcess.exec(`pnpm store path`);
+        return path.join(path.dirname(storePath.trim()), constants_1.CACACHE_DIRECTORY_NAME);
+    }
+    projectManagesOwnHoisting(installDir) {
+        const layoutKeyPattern = /^\s*(shamefully-hoist|node-linker|hoist|hoist-pattern|public-hoist-pattern)\s*[=:]/m;
+        let dir = path.resolve(installDir);
+        while (true) {
+            if (this.$fs.exists(path.join(dir, "pnpm-workspace.yaml"))) {
+                return true;
+            }
+            const npmrcPath = path.join(dir, ".npmrc");
+            if (this.$fs.exists(npmrcPath)) {
+                try {
+                    const npmrcContent = this.$fs.readText(npmrcPath);
+                    if (npmrcContent && layoutKeyPattern.test(npmrcContent)) {
+                        return true;
+                    }
+                }
+                catch (err) {
+                    this.$logger.trace(`Unable to read ${npmrcPath}. Error is: `, err);
+                }
+            }
+            const parent = path.dirname(dir);
+            if (parent === dir) {
+                return false;
+            }
+            dir = parent;
+        }
     }
 }
 exports.PnpmPackageManager = PnpmPackageManager;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "main": "./lib/nativescript-cli-lib.js",
-  "version": "9.1.0",
+  "version": "9.1.1-dev.0",
   "author": "NativeScript <oss@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {