@capacitor/cli 6.0.0-rc.1 → 6.0.0-rc.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/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-pods-template.tar.gz +0 -0
- package/assets/ios-spm-template.tar.gz +0 -0
- package/dist/android/build.js +1 -1
- package/dist/ios/update.js +1 -6
- package/dist/tasks/copy.js +4 -0
- package/dist/util/iosplugin.js +12 -1
- package/package.json +1 -1
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/dist/android/build.js
CHANGED
|
@@ -67,7 +67,7 @@ async function signWithApkSigner(config, buildOptions, releasePath, signedReleas
|
|
|
67
67
|
signingArgs.push('--ks-key-alias', buildOptions.keystorealias);
|
|
68
68
|
}
|
|
69
69
|
if (buildOptions.keystorealiaspass) {
|
|
70
|
-
signingArgs.push('--key-pass', buildOptions.keystorealiaspass);
|
|
70
|
+
signingArgs.push('--key-pass', `pass:${buildOptions.keystorealiaspass}`);
|
|
71
71
|
}
|
|
72
72
|
await (0, common_1.runTask)('Signing Release', async () => {
|
|
73
73
|
await (0, subprocess_1.runCommand)('apksigner', signingArgs, {
|
package/dist/ios/update.js
CHANGED
|
@@ -28,7 +28,7 @@ async function updateIOS(config, deployment) {
|
|
|
28
28
|
else {
|
|
29
29
|
await updateIOSCocoaPods(config, plugins, deployment);
|
|
30
30
|
}
|
|
31
|
-
generateIOSPackageJSON(config, plugins);
|
|
31
|
+
(0, iosplugin_1.generateIOSPackageJSON)(config, plugins);
|
|
32
32
|
(0, plugin_1.printPlugins)(capacitorPlugins, 'ios');
|
|
33
33
|
}
|
|
34
34
|
exports.updateIOS = updateIOS;
|
|
@@ -100,11 +100,6 @@ end`, `require_relative '${relativeCapacitoriOSPath}/scripts/pods_helpers'`);
|
|
|
100
100
|
log_1.logger.warn('Unable to find "xcodebuild". Skipping xcodebuild clean step...');
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
|
-
async function generateIOSPackageJSON(config, plugins) {
|
|
104
|
-
const fileList = await (0, iosplugin_1.getPluginFiles)(plugins);
|
|
105
|
-
const classList = await (0, iosplugin_1.findPluginClasses)(fileList);
|
|
106
|
-
(0, iosplugin_1.writePluginJSON)(config, classList);
|
|
107
|
-
}
|
|
108
103
|
async function getRelativeCapacitoriOSPath(config) {
|
|
109
104
|
const capacitoriOSPath = (0, node_1.resolveNode)(config.app.rootDir, '@capacitor/ios', 'package.json');
|
|
110
105
|
if (!capacitoriOSPath) {
|
package/dist/tasks/copy.js
CHANGED
|
@@ -8,8 +8,10 @@ const colors_1 = tslib_1.__importDefault(require("../colors"));
|
|
|
8
8
|
const common_1 = require("../common");
|
|
9
9
|
const cordova_1 = require("../cordova");
|
|
10
10
|
const errors_1 = require("../errors");
|
|
11
|
+
const common_2 = require("../ios/common");
|
|
11
12
|
const log_1 = require("../log");
|
|
12
13
|
const plugin_1 = require("../plugin");
|
|
14
|
+
const iosplugin_1 = require("../util/iosplugin");
|
|
13
15
|
const promise_1 = require("../util/promise");
|
|
14
16
|
const copy_1 = require("../web/copy");
|
|
15
17
|
const sourcemaps_1 = require("./sourcemaps");
|
|
@@ -80,6 +82,8 @@ async function copy(config, platformName, inline = false) {
|
|
|
80
82
|
await copyCapacitorConfig(config, config.ios.nativeTargetDirAbs);
|
|
81
83
|
const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, platformName);
|
|
82
84
|
await (0, cordova_1.handleCordovaPluginsJS)(cordovaPlugins, config, platformName);
|
|
85
|
+
const iosPlugins = await (0, common_2.getIOSPlugins)(allPlugins);
|
|
86
|
+
await (0, iosplugin_1.generateIOSPackageJSON)(config, iosPlugins);
|
|
83
87
|
}
|
|
84
88
|
else if (platformName === config.android.name) {
|
|
85
89
|
if (usesFederatedCapacitor) {
|
package/dist/util/iosplugin.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.writePluginJSON = exports.findPluginClasses = exports.getPluginFiles = void 0;
|
|
3
|
+
exports.generateIOSPackageJSON = exports.writePluginJSON = exports.findPluginClasses = exports.getPluginFiles = void 0;
|
|
4
4
|
const utils_fs_1 = require("@ionic/utils-fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
+
const cordova_1 = require("../cordova");
|
|
6
7
|
async function getPluginFiles(plugins) {
|
|
7
8
|
var _a, _b;
|
|
8
9
|
let filenameList = [];
|
|
@@ -51,3 +52,13 @@ async function writePluginJSON(config, classList) {
|
|
|
51
52
|
(0, utils_fs_1.writeJSONSync)(capJSONFile, capJSON, { spaces: '\t' });
|
|
52
53
|
}
|
|
53
54
|
exports.writePluginJSON = writePluginJSON;
|
|
55
|
+
async function generateIOSPackageJSON(config, plugins) {
|
|
56
|
+
const fileList = await getPluginFiles(plugins);
|
|
57
|
+
const classList = await findPluginClasses(fileList);
|
|
58
|
+
const cordovaPlugins = await (0, cordova_1.getCordovaPlugins)(config, 'ios');
|
|
59
|
+
if (cordovaPlugins.length > 0) {
|
|
60
|
+
classList.push('CDVPlugin');
|
|
61
|
+
}
|
|
62
|
+
writePluginJSON(config, classList);
|
|
63
|
+
}
|
|
64
|
+
exports.generateIOSPackageJSON = generateIOSPackageJSON;
|
package/package.json
CHANGED