@capacitor/cli 4.0.0-alpha.2 → 4.0.0-beta.2
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/CHANGELOG.md +83 -0
- package/assets/android-template.tar.gz +0 -0
- package/assets/capacitor-cordova-android-plugins.tar.gz +0 -0
- package/assets/capacitor-cordova-ios-plugins.tar.gz +0 -0
- package/assets/ios-template.tar.gz +0 -0
- package/dist/android/open.js +1 -1
- package/dist/android/update.js +40 -1
- package/dist/declarations.d.ts +28 -0
- package/dist/index.js +20 -20
- package/dist/tasks/copy.js +47 -5
- package/package.json +14 -17
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,45 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [4.0.0-beta.2](https://github.com/ionic-team/capacitor/compare/4.0.0-beta.1...4.0.0-beta.2) (2022-07-08)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @capacitor/cli
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [4.0.0-beta.1](https://github.com/ionic-team/capacitor/compare/4.0.0-beta.0...4.0.0-beta.1) (2022-06-27)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @capacitor/cli
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
# [4.0.0-beta.0](https://github.com/ionic-team/capacitor/compare/3.6.0...4.0.0-beta.0) (2022-06-17)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
### Features
|
|
26
|
+
|
|
27
|
+
* **android:** Use java 11 ([#5552](https://github.com/ionic-team/capacitor/issues/5552)) ([e47959f](https://github.com/ionic-team/capacitor/commit/e47959fcbd6a89b97b1275a5814fdb4e7ce30672))
|
|
28
|
+
* **ios:** Add preferredContentMode configuration option ([#5583](https://github.com/ionic-team/capacitor/issues/5583)) ([5b6dfa3](https://github.com/ionic-team/capacitor/commit/5b6dfa3fe29c85632546b299f03cc04a77cf7475))
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
# [3.6.0](https://github.com/ionic-team/capacitor/compare/3.5.1...3.6.0) (2022-06-17)
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
### Features
|
|
38
|
+
|
|
39
|
+
* **android:** update support for Portals for Capacitor to include Live Updates ([#5660](https://github.com/ionic-team/capacitor/issues/5660)) ([62f0a5e](https://github.com/ionic-team/capacitor/commit/62f0a5eaa40776aad79dbf8f8c0900037d3cc97e))
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
6
45
|
# [4.0.0-alpha.2](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.2) (2022-05-12)
|
|
7
46
|
|
|
8
47
|
|
|
@@ -15,6 +54,28 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
|
|
|
15
54
|
|
|
16
55
|
|
|
17
56
|
|
|
57
|
+
## [3.5.1](https://github.com/ionic-team/capacitor/compare/3.5.0...3.5.1) (2022-05-04)
|
|
58
|
+
|
|
59
|
+
|
|
60
|
+
### Bug Fixes
|
|
61
|
+
|
|
62
|
+
* **android:** move initialFocus on webview into config ([#5579](https://github.com/ionic-team/capacitor/issues/5579)) ([8b4e861](https://github.com/ionic-team/capacitor/commit/8b4e861514b0fbe08e9296f49c280234f54742e1))
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
# [3.5.0](https://github.com/ionic-team/capacitor/compare/3.4.3...3.5.0) (2022-04-22)
|
|
69
|
+
|
|
70
|
+
|
|
71
|
+
### Features
|
|
72
|
+
|
|
73
|
+
* **cli:** support capacitor portals plugin changes needed ([#5558](https://github.com/ionic-team/capacitor/issues/5558)) ([6810a19](https://github.com/ionic-team/capacitor/commit/6810a19ae2bbda1f4b2afad61d37ca822ca157f5))
|
|
74
|
+
|
|
75
|
+
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
|
|
18
79
|
# [4.0.0-alpha.1](https://github.com/ionic-team/capacitor/compare/3.4.1...4.0.0-alpha.1) (2022-03-25)
|
|
19
80
|
|
|
20
81
|
**Note:** Version bump only for package @capacitor/cli
|
|
@@ -23,6 +84,28 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
|
|
|
23
84
|
|
|
24
85
|
|
|
25
86
|
|
|
87
|
+
|
|
88
|
+
## [3.4.3](https://github.com/ionic-team/capacitor/compare/3.4.2...3.4.3) (2022-03-04)
|
|
89
|
+
|
|
90
|
+
|
|
91
|
+
### Bug Fixes
|
|
92
|
+
|
|
93
|
+
* **cli:** avoid srcFiles is not iterable on kotlinNeededCheck ([#5481](https://github.com/ionic-team/capacitor/issues/5481)) ([3c2b579](https://github.com/ionic-team/capacitor/commit/3c2b579c6edb1fc69d85689b268eb92067b7821b))
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
|
|
97
|
+
|
|
98
|
+
|
|
99
|
+
## [3.4.2](https://github.com/ionic-team/capacitor/compare/3.4.1...3.4.2) (2022-03-03)
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
### Bug Fixes
|
|
103
|
+
|
|
104
|
+
* **android:** compatibility with cordova kotlin plugins ([#5438](https://github.com/ionic-team/capacitor/issues/5438)) ([55bf004](https://github.com/ionic-team/capacitor/commit/55bf004897b3feb280ab6b6575d2a2c1a0a183e2))
|
|
105
|
+
|
|
106
|
+
|
|
107
|
+
|
|
108
|
+
|
|
26
109
|
## [3.4.1](https://github.com/ionic-team/capacitor/compare/3.4.0...3.4.1) (2022-02-09)
|
|
27
110
|
|
|
28
111
|
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/dist/android/open.js
CHANGED
|
@@ -15,7 +15,7 @@ async function openAndroid(config) {
|
|
|
15
15
|
if (!(await utils_fs_1.pathExists(androidStudioPath))) {
|
|
16
16
|
throw new Error(`Android Studio does not exist at: ${androidStudioPath}`);
|
|
17
17
|
}
|
|
18
|
-
await open_1.default(dir, { app: androidStudioPath, wait: false });
|
|
18
|
+
await open_1.default(dir, { app: { name: androidStudioPath }, wait: false });
|
|
19
19
|
log_1.logger.info(`Opening Android project at: ${colors_1.default.strong(config.android.platformDir)}.`);
|
|
20
20
|
}
|
|
21
21
|
catch (e) {
|
package/dist/android/update.js
CHANGED
|
@@ -166,7 +166,10 @@ if (hasProperty('postBuildExtras')) {
|
|
|
166
166
|
}
|
|
167
167
|
exports.installGradlePlugins = installGradlePlugins;
|
|
168
168
|
async function handleCordovaPluginsGradle(config, cordovaPlugins) {
|
|
169
|
+
var _a, _b, _c;
|
|
169
170
|
const pluginsGradlePath = path_1.join(config.android.cordovaPluginsDirAbs, 'build.gradle');
|
|
171
|
+
const kotlinNeeded = await kotlinNeededCheck(config, cordovaPlugins);
|
|
172
|
+
const kotlinVersionString = (_c = (_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinVersion) !== null && _c !== void 0 ? _c : '1.7.0';
|
|
170
173
|
const frameworksArray = [];
|
|
171
174
|
let prefsArray = [];
|
|
172
175
|
const applyArray = [];
|
|
@@ -193,10 +196,21 @@ async function handleCordovaPluginsGradle(config, cordovaPlugins) {
|
|
|
193
196
|
})
|
|
194
197
|
.join('\n');
|
|
195
198
|
frameworkString = await replaceFrameworkVariables(config, prefsArray, frameworkString);
|
|
199
|
+
if (kotlinNeeded) {
|
|
200
|
+
frameworkString += `\n implementation "androidx.core:core-ktx:$androidxCoreKTXVersion"`;
|
|
201
|
+
frameworkString += `\n implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"`;
|
|
202
|
+
}
|
|
196
203
|
const applyString = applyArray.join('\n');
|
|
197
204
|
let buildGradle = await utils_fs_1.readFile(pluginsGradlePath, { encoding: 'utf-8' });
|
|
198
205
|
buildGradle = buildGradle.replace(/(SUB-PROJECT DEPENDENCIES START)[\s\S]*(\/\/ SUB-PROJECT DEPENDENCIES END)/, '$1\n' + frameworkString.concat('\n') + ' $2');
|
|
199
206
|
buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + applyString.concat('\n') + '$2');
|
|
207
|
+
if (kotlinNeeded) {
|
|
208
|
+
buildGradle = buildGradle.replace(/(buildscript\s{\n(\t|\s{4})repositories\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})}\n(\t|\s{4})dependencies\s{\n(\t{2}|\s{8}).+)\n((\t|\s{4})}\n}\n)/, `$1\n classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"\n$8`);
|
|
209
|
+
buildGradle = buildGradle.replace(/(ext\s{)/, `$1\n androidxCoreKTXVersion = project.hasProperty('androidxCoreKTXVersion') ? rootProject.ext.androidxCoreKTXVersion : '1.8.0'`);
|
|
210
|
+
buildGradle = buildGradle.replace(/(buildscript\s{)/, `$1\n ext.kotlin_version = project.hasProperty('kotlin_version') ? rootProject.ext.kotlin_version : '${kotlinVersionString}'`);
|
|
211
|
+
buildGradle = buildGradle.replace(/(apply\splugin:\s'com\.android\.library')/, `$1\napply plugin: 'kotlin-android'`);
|
|
212
|
+
buildGradle = buildGradle.replace(/(compileOptions\s{\n((\t{2}|\s{8}).+\n)+(\t|\s{4})})\n(})/, `$1\n sourceSets {\n main.java.srcDirs += 'src/main/kotlin'\n }\n$5`);
|
|
213
|
+
}
|
|
200
214
|
await utils_fs_1.writeFile(pluginsGradlePath, buildGradle);
|
|
201
215
|
const cordovaVariables = `// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
|
|
202
216
|
ext {
|
|
@@ -208,6 +222,27 @@ ext {
|
|
|
208
222
|
await utils_fs_1.writeFile(path_1.join(config.android.cordovaPluginsDirAbs, 'cordova.variables.gradle'), cordovaVariables);
|
|
209
223
|
}
|
|
210
224
|
exports.handleCordovaPluginsGradle = handleCordovaPluginsGradle;
|
|
225
|
+
async function kotlinNeededCheck(config, cordovaPlugins) {
|
|
226
|
+
var _a, _b;
|
|
227
|
+
if (((_b = (_a = config.app.extConfig.cordova) === null || _a === void 0 ? void 0 : _a.preferences) === null || _b === void 0 ? void 0 : _b.GradlePluginKotlinEnabled) !==
|
|
228
|
+
'true') {
|
|
229
|
+
for (const plugin of cordovaPlugins) {
|
|
230
|
+
const androidPlatform = plugin_1.getPluginPlatform(plugin, platform);
|
|
231
|
+
const sourceFiles = androidPlatform['source-file'];
|
|
232
|
+
if (sourceFiles) {
|
|
233
|
+
for (const srcFile of sourceFiles) {
|
|
234
|
+
if (/^.*\.kt$/.test(srcFile['$'].src)) {
|
|
235
|
+
return true;
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
return false;
|
|
241
|
+
}
|
|
242
|
+
else {
|
|
243
|
+
return true;
|
|
244
|
+
}
|
|
245
|
+
}
|
|
211
246
|
async function copyPluginsNativeFiles(config, cordovaPlugins) {
|
|
212
247
|
const pluginsPath = path_1.join(config.android.cordovaPluginsDirAbs, 'src', 'main');
|
|
213
248
|
for (const p of cordovaPlugins) {
|
|
@@ -257,12 +292,16 @@ async function getPluginsTask(config) {
|
|
|
257
292
|
return androidPlugins;
|
|
258
293
|
});
|
|
259
294
|
}
|
|
260
|
-
async function
|
|
295
|
+
async function getVariablesGradleFile(config) {
|
|
261
296
|
const variablesFile = path_1.resolve(config.android.platformDirAbs, 'variables.gradle');
|
|
262
297
|
let variablesGradle = '';
|
|
263
298
|
if (await utils_fs_1.pathExists(variablesFile)) {
|
|
264
299
|
variablesGradle = await utils_fs_1.readFile(variablesFile, { encoding: 'utf-8' });
|
|
265
300
|
}
|
|
301
|
+
return variablesGradle;
|
|
302
|
+
}
|
|
303
|
+
async function replaceFrameworkVariables(config, prefsArray, frameworkString) {
|
|
304
|
+
const variablesGradle = await getVariablesGradleFile(config);
|
|
266
305
|
prefsArray.map((preference) => {
|
|
267
306
|
if (!variablesGradle.includes(preference.$.name)) {
|
|
268
307
|
frameworkString = frameworkString.replace(new RegExp(('$' + preference.$.name).replace('$', '\\$&'), 'g'), preference.$.default);
|
package/dist/declarations.d.ts
CHANGED
|
@@ -184,6 +184,13 @@ export interface CapacitorConfig {
|
|
|
184
184
|
* @since 3.1.0
|
|
185
185
|
*/
|
|
186
186
|
flavor?: string;
|
|
187
|
+
/**
|
|
188
|
+
* Whether to give the webview initial focus.
|
|
189
|
+
*
|
|
190
|
+
* @since 3.5.1
|
|
191
|
+
* @default true
|
|
192
|
+
*/
|
|
193
|
+
initialFocus?: boolean;
|
|
187
194
|
};
|
|
188
195
|
ios?: {
|
|
189
196
|
/**
|
|
@@ -443,6 +450,18 @@ export interface CapacitorConfig {
|
|
|
443
450
|
*/
|
|
444
451
|
includePlugins?: string[];
|
|
445
452
|
}
|
|
453
|
+
export interface Portal {
|
|
454
|
+
name: string;
|
|
455
|
+
webDir: string;
|
|
456
|
+
liveUpdateConfig?: LiveUpdateConfig;
|
|
457
|
+
}
|
|
458
|
+
export interface LiveUpdateConfig {
|
|
459
|
+
appId: string;
|
|
460
|
+
channel: string;
|
|
461
|
+
autoUpdateMethod: AutoUpdateMethod;
|
|
462
|
+
maxVersions?: number;
|
|
463
|
+
}
|
|
464
|
+
export declare type AutoUpdateMethod = 'none' | 'background';
|
|
446
465
|
export interface PluginsConfig {
|
|
447
466
|
/**
|
|
448
467
|
* Plugin configuration by class name.
|
|
@@ -452,4 +471,13 @@ export interface PluginsConfig {
|
|
|
452
471
|
[key: string]: {
|
|
453
472
|
[key: string]: any;
|
|
454
473
|
} | undefined;
|
|
474
|
+
/**
|
|
475
|
+
* Capacitor Portals plugin configuration
|
|
476
|
+
*
|
|
477
|
+
* @since 3.5.0
|
|
478
|
+
*/
|
|
479
|
+
Portals?: {
|
|
480
|
+
shell: Portal;
|
|
481
|
+
apps: Portal[];
|
|
482
|
+
};
|
|
455
483
|
}
|
package/dist/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.runProgram = exports.run = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const commander_1 =
|
|
5
|
+
const commander_1 = require("commander");
|
|
6
6
|
const colors_1 = tslib_1.__importDefault(require("./colors"));
|
|
7
7
|
const config_1 = require("./config");
|
|
8
8
|
const errors_1 = require("./errors");
|
|
@@ -27,8 +27,8 @@ async function run() {
|
|
|
27
27
|
}
|
|
28
28
|
exports.run = run;
|
|
29
29
|
function runProgram(config) {
|
|
30
|
-
commander_1.
|
|
31
|
-
commander_1.
|
|
30
|
+
commander_1.program.version(config.cli.package.version);
|
|
31
|
+
commander_1.program
|
|
32
32
|
.command('config', { hidden: true })
|
|
33
33
|
.description(`print evaluated Capacitor config`)
|
|
34
34
|
.option('--json', 'Print in JSON format')
|
|
@@ -36,14 +36,14 @@ function runProgram(config) {
|
|
|
36
36
|
const { configCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/config')));
|
|
37
37
|
await configCommand(config, json);
|
|
38
38
|
}));
|
|
39
|
-
commander_1.
|
|
39
|
+
commander_1.program
|
|
40
40
|
.command('create [directory] [name] [id]', { hidden: true })
|
|
41
41
|
.description('Creates a new Capacitor project')
|
|
42
42
|
.action(cli_1.wrapAction(async () => {
|
|
43
43
|
const { createCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/create')));
|
|
44
44
|
await createCommand();
|
|
45
45
|
}));
|
|
46
|
-
commander_1.
|
|
46
|
+
commander_1.program
|
|
47
47
|
.command('init [appName] [appId]')
|
|
48
48
|
.description(`Initialize Capacitor configuration`)
|
|
49
49
|
.option('--web-dir <value>', 'Optional: Directory of your projects built web assets')
|
|
@@ -51,14 +51,14 @@ function runProgram(config) {
|
|
|
51
51
|
const { initCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/init')));
|
|
52
52
|
await initCommand(config, appName, appId, webDir);
|
|
53
53
|
})));
|
|
54
|
-
commander_1.
|
|
54
|
+
commander_1.program
|
|
55
55
|
.command('serve', { hidden: true })
|
|
56
56
|
.description('Serves a Capacitor Progressive Web App in the browser')
|
|
57
57
|
.action(cli_1.wrapAction(async () => {
|
|
58
58
|
const { serveCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/serve')));
|
|
59
59
|
await serveCommand();
|
|
60
60
|
}));
|
|
61
|
-
commander_1.
|
|
61
|
+
commander_1.program
|
|
62
62
|
.command('sync [platform]')
|
|
63
63
|
.description(`${colors_1.default.input('copy')} + ${colors_1.default.input('update')}`)
|
|
64
64
|
.option('--deployment', "Optional: if provided, Podfile.lock won't be deleted and pod install will use --deployment option")
|
|
@@ -67,7 +67,7 @@ function runProgram(config) {
|
|
|
67
67
|
const { syncCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/sync')));
|
|
68
68
|
await syncCommand(config, platform, deployment);
|
|
69
69
|
})));
|
|
70
|
-
commander_1.
|
|
70
|
+
commander_1.program
|
|
71
71
|
.command('update [platform]')
|
|
72
72
|
.description(`updates the native plugins and dependencies based on ${colors_1.default.strong('package.json')}`)
|
|
73
73
|
.option('--deployment', "Optional: if provided, Podfile.lock won't be deleted and pod install will use --deployment option")
|
|
@@ -76,7 +76,7 @@ function runProgram(config) {
|
|
|
76
76
|
const { updateCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/update')));
|
|
77
77
|
await updateCommand(config, platform, deployment);
|
|
78
78
|
})));
|
|
79
|
-
commander_1.
|
|
79
|
+
commander_1.program
|
|
80
80
|
.command('copy [platform]')
|
|
81
81
|
.description('copies the web app build into the native app')
|
|
82
82
|
.action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
|
|
@@ -84,7 +84,7 @@ function runProgram(config) {
|
|
|
84
84
|
const { copyCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/copy')));
|
|
85
85
|
await copyCommand(config, platform);
|
|
86
86
|
})));
|
|
87
|
-
commander_1.
|
|
87
|
+
commander_1.program
|
|
88
88
|
.command(`run [platform]`)
|
|
89
89
|
.description(`runs ${colors_1.default.input('sync')}, then builds and deploys the native app`)
|
|
90
90
|
.option('--list', 'list targets, then quit')
|
|
@@ -96,14 +96,14 @@ function runProgram(config) {
|
|
|
96
96
|
const { runCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/run')));
|
|
97
97
|
await runCommand(config, platform, { list, target, sync });
|
|
98
98
|
})));
|
|
99
|
-
commander_1.
|
|
99
|
+
commander_1.program
|
|
100
100
|
.command('open [platform]')
|
|
101
101
|
.description('opens the native project workspace (Xcode for iOS)')
|
|
102
102
|
.action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
|
|
103
103
|
const { openCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/open')));
|
|
104
104
|
await openCommand(config, platform);
|
|
105
105
|
})));
|
|
106
|
-
commander_1.
|
|
106
|
+
commander_1.program
|
|
107
107
|
.command('add [platform]')
|
|
108
108
|
.description('add a native platform project')
|
|
109
109
|
.action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
|
|
@@ -111,7 +111,7 @@ function runProgram(config) {
|
|
|
111
111
|
const { addCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/add')));
|
|
112
112
|
await addCommand(config, platform);
|
|
113
113
|
})));
|
|
114
|
-
commander_1.
|
|
114
|
+
commander_1.program
|
|
115
115
|
.command('ls [platform]')
|
|
116
116
|
.description('list installed Cordova and Capacitor plugins')
|
|
117
117
|
.action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
|
|
@@ -119,7 +119,7 @@ function runProgram(config) {
|
|
|
119
119
|
const { listCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/list')));
|
|
120
120
|
await listCommand(config, platform);
|
|
121
121
|
})));
|
|
122
|
-
commander_1.
|
|
122
|
+
commander_1.program
|
|
123
123
|
.command('doctor [platform]')
|
|
124
124
|
.description('checks the current setup for common errors')
|
|
125
125
|
.action(cli_1.wrapAction(telemetry_1.telemetryAction(config, async (platform) => {
|
|
@@ -127,35 +127,35 @@ function runProgram(config) {
|
|
|
127
127
|
const { doctorCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/doctor')));
|
|
128
128
|
await doctorCommand(config, platform);
|
|
129
129
|
})));
|
|
130
|
-
commander_1.
|
|
130
|
+
commander_1.program
|
|
131
131
|
.command('telemetry [on|off]', { hidden: true })
|
|
132
132
|
.description('enable or disable telemetry')
|
|
133
133
|
.action(cli_1.wrapAction(async (onOrOff) => {
|
|
134
134
|
const { telemetryCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/telemetry')));
|
|
135
135
|
await telemetryCommand(onOrOff);
|
|
136
136
|
}));
|
|
137
|
-
commander_1.
|
|
137
|
+
commander_1.program
|
|
138
138
|
.command('📡', { hidden: true })
|
|
139
139
|
.description('IPC receiver command')
|
|
140
140
|
.action(() => {
|
|
141
141
|
// no-op: IPC messages are received via `process.on('message')`
|
|
142
142
|
});
|
|
143
|
-
commander_1.
|
|
143
|
+
commander_1.program
|
|
144
144
|
.command('plugin:generate', { hidden: true })
|
|
145
145
|
.description('start a new Capacitor plugin')
|
|
146
146
|
.action(cli_1.wrapAction(async () => {
|
|
147
147
|
const { newPluginCommand } = await Promise.resolve().then(() => tslib_1.__importStar(require('./tasks/new-plugin')));
|
|
148
148
|
await newPluginCommand();
|
|
149
149
|
}));
|
|
150
|
-
commander_1.
|
|
150
|
+
commander_1.program.arguments('[command]').action(cli_1.wrapAction(async (cmd) => {
|
|
151
151
|
if (typeof cmd === 'undefined') {
|
|
152
152
|
log_1.output.write(`\n ${emoji_1.emoji('⚡️', '--')} ${colors_1.default.strong('Capacitor - Cross-Platform apps with JavaScript and the Web')} ${emoji_1.emoji('⚡️', '--')}\n\n`);
|
|
153
|
-
commander_1.
|
|
153
|
+
commander_1.program.outputHelp();
|
|
154
154
|
}
|
|
155
155
|
else {
|
|
156
156
|
errors_1.fatal(`Unknown command: ${colors_1.default.input(cmd)}`);
|
|
157
157
|
}
|
|
158
158
|
}));
|
|
159
|
-
commander_1.
|
|
159
|
+
commander_1.program.parse(process.argv);
|
|
160
160
|
}
|
|
161
161
|
exports.runProgram = runProgram;
|
package/dist/tasks/copy.js
CHANGED
|
@@ -9,6 +9,7 @@ const common_1 = require("../common");
|
|
|
9
9
|
const cordova_1 = require("../cordova");
|
|
10
10
|
const errors_1 = require("../errors");
|
|
11
11
|
const log_1 = require("../log");
|
|
12
|
+
const plugin_1 = require("../plugin");
|
|
12
13
|
const promise_1 = require("../util/promise");
|
|
13
14
|
const copy_1 = require("../web/copy");
|
|
14
15
|
async function copyCommand(config, selectedPlatformName) {
|
|
@@ -43,21 +44,41 @@ async function copy(config, platformName) {
|
|
|
43
44
|
throw result;
|
|
44
45
|
}
|
|
45
46
|
await common_1.runPlatformHook(config, platformName, config.app.rootDir, 'capacitor:copy:before');
|
|
47
|
+
const allPlugins = await plugin_1.getPlugins(config, platformName);
|
|
48
|
+
let usesCapacitorPortals = false;
|
|
49
|
+
if (allPlugins.filter(plugin => plugin.id === '@ionic-enterprise/capacitor-portals').length > 0) {
|
|
50
|
+
usesCapacitorPortals = true;
|
|
51
|
+
}
|
|
46
52
|
if (platformName === config.ios.name) {
|
|
47
|
-
|
|
53
|
+
if (usesCapacitorPortals) {
|
|
54
|
+
await copyFederatedWebDirs(config, await config.ios.webDirAbs);
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
await copyWebDir(config, await config.ios.webDirAbs, config.app.webDirAbs);
|
|
58
|
+
}
|
|
48
59
|
await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
|
|
49
60
|
const cordovaPlugins = await cordova_1.getCordovaPlugins(config, platformName);
|
|
50
61
|
await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platformName);
|
|
51
62
|
}
|
|
52
63
|
else if (platformName === config.android.name) {
|
|
53
|
-
|
|
64
|
+
if (usesCapacitorPortals) {
|
|
65
|
+
await copyFederatedWebDirs(config, config.android.webDirAbs);
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
await copyWebDir(config, config.android.webDirAbs, config.app.webDirAbs);
|
|
69
|
+
}
|
|
54
70
|
await copyCapacitorConfig(config, config.android.assetsDirAbs);
|
|
55
71
|
const cordovaPlugins = await cordova_1.getCordovaPlugins(config, platformName);
|
|
56
72
|
await cordova_1.handleCordovaPluginsJS(cordovaPlugins, config, platformName);
|
|
57
73
|
await cordova_1.writeCordovaAndroidManifest(cordovaPlugins, config, platformName);
|
|
58
74
|
}
|
|
59
75
|
else if (platformName === config.web.name) {
|
|
60
|
-
|
|
76
|
+
if (usesCapacitorPortals) {
|
|
77
|
+
log_1.logger.info('Capacitor Portals Plugin installed, skipping web bundling...');
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
await copy_1.copyWeb(config);
|
|
81
|
+
}
|
|
61
82
|
}
|
|
62
83
|
else {
|
|
63
84
|
throw `Platform ${platformName} is not valid.`;
|
|
@@ -76,9 +97,8 @@ async function copyCapacitorConfig(config, nativeAbsDir) {
|
|
|
76
97
|
});
|
|
77
98
|
});
|
|
78
99
|
}
|
|
79
|
-
async function copyWebDir(config, nativeAbsDir) {
|
|
100
|
+
async function copyWebDir(config, nativeAbsDir, webAbsDir) {
|
|
80
101
|
var _a;
|
|
81
|
-
const webAbsDir = config.app.webDirAbs;
|
|
82
102
|
const webRelDir = path_1.basename(webAbsDir);
|
|
83
103
|
const nativeRelDir = path_1.relative(config.app.rootDir, nativeAbsDir);
|
|
84
104
|
if (((_a = config.app.extConfig.server) === null || _a === void 0 ? void 0 : _a.url) && !(await utils_fs_1.pathExists(webAbsDir))) {
|
|
@@ -91,3 +111,25 @@ async function copyWebDir(config, nativeAbsDir) {
|
|
|
91
111
|
return utils_fs_1.copy(webAbsDir, nativeAbsDir);
|
|
92
112
|
});
|
|
93
113
|
}
|
|
114
|
+
async function copyFederatedWebDirs(config, nativeAbsDir) {
|
|
115
|
+
var _a, _b;
|
|
116
|
+
log_1.logger.info('Capacitor Portals Plugin Loaded - Copying Web Assets');
|
|
117
|
+
if (!((_b = (_a = config.app.extConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.Portals)) {
|
|
118
|
+
throw `Capacitor Portals plugin is present but no valid config is defined.`;
|
|
119
|
+
}
|
|
120
|
+
const portalsConfig = config.app.extConfig.plugins.Portals;
|
|
121
|
+
if (!isPortal(portalsConfig.shell)) {
|
|
122
|
+
throw `Capacitor Portals plugin is present but no valid Shell application is defined in the config.`;
|
|
123
|
+
}
|
|
124
|
+
if (!portalsConfig.apps.every(isPortal)) {
|
|
125
|
+
throw `Capacitor Portals plugin is present but there is a problem with the apps defined in the config.`;
|
|
126
|
+
}
|
|
127
|
+
await Promise.all([...portalsConfig.apps, portalsConfig.shell].map(app => {
|
|
128
|
+
const appDir = path_1.resolve(config.app.rootDir, app.webDir);
|
|
129
|
+
return copyWebDir(config, path_1.resolve(nativeAbsDir, app.name), appDir);
|
|
130
|
+
}));
|
|
131
|
+
}
|
|
132
|
+
function isPortal(config) {
|
|
133
|
+
return (config.webDir !== undefined &&
|
|
134
|
+
config.name !== undefined);
|
|
135
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@capacitor/cli",
|
|
3
|
-
"version": "4.0.0-
|
|
3
|
+
"version": "4.0.0-beta.2",
|
|
4
4
|
"description": "Capacitor: Cross-platform apps with JavaScript and the web",
|
|
5
5
|
"homepage": "https://capacitorjs.com",
|
|
6
6
|
"author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
|
|
@@ -44,16 +44,16 @@
|
|
|
44
44
|
"watch": "npm run assets && tsc -w"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@ionic/cli-framework-output": "^2.2.
|
|
48
|
-
"@ionic/utils-fs": "^3.1.
|
|
49
|
-
"@ionic/utils-subprocess": "^2.1.
|
|
50
|
-
"@ionic/utils-terminal": "^2.3.
|
|
51
|
-
"commander": "^
|
|
47
|
+
"@ionic/cli-framework-output": "^2.2.5",
|
|
48
|
+
"@ionic/utils-fs": "^3.1.6",
|
|
49
|
+
"@ionic/utils-subprocess": "^2.1.11",
|
|
50
|
+
"@ionic/utils-terminal": "^2.3.3",
|
|
51
|
+
"commander": "^9.3.0",
|
|
52
52
|
"debug": "^4.3.4",
|
|
53
53
|
"env-paths": "^2.2.0",
|
|
54
54
|
"kleur": "^4.1.4",
|
|
55
|
-
"native-run": "^1.
|
|
56
|
-
"open": "^
|
|
55
|
+
"native-run": "^1.6.0",
|
|
56
|
+
"open": "^8.4.0",
|
|
57
57
|
"plist": "^3.0.5",
|
|
58
58
|
"prompts": "^2.4.2",
|
|
59
59
|
"semver": "^7.3.7",
|
|
@@ -62,16 +62,13 @@
|
|
|
62
62
|
"xml2js": "^0.4.23"
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@types/debug": "^4.1.
|
|
66
|
-
"@types/fs-extra": "^9.0.1",
|
|
65
|
+
"@types/debug": "^4.1.7",
|
|
67
66
|
"@types/jest": "^26.0.4",
|
|
68
|
-
"@types/open": "^6.1.0",
|
|
69
67
|
"@types/plist": "^3.0.2",
|
|
70
|
-
"@types/prompts": "^2.0.
|
|
71
|
-
"@types/semver": "^7.3.
|
|
72
|
-
"@types/
|
|
73
|
-
"@types/
|
|
74
|
-
"@types/tmp": "^0.2.0",
|
|
68
|
+
"@types/prompts": "^2.0.14",
|
|
69
|
+
"@types/semver": "^7.3.10",
|
|
70
|
+
"@types/tar": "^6.1.1",
|
|
71
|
+
"@types/tmp": "^0.2.3",
|
|
75
72
|
"@types/xml2js": "0.4.5",
|
|
76
73
|
"jest": "^26.1.0",
|
|
77
74
|
"rimraf": "^3.0.2",
|
|
@@ -85,5 +82,5 @@
|
|
|
85
82
|
"publishConfig": {
|
|
86
83
|
"access": "public"
|
|
87
84
|
},
|
|
88
|
-
"gitHead": "
|
|
85
|
+
"gitHead": "902e1f56af32143b817cf03233264203bcd5adab"
|
|
89
86
|
}
|