Merge pull request #1262 from opencomponents/optional-prefix

[BUGFIX] Add back --prefix when installing dependencies
opencomponents · Oct 21, 2021 · 27d4f3e · 27d4f3e
2 parents 348035a + 960d990
commit 27d4f3e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/src/cli/domain/handle-dependencies/install-compiler.ts b/src/cli/domain/handle-dependencies/install-compiler.ts
@@ -21,7 +21,8 @@ export default function installCompiler(
     dependency,
     installPath: componentPath,
     save: false,
-    silent: true
+    silent: true,
+    usePrefix: false
   };
 
   npm.installDependency(npmOptions, err => {

diff --git a/src/cli/domain/handle-dependencies/install-missing-dependencies.ts b/src/cli/domain/handle-dependencies/install-missing-dependencies.ts
@@ -23,7 +23,8 @@ export default function installMissingDependencies(
     dependencies: missing,
     installPath: path.resolve('.'),
     save: false,
-    silent: true
+    silent: true,
+    usePrefix: true
   };
 
   npm.installDependencies(npmOptions, err => {

diff --git a/src/cli/domain/init-template/install-template.ts b/src/cli/domain/init-template/install-template.ts
@@ -22,7 +22,8 @@ export default function installTemplate(
     dependency: compiler,
     installPath: componentPath,
     isDev: true,
-    save: true
+    save: true,
+    usePrefix: false
   };
 
   logger.log(strings.messages.cli.installCompiler(compiler));

diff --git a/src/utils/npm-utils.ts b/src/utils/npm-utils.ts
@@ -8,9 +8,14 @@ const buildInstallCommand = (options: {
   installPath: string;
   save?: boolean;
   isDev?: boolean;
+  usePrefix: boolean;
 }) => {
   const args = ['install'];
 
+  if (options.usePrefix) {
+    args.push('--prefix', options.installPath);
+  }
+
   if (options.save) {
     args.push('--save-exact');
     args.push(options.isDev ? '--save-dev' : '--save');
@@ -54,7 +59,12 @@ export const init = (
 };
 
 export const installDependencies = (
-  options: { dependencies: string[]; installPath: string; silent: boolean },
+  options: {
+    dependencies: string[];
+    installPath: string;
+    silent: boolean;
+    usePrefix: boolean;
+  },
   callback: Callback<{ dest: string }, string | number>
 ): void => {
   const { dependencies, installPath, silent } = options;
@@ -75,7 +85,12 @@ export const installDependencies = (
 };
 
 export const installDependency = (
-  options: { dependency: string; installPath: string; silent?: boolean },
+  options: {
+    dependency: string;
+    installPath: string;
+    silent?: boolean;
+    usePrefix: boolean;
+  },
   callback: Callback<{ dest: string }, string | number>
 ): void => {
   const { dependency, installPath, silent } = options;

diff --git a/test/unit/cli-domain-handle-dependencies-install-compiler.js b/test/unit/cli-domain-handle-dependencies-install-compiler.js
@@ -56,7 +56,8 @@ describe('cli : domain : handle-dependencies : install-compiler', () => {
         dependency: '[email protected]',
         installPath: '/path/to/components/component/',
         save: false,
-        silent: true
+        silent: true,
+        usePrefix: false
       });
     });
 

diff --git a/test/unit/cli-domain-handle-dependencies-install-missing-dependencies.js b/test/unit/cli-domain-handle-dependencies-install-missing-dependencies.js
@@ -82,7 +82,8 @@ describe('cli : domain : handle-dependencies : install-missing-dependencies', ()
         dependencies: ['[email protected]', 'underscore@latest'],
         installPath: '/path/to/oc-running',
         save: false,
-        silent: true
+        silent: true,
+        usePrefix: true
       });
     });
 

diff --git a/test/unit/cli-domain-init-template-install-template.js b/test/unit/cli-domain-init-template-install-template.js
@@ -46,7 +46,8 @@ describe('cli : domain : init-template : install-template', () => {
         dependency: 'oc-template-jade-compiler',
         installPath: 'path/to/component',
         isDev: true,
-        save: true
+        save: true,
+        usePrefix: false
       });
     });