@react-native-windows/cli 0.0.0-canary.99 → 0.0.1-0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -2
- package/lib-commonjs/{runWindows/utils/autolink.d.ts → commands/autolinkWindows/autolinkWindows.d.ts} +87 -86
- package/lib-commonjs/{runWindows/utils/autolink.js → commands/autolinkWindows/autolinkWindows.js} +655 -625
- package/lib-commonjs/commands/autolinkWindows/autolinkWindows.js.map +1 -0
- package/lib-commonjs/commands/autolinkWindows/autolinkWindowsOptions.d.ts +14 -0
- package/lib-commonjs/commands/autolinkWindows/autolinkWindowsOptions.js +33 -0
- package/lib-commonjs/commands/autolinkWindows/autolinkWindowsOptions.js.map +1 -0
- package/lib-commonjs/commands/codegenWindows/codegenWindows.d.ts +27 -0
- package/lib-commonjs/commands/codegenWindows/codegenWindows.js +206 -0
- package/lib-commonjs/commands/codegenWindows/codegenWindows.js.map +1 -0
- package/lib-commonjs/commands/codegenWindows/codegenWindowsOptions.d.ts +12 -0
- package/lib-commonjs/commands/codegenWindows/codegenWindowsOptions.js +23 -0
- package/lib-commonjs/commands/codegenWindows/codegenWindowsOptions.js.map +1 -0
- package/lib-commonjs/{config → commands/config}/configUtils.d.ts +123 -116
- package/lib-commonjs/{config → commands/config}/configUtils.js +380 -341
- package/lib-commonjs/commands/config/configUtils.js.map +1 -0
- package/lib-commonjs/{config → commands/config}/dependencyConfig.d.ts +37 -37
- package/lib-commonjs/{config → commands/config}/dependencyConfig.js +227 -221
- package/lib-commonjs/commands/config/dependencyConfig.js.map +1 -0
- package/lib-commonjs/{config → commands/config}/projectConfig.d.ts +27 -27
- package/lib-commonjs/{config → commands/config}/projectConfig.js +180 -176
- package/lib-commonjs/commands/config/projectConfig.js.map +1 -0
- package/lib-commonjs/commands/healthCheck/healthCheckList.d.ts +6 -0
- package/lib-commonjs/commands/healthCheck/healthCheckList.js +21 -0
- package/lib-commonjs/commands/healthCheck/healthCheckList.js.map +1 -0
- package/lib-commonjs/{healthChecks.d.ts → commands/healthCheck/healthChecks.d.ts} +7 -2
- package/lib-commonjs/commands/healthCheck/healthChecks.js +124 -0
- package/lib-commonjs/commands/healthCheck/healthChecks.js.map +1 -0
- package/lib-commonjs/commands/initWindows/initWindows.d.ts +46 -0
- package/lib-commonjs/commands/initWindows/initWindows.js +244 -0
- package/lib-commonjs/commands/initWindows/initWindows.js.map +1 -0
- package/lib-commonjs/commands/initWindows/initWindowsOptions.d.ts +15 -0
- package/lib-commonjs/commands/initWindows/initWindowsOptions.js +38 -0
- package/lib-commonjs/commands/initWindows/initWindowsOptions.js.map +1 -0
- package/lib-commonjs/{runWindows → commands/runWindows}/runWindows.d.ts +10 -11
- package/lib-commonjs/{runWindows → commands/runWindows}/runWindows.js +321 -318
- package/lib-commonjs/commands/runWindows/runWindows.js.map +1 -0
- package/lib-commonjs/{runWindows → commands/runWindows}/runWindowsOptions.d.ts +56 -56
- package/lib-commonjs/{runWindows → commands/runWindows}/runWindowsOptions.js +132 -135
- package/lib-commonjs/commands/runWindows/runWindowsOptions.js.map +1 -0
- package/lib-commonjs/e2etest/autolink.test.d.ts +6 -6
- package/lib-commonjs/e2etest/autolink.test.js +366 -418
- package/lib-commonjs/e2etest/autolink.test.js.map +1 -1
- package/lib-commonjs/e2etest/dependencyConfig.test.d.ts +6 -6
- package/lib-commonjs/e2etest/dependencyConfig.test.js +129 -161
- package/lib-commonjs/e2etest/dependencyConfig.test.js.map +1 -1
- package/lib-commonjs/e2etest/healthChecks.test.d.ts +6 -0
- package/lib-commonjs/e2etest/healthChecks.test.js +31 -0
- package/lib-commonjs/e2etest/healthChecks.test.js.map +1 -0
- package/lib-commonjs/e2etest/initWindows.test.d.ts +6 -0
- package/lib-commonjs/e2etest/initWindows.test.js +43 -0
- package/lib-commonjs/e2etest/initWindows.test.js.map +1 -0
- package/lib-commonjs/e2etest/projectConfig.test.d.ts +6 -6
- package/lib-commonjs/e2etest/projectConfig.test.js +110 -124
- package/lib-commonjs/e2etest/projectConfig.test.js.map +1 -1
- package/lib-commonjs/e2etest/projectConfig.utils.d.ts +8 -4
- package/lib-commonjs/e2etest/projectConfig.utils.js +76 -62
- package/lib-commonjs/e2etest/projectConfig.utils.js.map +1 -1
- package/lib-commonjs/e2etest/runWindows.test.d.ts +6 -6
- package/lib-commonjs/e2etest/runWindows.test.js +60 -39
- package/lib-commonjs/e2etest/runWindows.test.js.map +1 -1
- package/lib-commonjs/e2etest/typesUpToDate.test.d.ts +6 -0
- package/lib-commonjs/e2etest/typesUpToDate.test.js +21 -0
- package/lib-commonjs/e2etest/typesUpToDate.test.js.map +1 -0
- package/lib-commonjs/generator-common/index.d.ts +39 -39
- package/lib-commonjs/generator-common/index.js +242 -242
- package/lib-commonjs/generator-common/index.js.map +1 -1
- package/lib-commonjs/generator-windows/index.d.ts +10 -10
- package/lib-commonjs/generator-windows/index.js +316 -369
- package/lib-commonjs/generator-windows/index.js.map +1 -1
- package/lib-commonjs/index.d.ts +50 -50
- package/lib-commonjs/index.js +77 -106
- package/lib-commonjs/index.js.map +1 -1
- package/lib-commonjs/{runWindows/utils → utils}/build.d.ts +12 -12
- package/lib-commonjs/{runWindows/utils → utils}/build.js +84 -84
- package/lib-commonjs/utils/build.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/checkRequirements.d.ts +6 -6
- package/lib-commonjs/{runWindows/utils → utils}/checkRequirements.js +69 -69
- package/lib-commonjs/utils/checkRequirements.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/commandWithProgress.d.ts +21 -15
- package/lib-commonjs/{runWindows/utils → utils}/commandWithProgress.js +149 -127
- package/lib-commonjs/utils/commandWithProgress.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/deploy.d.ts +12 -12
- package/lib-commonjs/{runWindows/utils → utils}/deploy.js +353 -328
- package/lib-commonjs/utils/deploy.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/info.d.ts +6 -6
- package/lib-commonjs/{runWindows/utils → utils}/info.js +28 -28
- package/lib-commonjs/utils/info.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/msbuildtools.d.ts +28 -26
- package/lib-commonjs/{runWindows/utils → utils}/msbuildtools.js +273 -219
- package/lib-commonjs/utils/msbuildtools.js.map +1 -0
- package/lib-commonjs/utils/pathHelpers.d.ts +9 -0
- package/lib-commonjs/utils/pathHelpers.js +37 -0
- package/lib-commonjs/utils/pathHelpers.js.map +1 -0
- package/lib-commonjs/utils/telemetryHelpers.d.ts +29 -0
- package/lib-commonjs/utils/telemetryHelpers.js +121 -0
- package/lib-commonjs/utils/telemetryHelpers.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/version.d.ts +19 -19
- package/lib-commonjs/{runWindows/utils → utils}/version.js +109 -109
- package/lib-commonjs/utils/version.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/vsInstalls.d.ts +34 -34
- package/lib-commonjs/{runWindows/utils → utils}/vsInstalls.js +99 -73
- package/lib-commonjs/utils/vsInstalls.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/vstools.d.ts +16 -16
- package/lib-commonjs/{runWindows/utils → utils}/vstools.js +189 -162
- package/lib-commonjs/utils/vstools.js.map +1 -0
- package/lib-commonjs/{runWindows/utils → utils}/winappdeploytool.d.ts +24 -24
- package/lib-commonjs/{runWindows/utils → utils}/winappdeploytool.js +108 -108
- package/lib-commonjs/utils/winappdeploytool.js.map +1 -0
- package/package.json +27 -20
- package/src/powershell/Eval-MsBuildProperties.ps1 +156 -0
- package/lib-commonjs/config/configUtils.js.map +0 -1
- package/lib-commonjs/config/dependencyConfig.js.map +0 -1
- package/lib-commonjs/config/projectConfig.js.map +0 -1
- package/lib-commonjs/healthChecks.js +0 -88
- package/lib-commonjs/healthChecks.js.map +0 -1
- package/lib-commonjs/runWindows/runWindows.js.map +0 -1
- package/lib-commonjs/runWindows/runWindowsOptions.js.map +0 -1
- package/lib-commonjs/runWindows/utils/autolink.js.map +0 -1
- package/lib-commonjs/runWindows/utils/build.js.map +0 -1
- package/lib-commonjs/runWindows/utils/checkRequirements.js.map +0 -1
- package/lib-commonjs/runWindows/utils/commandWithProgress.js.map +0 -1
- package/lib-commonjs/runWindows/utils/deploy.js.map +0 -1
- package/lib-commonjs/runWindows/utils/info.js.map +0 -1
- package/lib-commonjs/runWindows/utils/msbuildtools.js.map +0 -1
- package/lib-commonjs/runWindows/utils/version.js.map +0 -1
- package/lib-commonjs/runWindows/utils/vsInstalls.js.map +0 -1
- package/lib-commonjs/runWindows/utils/vstools.js.map +0 -1
- package/lib-commonjs/runWindows/utils/winappdeploytool.js.map +0 -1
- /package/{powershell → src/powershell}/Add-AppDevPackage.ps1 +0 -0
- /package/{powershell → src/powershell}/WindowsStoreAppUtils.ps1 +0 -0
|
@@ -1,419 +1,367 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
/**
|
|
3
|
-
* Copyright (c) Microsoft Corporation.
|
|
4
|
-
* Licensed under the MIT License.
|
|
5
|
-
* @format
|
|
6
|
-
*/
|
|
7
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
8
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
9
|
-
};
|
|
10
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
|
-
const path_1 = __importDefault(require("path"));
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
});
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
expect(replacements.
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
const
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
const
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
expect(al.
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
const
|
|
239
|
-
|
|
240
|
-
const
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
expect(al.
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
});
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
const
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
expect(
|
|
274
|
-
|
|
275
|
-
expect(al.
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
const
|
|
289
|
-
|
|
290
|
-
const
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
expect(
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
}
|
|
366
|
-
|
|
367
|
-
const autolink = new AutolinkTest({ windows: { folder: __dirname, sourceDir: '.', solutionFile: 'foo.sln' } }, {
|
|
368
|
-
superModule: {
|
|
369
|
-
name: 'superModule',
|
|
370
|
-
root: 'theRoot',
|
|
371
|
-
platforms: {
|
|
372
|
-
windows: {
|
|
373
|
-
sourceDir: __dirname,
|
|
374
|
-
projects: [
|
|
375
|
-
{
|
|
376
|
-
directDependency: true,
|
|
377
|
-
projectFile: 'superModule.vcxproj',
|
|
378
|
-
cppHeaders: ['Garfield.h', 'Snoopy.h'],
|
|
379
|
-
cppPackageProviders: ['FamousAnimalCartoons'],
|
|
380
|
-
},
|
|
381
|
-
{
|
|
382
|
-
directDependency: false,
|
|
383
|
-
projectFile: 'indirect.vcxproj',
|
|
384
|
-
},
|
|
385
|
-
],
|
|
386
|
-
},
|
|
387
|
-
},
|
|
388
|
-
assets: [],
|
|
389
|
-
hooks: {},
|
|
390
|
-
params: [],
|
|
391
|
-
},
|
|
392
|
-
}, {
|
|
393
|
-
check: true,
|
|
394
|
-
logging: false,
|
|
395
|
-
proj: 'projects/WithIndirectDependency/windows/WithIndirectDependency/WithIndirectDependency.vcxproj',
|
|
396
|
-
});
|
|
397
|
-
const replacements = autolink.getCppReplacements();
|
|
398
|
-
expect(replacements.cppIncludes).toMatch(/#include <Garfield.h>/);
|
|
399
|
-
expect(replacements.cppIncludes).toMatch(/#include <Snoopy.h>/);
|
|
400
|
-
expect(replacements.cppPackageProviders).toContain('packageProviders.Append(winrt::FamousAnimalCartoons())');
|
|
401
|
-
});
|
|
402
|
-
test('autolinkOptions - validate options', () => {
|
|
403
|
-
for (const commandOption of autolink_1.autolinkOptions) {
|
|
404
|
-
// Validate names
|
|
405
|
-
expect(commandOption.name).not.toBeNull();
|
|
406
|
-
expect(commandOption.name.startsWith('--')).toBe(true);
|
|
407
|
-
expect(commandOption.name).toBe(commandOption.name.trim());
|
|
408
|
-
// Validate defaults
|
|
409
|
-
if (!commandOption.name.endsWith(' [string]') &&
|
|
410
|
-
!commandOption.name.endsWith(' [number]')) {
|
|
411
|
-
// Commander ignores defaults for flags, so leave undefined to prevent confusion
|
|
412
|
-
expect(commandOption.default).toBeUndefined();
|
|
413
|
-
}
|
|
414
|
-
// Validate description
|
|
415
|
-
expect(commandOption.description).not.toBeNull();
|
|
416
|
-
expect(commandOption.description).toBe(commandOption.description.trim());
|
|
417
|
-
}
|
|
418
|
-
});
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Copyright (c) Microsoft Corporation.
|
|
4
|
+
* Licensed under the MIT License.
|
|
5
|
+
* @format
|
|
6
|
+
*/
|
|
7
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
8
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
9
|
+
};
|
|
10
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
|
+
const path_1 = __importDefault(require("path"));
|
|
12
|
+
const telemetry_1 = require("@react-native-windows/telemetry");
|
|
13
|
+
const projectConfig_1 = require("../commands/config/projectConfig");
|
|
14
|
+
const autolinkWindows_1 = require("../commands/autolinkWindows/autolinkWindows");
|
|
15
|
+
const autolinkWindowsOptions_1 = require("../commands/autolinkWindows/autolinkWindowsOptions");
|
|
16
|
+
const xmldom_1 = require("@xmldom/xmldom");
|
|
17
|
+
const projectConfig_utils_1 = require("./projectConfig.utils");
|
|
18
|
+
test('autolink with no windows project', () => {
|
|
19
|
+
expect(() => {
|
|
20
|
+
// eslint-disable-next-line no-new
|
|
21
|
+
new AutoLinkTest({}, {}, { check: true, logging: false });
|
|
22
|
+
}).toThrowError();
|
|
23
|
+
});
|
|
24
|
+
test('autolink with incomplete windows project', () => {
|
|
25
|
+
expect(() => {
|
|
26
|
+
const autolink = new AutoLinkTest({ windows: {} }, {}, { check: true, logging: false });
|
|
27
|
+
autolink.validateRequiredAppProperties();
|
|
28
|
+
}).toThrowError();
|
|
29
|
+
});
|
|
30
|
+
class AutoLinkTest extends autolinkWindows_1.AutoLinkWindows {
|
|
31
|
+
constructor() {
|
|
32
|
+
super(...arguments);
|
|
33
|
+
this.packagesConfig = '';
|
|
34
|
+
this.experimentalFeaturesProps = '';
|
|
35
|
+
}
|
|
36
|
+
getWindowsProjectConfig() {
|
|
37
|
+
return this.windowsAppConfig;
|
|
38
|
+
}
|
|
39
|
+
getPackagesConfigXml() {
|
|
40
|
+
return {
|
|
41
|
+
path: 'packages.config',
|
|
42
|
+
content: new xmldom_1.DOMParser().parseFromString(this.packagesConfig, 'application/xml'),
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
getExperimentalFeaturesPropsXml() {
|
|
46
|
+
return {
|
|
47
|
+
path: 'ExperimentalFeatures.props',
|
|
48
|
+
content: new xmldom_1.DOMParser().parseFromString(this.experimentalFeaturesProps, 'application/xml'),
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
async updateFile(filepath, content) {
|
|
52
|
+
if (filepath === 'packages.config') {
|
|
53
|
+
this.packagesConfig = content;
|
|
54
|
+
}
|
|
55
|
+
else if (filepath === 'ExperimentalFeatures.props') {
|
|
56
|
+
this.experimentalFeaturesProps = content;
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
throw new Error(`Unknown path: ${filepath}`);
|
|
60
|
+
}
|
|
61
|
+
return true;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
test('autolink fixup sln', () => {
|
|
65
|
+
const autolink = new AutoLinkTest({ windows: { folder: __dirname, sourceDir: '.' } }, {}, { check: true, logging: false, sln: 'foo' });
|
|
66
|
+
expect(autolink.getWindowsProjectConfig().solutionFile).toBeUndefined();
|
|
67
|
+
expect(() => {
|
|
68
|
+
autolink.validateRequiredAppProperties();
|
|
69
|
+
}).toThrow();
|
|
70
|
+
autolink.fixUpForSlnOption();
|
|
71
|
+
expect(autolink.getWindowsProjectConfig().solutionFile).toEqual('foo');
|
|
72
|
+
expect(() => {
|
|
73
|
+
autolink.validateRequiredAppProperties();
|
|
74
|
+
}).toThrow();
|
|
75
|
+
});
|
|
76
|
+
test('autolink fixup proj', async () => {
|
|
77
|
+
const autolink = new AutoLinkTest({ windows: { folder: __dirname, sourceDir: '.', solutionFile: 'foo.sln' } }, {}, {
|
|
78
|
+
check: true,
|
|
79
|
+
logging: false,
|
|
80
|
+
proj: 'projects/WithWinUI3/windows/WithWinUI3/WithWinUI3.vcxproj',
|
|
81
|
+
});
|
|
82
|
+
expect(autolink.getWindowsProjectConfig().solutionFile).toEqual('foo.sln');
|
|
83
|
+
expect(autolink.getWindowsProjectConfig().project).toBeUndefined();
|
|
84
|
+
const folder = path_1.default.resolve('src/e2etest/projects/', 'WithWinUI3');
|
|
85
|
+
await (0, projectConfig_utils_1.ensureWinUI3Project)(folder);
|
|
86
|
+
expect(() => {
|
|
87
|
+
autolink.validateRequiredProjectProperties();
|
|
88
|
+
}).toThrow();
|
|
89
|
+
autolink.fixUpForProjOption();
|
|
90
|
+
const projectConfig = autolink.getWindowsProjectConfig().project;
|
|
91
|
+
expect(projectConfig).not.toBeUndefined();
|
|
92
|
+
expect(projectConfig.projectName).toEqual('WithWinUI3');
|
|
93
|
+
autolink.validateRequiredProjectProperties();
|
|
94
|
+
});
|
|
95
|
+
test('empty cpp autolink dependencies', () => {
|
|
96
|
+
const autolink = new AutoLinkTest({ windows: { folder: __dirname, sourceDir: '.', solutionFile: 'foo.sln' } }, {}, {
|
|
97
|
+
check: true,
|
|
98
|
+
logging: false,
|
|
99
|
+
proj: 'projects/WithWinUI3/windows/WithWinUI3/WithWinUI3.vcxproj',
|
|
100
|
+
});
|
|
101
|
+
const replacements = autolink.getCppReplacements();
|
|
102
|
+
expect(replacements.cppIncludes).toEqual('');
|
|
103
|
+
expect(replacements.cppPackageProviders).toEqual('\n UNREFERENCED_PARAMETER(packageProviders);');
|
|
104
|
+
});
|
|
105
|
+
test('one invalid cpp autolink dependency', () => {
|
|
106
|
+
const autolink = new AutoLinkTest({ windows: { folder: __dirname, sourceDir: '.', solutionFile: 'foo.sln' } }, {
|
|
107
|
+
superModule: {
|
|
108
|
+
name: 'superModule',
|
|
109
|
+
root: 'theRoot',
|
|
110
|
+
platforms: {
|
|
111
|
+
windows: {},
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
}, {
|
|
115
|
+
check: true,
|
|
116
|
+
logging: false,
|
|
117
|
+
proj: 'projects/WithWinUI3/windows/WithWinUI3/WithWinUI3.vcxproj',
|
|
118
|
+
});
|
|
119
|
+
const replacements = autolink.getCppReplacements();
|
|
120
|
+
expect(replacements.cppIncludes).toEqual('');
|
|
121
|
+
expect(replacements.cppPackageProviders).toEqual('\n UNREFERENCED_PARAMETER(packageProviders);');
|
|
122
|
+
});
|
|
123
|
+
test('one invalid cs autolink dependency', () => {
|
|
124
|
+
const autolink = new AutoLinkTest({ windows: { folder: __dirname, sourceDir: '.', solutionFile: 'foo.sln' } }, {
|
|
125
|
+
superModule: {
|
|
126
|
+
name: 'superModule',
|
|
127
|
+
root: 'theRoot',
|
|
128
|
+
platforms: {
|
|
129
|
+
windows: {},
|
|
130
|
+
},
|
|
131
|
+
},
|
|
132
|
+
}, {
|
|
133
|
+
check: true,
|
|
134
|
+
logging: false,
|
|
135
|
+
proj: 'projects/SimpleCSharpApp/windows/SimpleCSharpApp/SimpleCSharpApp.csproj',
|
|
136
|
+
});
|
|
137
|
+
const replacements = autolink.getCsReplacements();
|
|
138
|
+
expect(replacements.csUsingNamespaces).toEqual('');
|
|
139
|
+
expect(replacements.csReactPackageProviders).toEqual('');
|
|
140
|
+
});
|
|
141
|
+
test('one valid cpp autolink dependency', () => {
|
|
142
|
+
const autolink = new AutoLinkTest({ windows: { folder: __dirname, sourceDir: '.', solutionFile: 'foo.sln' } }, {
|
|
143
|
+
superModule: {
|
|
144
|
+
name: 'superModule',
|
|
145
|
+
root: 'theRoot',
|
|
146
|
+
platforms: {
|
|
147
|
+
windows: {
|
|
148
|
+
sourceDir: __dirname,
|
|
149
|
+
projects: [
|
|
150
|
+
{
|
|
151
|
+
directDependency: true,
|
|
152
|
+
projectFile: 'superModule.vcxproj',
|
|
153
|
+
cppHeaders: ['Garfield.h', 'Snoopy.h'],
|
|
154
|
+
cppPackageProviders: ['FamousAnimalCartoons'],
|
|
155
|
+
},
|
|
156
|
+
],
|
|
157
|
+
},
|
|
158
|
+
},
|
|
159
|
+
},
|
|
160
|
+
}, {
|
|
161
|
+
check: true,
|
|
162
|
+
logging: false,
|
|
163
|
+
proj: 'projects/WithWinUI3/windows/WithWinUI3/WithWinUI3.vcxproj',
|
|
164
|
+
});
|
|
165
|
+
const replacements = autolink.getCppReplacements();
|
|
166
|
+
expect(replacements.cppIncludes).toMatch(/#include <Garfield.h>/);
|
|
167
|
+
expect(replacements.cppIncludes).toMatch(/#include <Snoopy.h>/);
|
|
168
|
+
expect(replacements.cppPackageProviders).toContain('packageProviders.Append(winrt::FamousAnimalCartoons())');
|
|
169
|
+
});
|
|
170
|
+
test('one valid cs autolink dependency', () => {
|
|
171
|
+
const autolink = new AutoLinkTest({ windows: { folder: __dirname, sourceDir: '.', solutionFile: 'foo.sln' } }, {
|
|
172
|
+
superModule: {
|
|
173
|
+
name: 'superModule',
|
|
174
|
+
root: 'theRoot',
|
|
175
|
+
platforms: {
|
|
176
|
+
windows: {
|
|
177
|
+
sourceDir: __dirname,
|
|
178
|
+
projects: [
|
|
179
|
+
{
|
|
180
|
+
directDependency: true,
|
|
181
|
+
csNamespaces: ['Garfield'],
|
|
182
|
+
projectFile: 'superModule.vcxproj',
|
|
183
|
+
cppHeaders: ['Garfield.h', 'Snoopy.h'],
|
|
184
|
+
csPackageProviders: ['FamousAnimalCartoons'],
|
|
185
|
+
},
|
|
186
|
+
],
|
|
187
|
+
},
|
|
188
|
+
},
|
|
189
|
+
},
|
|
190
|
+
}, {
|
|
191
|
+
check: true,
|
|
192
|
+
logging: false,
|
|
193
|
+
proj: 'projects/SimpleCSharpApp/windows/SimpleCSharpApp/SimpleCSharpApp.csproj',
|
|
194
|
+
});
|
|
195
|
+
const replacements = autolink.getCsReplacements();
|
|
196
|
+
expect(replacements.csUsingNamespaces).toContain('using Garfield;');
|
|
197
|
+
expect(replacements.csReactPackageProviders).toContain('packageProviders.Add(new FamousAnimalCartoons())');
|
|
198
|
+
});
|
|
199
|
+
test('ensureXAMLDialect - useWinUI3=true in react-native.config.js, useWinUI3=false in ExperimentalFeatures.props', async () => {
|
|
200
|
+
const folder = path_1.default.resolve('src/e2etest/projects/WithWinUI3');
|
|
201
|
+
// Create project with UseWinUI3 == false in ExperimentalFeatures.props
|
|
202
|
+
await (0, projectConfig_utils_1.ensureCppAppProject)(folder, 'WithWinUI3', false, false, false);
|
|
203
|
+
const rnc = require(path_1.default.join(folder, 'react-native.config.js'));
|
|
204
|
+
const config = (0, projectConfig_1.projectConfigWindows)(folder, rnc.project.windows);
|
|
205
|
+
// Set useWinUI3=true in react-native.config.js
|
|
206
|
+
config.useWinUI3 = true;
|
|
207
|
+
const al = new AutoLinkTest({ windows: config }, {}, {
|
|
208
|
+
check: false,
|
|
209
|
+
logging: false,
|
|
210
|
+
});
|
|
211
|
+
al.experimentalFeaturesProps = `<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><UseWinUI3>false</UseWinUI3></PropertyGroup></Project>`;
|
|
212
|
+
al.packagesConfig = `<packages><package id="SuperPkg" version="42"/></packages>`;
|
|
213
|
+
const exd = await al.ensureXAMLDialect();
|
|
214
|
+
expect(exd).toBeTruthy();
|
|
215
|
+
const expectedExperimentalFeatures = '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><UseWinUI3>true</UseWinUI3></PropertyGroup></Project>';
|
|
216
|
+
expect(al.experimentalFeaturesProps).toEqual(expectedExperimentalFeatures);
|
|
217
|
+
// example packages.config:
|
|
218
|
+
// <packages>
|
|
219
|
+
// <package id="SuperPkg" version="42"/>
|
|
220
|
+
// <package id="Microsoft.WindowsAppSDK" version="1.0.0" targetFramework="native"/>
|
|
221
|
+
// </packages>
|
|
222
|
+
//
|
|
223
|
+
expect(al.packagesConfig).toContain('Microsoft.WindowsAppSDK');
|
|
224
|
+
expect(al.packagesConfig).toContain('<package id="SuperPkg" version="42"/>');
|
|
225
|
+
expect(al.packagesConfig).not.toContain('Microsoft.UI.Xaml');
|
|
226
|
+
});
|
|
227
|
+
test('ensureXAMLDialect - useWinUI3=false in react-native.config.js, useWinUI3=true in ExperimentalFeatures.props', async () => {
|
|
228
|
+
const folder = path_1.default.resolve('src/e2etest/projects/WithWinUI3');
|
|
229
|
+
const rnc = require(path_1.default.join(folder, 'react-native.config.js'));
|
|
230
|
+
const config = (0, projectConfig_1.projectConfigWindows)(folder, rnc.project.windows);
|
|
231
|
+
config.useWinUI3 = false;
|
|
232
|
+
const al = new AutoLinkTest({ windows: config }, {}, {
|
|
233
|
+
check: false,
|
|
234
|
+
logging: false,
|
|
235
|
+
});
|
|
236
|
+
al.experimentalFeaturesProps = `<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><UseWinUI3>true</UseWinUI3></PropertyGroup></Project>`;
|
|
237
|
+
al.packagesConfig = `<packages><package id="SuperPkg" version="42"/></packages>`;
|
|
238
|
+
const exd = await al.ensureXAMLDialect();
|
|
239
|
+
expect(exd).toBeTruthy();
|
|
240
|
+
const expectedExperimentalFeatures = '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><UseWinUI3>false</UseWinUI3></PropertyGroup></Project>';
|
|
241
|
+
expect(al.experimentalFeaturesProps).toEqual(expectedExperimentalFeatures);
|
|
242
|
+
// example packages.config:
|
|
243
|
+
// <packages>
|
|
244
|
+
// <package id="SuperPkg" version="42"/>
|
|
245
|
+
// <package id="Microsoft.WindowsAppSDK" version="1.0.0" targetFramework="native"/>
|
|
246
|
+
// </packages>
|
|
247
|
+
//
|
|
248
|
+
expect(al.packagesConfig).not.toContain('Microsoft.WindowsAppSDK');
|
|
249
|
+
expect(al.packagesConfig).toContain('<package id="SuperPkg" version="42"/>');
|
|
250
|
+
expect(al.packagesConfig).toContain('Microsoft.UI.Xaml');
|
|
251
|
+
});
|
|
252
|
+
test('ensureXAMLDialect - useWinUI3 not in react-native.config.js, useWinUI3=true in ExperimentalFeatures.props', async () => {
|
|
253
|
+
const folder = path_1.default.resolve('src/e2etest/projects/WithWinUI3');
|
|
254
|
+
const rnc = require(path_1.default.join(folder, 'react-native.config.js'));
|
|
255
|
+
const config = (0, projectConfig_1.projectConfigWindows)(folder, rnc.project.windows);
|
|
256
|
+
delete config.useWinUI3;
|
|
257
|
+
const al = new AutoLinkTest({ windows: config }, {}, {
|
|
258
|
+
check: false,
|
|
259
|
+
logging: false,
|
|
260
|
+
});
|
|
261
|
+
al.experimentalFeaturesProps = `<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><UseWinUI3>true</UseWinUI3></PropertyGroup></Project>`;
|
|
262
|
+
al.packagesConfig = `<packages><package id="SuperPkg" version="42"/></packages>`;
|
|
263
|
+
const exd = await al.ensureXAMLDialect();
|
|
264
|
+
expect(exd).toBeTruthy();
|
|
265
|
+
const expectedExperimentalFeatures = '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><UseWinUI3>true</UseWinUI3></PropertyGroup></Project>';
|
|
266
|
+
expect(al.experimentalFeaturesProps).toEqual(expectedExperimentalFeatures);
|
|
267
|
+
// example packages.config:
|
|
268
|
+
// <packages>
|
|
269
|
+
// <package id="SuperPkg" version="42"/>
|
|
270
|
+
// <package id="Microsoft.WindowsAppSDK" version="1.0.0" targetFramework="native"/>
|
|
271
|
+
// </packages>
|
|
272
|
+
//
|
|
273
|
+
expect(al.packagesConfig).toContain('Microsoft.WindowsAppSDK');
|
|
274
|
+
expect(al.packagesConfig).toContain('<package id="SuperPkg" version="42"/>');
|
|
275
|
+
expect(al.packagesConfig).not.toContain('Microsoft.UI.Xaml');
|
|
276
|
+
});
|
|
277
|
+
test('ensureXAMLDialect - useWinUI3 not in react-native.config.js, useWinUI3=false in ExperimentalFeatures.props', async () => {
|
|
278
|
+
const folder = path_1.default.resolve('src/e2etest/projects/WithWinUI3');
|
|
279
|
+
const rnc = require(path_1.default.join(folder, 'react-native.config.js'));
|
|
280
|
+
const config = (0, projectConfig_1.projectConfigWindows)(folder, rnc.project.windows);
|
|
281
|
+
delete config.useWinUI3;
|
|
282
|
+
const al = new AutoLinkTest({ windows: config }, {}, {
|
|
283
|
+
check: false,
|
|
284
|
+
logging: false,
|
|
285
|
+
});
|
|
286
|
+
al.experimentalFeaturesProps = `<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><UseWinUI3>false</UseWinUI3></PropertyGroup></Project>`;
|
|
287
|
+
al.packagesConfig = `<packages><package id="SuperPkg" version="42"/><package id="Microsoft.WindowsAppSDK"/></packages>`;
|
|
288
|
+
const exd = await al.ensureXAMLDialect();
|
|
289
|
+
expect(exd).toBeTruthy();
|
|
290
|
+
const expectedExperimentalFeatures = `<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"><PropertyGroup><UseWinUI3>false</UseWinUI3></PropertyGroup></Project>`;
|
|
291
|
+
expect(al.experimentalFeaturesProps).toEqual(expectedExperimentalFeatures);
|
|
292
|
+
// example packages.config:
|
|
293
|
+
// <packages>
|
|
294
|
+
// <package id="SuperPkg" version="42"/>
|
|
295
|
+
// <package id="Microsoft.WindowsAppSDK" version="1.0.0" targetFramework="native"/>
|
|
296
|
+
// </packages>
|
|
297
|
+
//
|
|
298
|
+
expect(al.packagesConfig).not.toContain('Microsoft.WindowsAppSDK');
|
|
299
|
+
expect(al.packagesConfig).toContain('<package id="SuperPkg" version="42"/>');
|
|
300
|
+
expect(al.packagesConfig).toContain('Microsoft.UI.Xaml');
|
|
301
|
+
});
|
|
302
|
+
test('Indirect autolink dependency', () => {
|
|
303
|
+
const autolink = new AutoLinkTest({ windows: { folder: __dirname, sourceDir: '.', solutionFile: 'foo.sln' } }, {
|
|
304
|
+
superModule: {
|
|
305
|
+
name: 'superModule',
|
|
306
|
+
root: 'theRoot',
|
|
307
|
+
platforms: {
|
|
308
|
+
windows: {
|
|
309
|
+
sourceDir: __dirname,
|
|
310
|
+
projects: [
|
|
311
|
+
{
|
|
312
|
+
directDependency: true,
|
|
313
|
+
projectFile: 'superModule.vcxproj',
|
|
314
|
+
cppHeaders: ['Garfield.h', 'Snoopy.h'],
|
|
315
|
+
cppPackageProviders: ['FamousAnimalCartoons'],
|
|
316
|
+
},
|
|
317
|
+
{
|
|
318
|
+
directDependency: false,
|
|
319
|
+
projectFile: 'indirect.vcxproj',
|
|
320
|
+
},
|
|
321
|
+
],
|
|
322
|
+
},
|
|
323
|
+
},
|
|
324
|
+
},
|
|
325
|
+
}, {
|
|
326
|
+
check: true,
|
|
327
|
+
logging: false,
|
|
328
|
+
proj: 'projects/WithIndirectDependency/windows/WithIndirectDependency/WithIndirectDependency.vcxproj',
|
|
329
|
+
});
|
|
330
|
+
const replacements = autolink.getCppReplacements();
|
|
331
|
+
expect(replacements.cppIncludes).toMatch(/#include <Garfield.h>/);
|
|
332
|
+
expect(replacements.cppIncludes).toMatch(/#include <Snoopy.h>/);
|
|
333
|
+
expect(replacements.cppPackageProviders).toContain('packageProviders.Append(winrt::FamousAnimalCartoons())');
|
|
334
|
+
});
|
|
335
|
+
function validateOptionName(name, optionName) {
|
|
336
|
+
// Do not add a default case here. Every item must explicitly return true
|
|
337
|
+
switch (optionName) {
|
|
338
|
+
case 'check':
|
|
339
|
+
case 'logging':
|
|
340
|
+
case 'sln':
|
|
341
|
+
case 'proj':
|
|
342
|
+
case 'telemetry':
|
|
343
|
+
return true;
|
|
344
|
+
}
|
|
345
|
+
throw new Error(`Unable to find ${optionName} to match '${name}' in AutoLinkOptions.`);
|
|
346
|
+
}
|
|
347
|
+
test('autolinkOptions - validate options', () => {
|
|
348
|
+
for (const commandOption of autolinkWindowsOptions_1.autolinkOptions) {
|
|
349
|
+
// Validate names
|
|
350
|
+
expect(commandOption.name).not.toBeNull();
|
|
351
|
+
expect(commandOption.name.startsWith('--')).toBe(true);
|
|
352
|
+
expect(commandOption.name).toBe(commandOption.name.trim());
|
|
353
|
+
// Validate defaults
|
|
354
|
+
if (!commandOption.name.endsWith(' [string]') &&
|
|
355
|
+
!commandOption.name.endsWith(' [number]')) {
|
|
356
|
+
// Commander ignores defaults for flags, so leave undefined to prevent confusion
|
|
357
|
+
expect(commandOption.default).toBeUndefined();
|
|
358
|
+
}
|
|
359
|
+
// Validate description
|
|
360
|
+
expect(commandOption.description).not.toBeNull();
|
|
361
|
+
expect(commandOption.description).toBe(commandOption.description.trim());
|
|
362
|
+
// Validate all command options are present in AutoLinkOptions
|
|
363
|
+
const optionName = (0, telemetry_1.commanderNameToOptionName)(commandOption.name);
|
|
364
|
+
expect(validateOptionName(commandOption.name, optionName)).toBe(true);
|
|
365
|
+
}
|
|
366
|
+
});
|
|
419
367
|
//# sourceMappingURL=autolink.test.js.map
|