Skip to content

Commit 2cf724f

Browse files
imhoffdimhoffd
committed
fix(angular): pass --project and --configuration for custom scripts
Fixes #3845
1 parent 0bf0912 commit 2cf724f

4 files changed

Lines changed: 202 additions & 17 deletions

File tree

‎packages/ionic/src/lib/project/angular/__tests__/build.ts‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
import { AngularBuildCLI } from '../build';
2+
3+
describe('ionic', () => {
4+
5+
describe('lib/project/angular/build', () => {
6+
7+
describe('AngularBuildCLI', () => {
8+
9+
describe('buildOptionsToNgArgs', () => {
10+
11+
const defaults = {
12+
'--': [],
13+
};
14+
15+
it('should pass options', async () => {
16+
const project = {};
17+
const cli = new AngularBuildCLI({ project } as any);
18+
const options = {
19+
...defaults,
20+
sourcemaps: true,
21+
};
22+
23+
const result = await (cli as any).buildOptionsToNgArgs(options);
24+
expect(result).toEqual(['--source-map']);
25+
});
26+
27+
it('should pass cordova options', async () => {
28+
const root = 'fakeRoot';
29+
const project = {
30+
requireIntegration: jest.fn(() => ({ root })),
31+
};
32+
const cli = new AngularBuildCLI({ project } as any);
33+
const options = {
34+
...defaults,
35+
engine: 'cordova',
36+
platform: 'fakePlatform',
37+
};
38+
39+
const result = await (cli as any).buildOptionsToNgArgs(options);
40+
expect(result).toEqual([
41+
`--platform=${options.platform}`,
42+
`--cordova-base-path=${root}`,
43+
]);
44+
});
45+
46+
it('should pass separated options', async () => {
47+
const project = {};
48+
const cli = new AngularBuildCLI({ project } as any);
49+
const options = {
50+
...defaults,
51+
'--': ['--extra=true'],
52+
};
53+
54+
const result = await (cli as any).buildOptionsToNgArgs(options);
55+
expect(result).toEqual(['--extra=true']);
56+
});
57+
58+
it('should not pass separated options for cordova', async () => {
59+
const root = 'fakeRoot';
60+
const project = {
61+
requireIntegration: jest.fn(() => ({ root })),
62+
};
63+
const cli = new AngularBuildCLI({ project } as any);
64+
const options = {
65+
...defaults,
66+
engine: 'cordova',
67+
platform: 'fakePlatform',
68+
'--': ['--extra=true'],
69+
};
70+
71+
const result = await (cli as any).buildOptionsToNgArgs(options);
72+
expect(result).not.toEqual(expect.arrayContaining(['--extra=true']));
73+
});
74+
75+
it('should pass configuration and project for custom program', async () => {
76+
const project = {};
77+
const cli = new AngularBuildCLI({ project } as any);
78+
(cli as any)._resolvedProgram = 'npm';
79+
const options = {
80+
...defaults,
81+
configuration: 'production',
82+
project: 'otherProject',
83+
};
84+
85+
const result = await (cli as any).buildOptionsToNgArgs(options);
86+
expect(result).toEqual(['--configuration=production', '--project=otherProject']);
87+
});
88+
89+
it('should not pass configuration and project for custom program if they are the defaults', async () => {
90+
const project = {};
91+
const cli = new AngularBuildCLI({ project } as any);
92+
(cli as any)._resolvedProgram = 'npm';
93+
const options = {
94+
...defaults,
95+
};
96+
97+
const result = await (cli as any).buildOptionsToNgArgs(options);
98+
expect(result).toEqual([]);
99+
});
100+
101+
});
102+
103+
});
104+
105+
});
106+
107+
});

‎packages/ionic/src/lib/project/angular/__tests__/serve.ts‎

