Skip to content

Commit 27d4f3e

Browse files
Merge pull request #1262 from opencomponents/optional-prefix
[BUGFIX] Add back --prefix when installing dependencies
2 parents 348035a + 960d990 commit 27d4f3e

7 files changed

+29
-8
lines changed

src/cli/domain/handle-dependencies/install-compiler.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ export default function installCompiler(
2121
dependency,
2222
installPath: componentPath,
2323
save: false,
24-
silent: true
24+
silent: true,
25+
usePrefix: false
2526
};
2627

2728
npm.installDependency(npmOptions, err => {

src/cli/domain/handle-dependencies/install-missing-dependencies.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ export default function installMissingDependencies(
2323
dependencies: missing,
2424
installPath: path.resolve('.'),
2525
save: false,
26-
silent: true
26+
silent: true,
27+
usePrefix: true
2728
};
2829

2930
npm.installDependencies(npmOptions, err => {

src/cli/domain/init-template/install-template.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ export default function installTemplate(
2222
dependency: compiler,
2323
installPath: componentPath,
2424
isDev: true,
25-
save: true
25+
save: true,
26+
usePrefix: false
2627
};
2728

2829
logger.log(strings.messages.cli.installCompiler(compiler));

src/utils/npm-utils.ts

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ const buildInstallCommand = (options: {
88
installPath: string;
99
save?: boolean;
1010
isDev?: boolean;
11+
usePrefix: boolean;
1112
}) => {
1213
const args = ['install'];
1314

15+
if (options.usePrefix) {
16+
args.push('--prefix', options.installPath);
17+
}
18+
1419
if (options.save) {
1520
args.push('--save-exact');
1621
args.push(options.isDev ? '--save-dev' : '--save');
@@ -54,7 +59,12 @@ export const init = (
5459
};
5560

5661
export const installDependencies = (
57-
options: { dependencies: string[]; installPath: string; silent: boolean },
62+
options: {
63+
dependencies: string[];
64+
installPath: string;
65+
silent: boolean;
66+
usePrefix: boolean;
67+
},
5868
callback: Callback<{ dest: string }, string | number>
5969
): void => {
6070
const { dependencies, installPath, silent } = options;
@@ -75,7 +85,12 @@ export const installDependencies = (
7585
};
7686

7787
export const installDependency = (
78-
options: { dependency: string; installPath: string; silent?: boolean },
88+
options: {
89+
dependency: string;
90+
installPath: string;
91+
silent?: boolean;
92+
usePrefix: boolean;
93+
},
7994
callback: Callback<{ dest: string }, string | number>
8095
): void => {
8196
const { dependency, installPath, silent } = options;

test/unit/cli-domain-handle-dependencies-install-compiler.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ describe('cli : domain : handle-dependencies : install-compiler', () => {
5656
dependency: '[email protected]',
5757
installPath: '/path/to/components/component/',
5858
save: false,
59-
silent: true
59+
silent: true,
60+
usePrefix: false
6061
});
6162
});
6263

test/unit/cli-domain-handle-dependencies-install-missing-dependencies.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ describe('cli : domain : handle-dependencies : install-missing-dependencies', ()
8282
dependencies: ['[email protected]', 'underscore@latest'],
8383
installPath: '/path/to/oc-running',
8484
save: false,
85-
silent: true
85+
silent: true,
86+
usePrefix: true
8687
});
8788
});
8889

test/unit/cli-domain-init-template-install-template.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ describe('cli : domain : init-template : install-template', () => {
4646
dependency: 'oc-template-jade-compiler',
4747
installPath: 'path/to/component',
4848
isDev: true,
49-
save: true
49+
save: true,
50+
usePrefix: false
5051
});
5152
});
5253

0 commit comments

Comments
 (0)