Lines changed: 69 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,41 +84,97 @@ describe('ionic', () => {
8484
};
8585

8686
it('should pass options', async () => {
87-
const root = 'fakeRoot';
88-
const project = {
89-
requireIntegration: jest.fn(() => ({ root })),
90-
};
91-
const runner = new AngularServeCLI({ project } as any);
87+
const project = {};
88+
const cli = new AngularServeCLI({ project } as any);
9289
const options = {
9390
...defaults,
91+
address: 'localhost',
92+
port: 4200,
9493
sourcemaps: true,
9594
ssl: true,
9695
};
9796

98-
const result = await (runner as any).serveOptionsToNgArgs(options);
99-
expect(result).toEqual(expect.arrayContaining([
100-
`--ssl`,
97+
const result = await (cli as any).serveOptionsToNgArgs(options);
98+
expect(result).toEqual([
99+
`--host=${options.address}`,
100+
`--port=${options.port}`,
101101
`--source-map`,
102-
]));
102+
`--ssl`,
103+
]);
103104
});
104105

105106
it('should pass cordova options', async () => {
106107
const root = 'fakeRoot';
107108
const project = {
108109
requireIntegration: jest.fn(() => ({ root })),
109110
};
110-
const runner = new AngularServeCLI({ project } as any);
111+
const cli = new AngularServeCLI({ project } as any);
111112
const options = {
112113
...defaults,
113114
engine: 'cordova',
114115
platform: 'fakePlatform',
115116
};
116117

117-
const result = await (runner as any).serveOptionsToNgArgs(options);
118-
expect(result).toEqual(expect.arrayContaining([
118+
const result = await (cli as any).serveOptionsToNgArgs(options);
119+
expect(result).toEqual([
119120
`--platform=${options.platform}`,
120121
`--cordova-base-path=${root}`,
121-
]));
122+
]);
123+
});
124+
125+
it('should pass separated options', async () => {
126+
const project = {};
127+
const cli = new AngularServeCLI({ project } as any);
128+
const options = {
129+
...defaults,
130+
'--': ['--extra=true'],
131+
};
132+
133+
const result = await (cli as any).serveOptionsToNgArgs(options);
134+
expect(result).toEqual(['--extra=true']);
135+
});
136+
137+
it('should not pass separated options for cordova', async () => {
138+
const root = 'fakeRoot';
139+
const project = {
140+
requireIntegration: jest.fn(() => ({ root })),
141+
};
142+
const cli = new AngularServeCLI({ project } as any);
143+
const options = {
144+
...defaults,
145+
engine: 'cordova',
146+
platform: 'fakePlatform',
147+
'--': ['--extra=true'],
148+
};
149+
150+
const result = await (cli as any).serveOptionsToNgArgs(options);
151+
expect(result).not.toEqual(expect.arrayContaining(['--extra=true']));
152+
});
153+
154+
it('should pass configuration and project for custom program', async () => {
155+
const project = {};
156+
const cli = new AngularServeCLI({ project } as any);
157+
(cli as any)._resolvedProgram = 'npm';
158+
const options = {
159+
...defaults,
160+
configuration: 'production',
161+
project: 'otherProject',
162+
};
163+
164+
const result = await (cli as any).serveOptionsToNgArgs(options);
165+
expect(result).toEqual(['--configuration=production', '--project=otherProject']);
166+
});
167+
168+
it('should not pass configuration and project for custom program if they are the defaults', async () => {
169+
const project = {};
170+
const cli = new AngularServeCLI({ project } as any);
171+
(cli as any)._resolvedProgram = 'npm';
172+
const options = {
173+
...defaults,
174+
};
175+
176+
const result = await (cli as any).serveOptionsToNgArgs(options);
177+
expect(result).toEqual([]);
122178
});
123179

124180
});

‎packages/ionic/src/lib/project/angular/build.ts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ ${chalk.green('ionic build')} uses the Angular CLI. Use ${chalk.green('ng build
9090
}
9191
}
9292

93-
class AngularBuildCLI extends BuildCLI<AngularBuildOptions> {
93+
export class AngularBuildCLI extends BuildCLI<AngularBuildOptions> {
9494
readonly name = 'Angular CLI';
9595
readonly pkg = '@angular/cli';
9696
readonly program = 'ng';
@@ -117,6 +117,7 @@ class AngularBuildCLI extends BuildCLI<AngularBuildOptions> {
117117
'cordova-assets': options.cordovaAssets !== false ? undefined : 'false',
118118
};
119119

120+
const projectArgs = [];
120121
let separatedArgs = options['--'];
121122

122123
if (options.engine === 'cordova') {
@@ -130,7 +131,17 @@ class AngularBuildCLI extends BuildCLI<AngularBuildOptions> {
130131
separatedArgs = [];
131132
}
132133

133-
return [...unparseArgs(args), ...separatedArgs];
134+
if (this.resolvedProgram !== this.program) {
135+
if (options.configuration) {
136+
projectArgs.push(`--configuration=${options.configuration}`);
137+
}
138+
139+
if (options.project) {
140+
projectArgs.push(`--project=${options.project}`);
141+
}
142+
}
143+
144+
return [...unparseArgs(args), ...projectArgs, ...separatedArgs];
134145
}
135146

136147
protected buildArchitectCommand(options: AngularBuildOptions): string[] {

‎packages/ionic/src/lib/project/angular/serve.ts‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,12 @@ export class AngularServeCLI extends ServeCLI<AngularServeOptions> {
194194
const args: ParsedArgs = {
195195
_: [],
196196
host: options.address,
197-
port: String(options.port),
197+
port: options.port ? options.port.toString() : undefined,
198198
'source-map': options.sourcemaps !== false ? options.sourcemaps : 'false',
199199
'ssl': options.ssl !== false ? options.ssl : 'false',
200200
};
201201

202+
const projectArgs = [];
202203
let separatedArgs = options['--'];
203204

204205
if (options.engine === 'cordova') {
@@ -216,7 +217,17 @@ export class AngularServeCLI extends ServeCLI<AngularServeOptions> {
216217
}
217218
}
218219

219-
return [...unparseArgs(args), ...separatedArgs];
220+
if (this.resolvedProgram !== this.program) {
221+
if (options.configuration) {
222+
projectArgs.push(`--configuration=${options.configuration}`);
223+
}
224+
225+
if (options.project) {
226+
projectArgs.push(`--project=${options.project}`);
227+
}
228+
}
229+
230+
return [...unparseArgs(args), ...projectArgs, ...separatedArgs];
220231
}
221232

222233
protected buildArchitectCommand(options: AngularServeOptions): string[] {

0 commit comments

Comments
 (0)