nativescript 8.7.2 → 8.8.0-embed.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/lib/android-tools-info.js +0 -12
- package/lib/base-package-manager.js +0 -7
- package/lib/bootstrap.js +1 -5
- package/lib/bun-package-manager.js +1 -17
- package/lib/color.js +0 -3
- package/lib/commands/add-platform.js +1 -2
- package/lib/commands/apple-login.js +0 -1
- package/lib/commands/appstore-list.js +0 -1
- package/lib/commands/appstore-upload.js +0 -4
- package/lib/commands/build.js +2 -3
- package/lib/commands/clean.js +1 -22
- package/lib/commands/command-base.js +0 -1
- package/lib/commands/config.js +0 -3
- package/lib/commands/create-project.js +0 -6
- package/lib/commands/debug.js +1 -6
- package/lib/commands/deploy.js +2 -3
- package/lib/commands/extensibility/install-extension.js +0 -1
- package/lib/commands/extensibility/list-extensions.js +0 -1
- package/lib/commands/extensibility/uninstall-extension.js +0 -1
- package/lib/commands/fonts.js +0 -1
- package/lib/commands/generate-assets.js +0 -1
- package/lib/commands/generate-help.js +0 -1
- package/lib/commands/generate.js +2 -12
- package/lib/commands/info.js +0 -1
- package/lib/commands/install.js +0 -1
- package/lib/commands/list-platforms.js +0 -1
- package/lib/commands/migrate.js +0 -1
- package/lib/commands/platform-clean.js +0 -1
- package/lib/commands/plugin/add-plugin.js +0 -1
- package/lib/commands/plugin/build-plugin.js +0 -1
- package/lib/commands/plugin/create-plugin.js +0 -5
- package/lib/commands/plugin/list-plugins.js +0 -1
- package/lib/commands/plugin/remove-plugin.js +0 -2
- package/lib/commands/plugin/update-plugin.js +0 -1
- package/lib/commands/post-install.js +0 -6
- package/lib/commands/prepare.js +2 -3
- package/lib/commands/preview.js +0 -2
- package/lib/commands/remove-platform.js +0 -1
- package/lib/commands/resources/resources-update.js +0 -2
- package/lib/commands/run.js +0 -1
- package/lib/commands/setup.js +0 -1
- package/lib/commands/start.js +0 -1
- package/lib/commands/test-init.js +0 -4
- package/lib/commands/test.js +2 -9
- package/lib/commands/typings.js +1 -2
- package/lib/commands/update-platform.js +0 -5
- package/lib/commands/update.js +0 -2
- package/lib/common/bootstrap.js +0 -1
- package/lib/common/child-process.js +0 -3
- package/lib/common/codeGeneration/code-entity.js +0 -1
- package/lib/common/codeGeneration/code-printer.js +0 -1
- package/lib/common/command-params.js +0 -1
- package/lib/common/commands/analytics.js +0 -3
- package/lib/common/commands/autocompletion.js +0 -3
- package/lib/common/commands/device/device-log-stream.js +0 -1
- package/lib/common/commands/device/get-file.js +0 -2
- package/lib/common/commands/device/list-applications.js +0 -1
- package/lib/common/commands/device/list-devices.js +0 -3
- package/lib/common/commands/device/list-files.js +0 -2
- package/lib/common/commands/device/put-file.js +0 -2
- package/lib/common/commands/device/run-application.js +0 -1
- package/lib/common/commands/device/stop-application.js +0 -1
- package/lib/common/commands/device/uninstall-application.js +0 -1
- package/lib/common/commands/doctor.js +2 -3
- package/lib/common/commands/generate-messages.js +0 -1
- package/lib/common/commands/help.js +0 -1
- package/lib/common/commands/package-manager-get.js +0 -1
- package/lib/common/commands/package-manager-set.js +0 -1
- package/lib/common/commands/post-install.js +0 -1
- package/lib/common/commands/preuninstall.js +2 -11
- package/lib/common/commands/proxy/proxy-base.js +0 -4
- package/lib/common/commands/proxy/proxy-clear.js +0 -1
- package/lib/common/commands/proxy/proxy-get.js +0 -1
- package/lib/common/commands/proxy/proxy-set.js +0 -1
- package/lib/common/common-lib.js +0 -1
- package/lib/common/constants.js +0 -11
- package/lib/common/decorators.js +0 -48
- package/lib/common/dispatchers.js +1 -10
- package/lib/common/errors.js +3 -13
- package/lib/common/file-system.js +2 -13
- package/lib/common/header.js +0 -3
- package/lib/common/helpers.js +3 -89
- package/lib/common/host-info.js +0 -4
- package/lib/common/http-client.js +0 -20
- package/lib/common/logger/appenders/cli-appender.js +0 -4
- package/lib/common/logger/appenders/emit-appender.js +0 -4
- package/lib/common/logger/layouts/cli-layout.js +0 -1
- package/lib/common/logger/logger.js +0 -5
- package/lib/common/messages/messages.js +0 -6
- package/lib/common/mobile/android/android-application-manager.js +1 -20
- package/lib/common/mobile/android/android-debug-bridge-result-handler.js +0 -1
- package/lib/common/mobile/android/android-debug-bridge.js +0 -6
- package/lib/common/mobile/android/android-device-file-system.js +0 -4
- package/lib/common/mobile/android/android-device-hash-service.js +0 -3
- package/lib/common/mobile/android/android-device.js +0 -8
- package/lib/common/mobile/android/android-emulator-services.js +1 -2
- package/lib/common/mobile/android/android-ini-file-parser.js +0 -9
- package/lib/common/mobile/android/android-log-filter.js +0 -4
- package/lib/common/mobile/android/android-virtual-device-service.js +0 -26
- package/lib/common/mobile/android/device-android-debug-bridge.js +0 -1
- package/lib/common/mobile/android/genymotion/genymotion-service.js +0 -5
- package/lib/common/mobile/android/genymotion/virtualbox-service.js +0 -11
- package/lib/common/mobile/android/logcat-helper.js +1 -20
- package/lib/common/mobile/application-manager-base.js +0 -6
- package/lib/common/mobile/device-emitter.js +0 -4
- package/lib/common/mobile/device-log-emitter.js +0 -1
- package/lib/common/mobile/device-log-provider-base.js +0 -1
- package/lib/common/mobile/device-log-provider.js +0 -23
- package/lib/common/mobile/device-platforms-constants.js +0 -1
- package/lib/common/mobile/emulator-helper.js +0 -3
- package/lib/common/mobile/ios/device/ios-application-manager.js +0 -3
- package/lib/common/mobile/ios/device/ios-device-file-system.js +0 -1
- package/lib/common/mobile/ios/device/ios-device-operations.js +0 -4
- package/lib/common/mobile/ios/device/ios-device.js +0 -4
- package/lib/common/mobile/ios/ios-device-base.js +0 -1
- package/lib/common/mobile/ios/ios-device-product-name-mapper.js +0 -2
- package/lib/common/mobile/ios/ios-log-filter.js +0 -1
- package/lib/common/mobile/ios/simulator/ios-emulator-services.js +0 -4
- package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +0 -1
- package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +0 -6
- package/lib/common/mobile/ios/simulator/ios-simulator-device.js +0 -5
- package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +0 -1
- package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +0 -1
- package/lib/common/mobile/local-to-device-path-data-factory.js +0 -1
- package/lib/common/mobile/log-filter.js +0 -2
- package/lib/common/mobile/logging-levels.js +0 -1
- package/lib/common/mobile/mobile-core/android-device-discovery.js +0 -2
- package/lib/common/mobile/mobile-core/android-emulator-discovery.js +0 -3
- package/lib/common/mobile/mobile-core/android-process-service.js +0 -32
- package/lib/common/mobile/mobile-core/device-discovery.js +0 -1
- package/lib/common/mobile/mobile-core/devices-service.js +0 -69
- package/lib/common/mobile/mobile-core/ios-device-discovery.js +0 -2
- package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +0 -3
- package/lib/common/mobile/mobile-helper.js +0 -1
- package/lib/common/mobile/wp8/wp8-emulator-services.js +0 -1
- package/lib/common/opener.js +0 -1
- package/lib/common/os-info.js +0 -1
- package/lib/common/plist-parser.js +0 -1
- package/lib/common/project-helper.js +0 -1
- package/lib/common/prompter.js +1 -9
- package/lib/common/queue.js +0 -1
- package/lib/common/resource-loader.js +0 -1
- package/lib/common/services/auto-completion-service.js +1 -13
- package/lib/common/services/cancellation.js +1 -2
- package/lib/common/services/commands-service.js +6 -17
- package/lib/common/services/help-service.js +3 -11
- package/lib/common/services/hooks-service.js +0 -13
- package/lib/common/services/ios-notification-service.js +0 -1
- package/lib/common/services/json-file-settings-service.js +0 -6
- package/lib/common/services/lock-service.js +0 -6
- package/lib/common/services/message-contract-generator.js +0 -1
- package/lib/common/services/messages-service.js +0 -1
- package/lib/common/services/micro-templating-service.js +0 -6
- package/lib/common/services/net-service.js +0 -3
- package/lib/common/services/project-files-manager.js +0 -5
- package/lib/common/services/project-files-provider-base.js +0 -1
- package/lib/common/services/proxy-service.js +0 -1
- package/lib/common/services/qr.js +0 -1
- package/lib/common/services/settings-service.js +0 -1
- package/lib/common/services/xcode-select-service.js +0 -1
- package/lib/common/utils.js +0 -1
- package/lib/common/validators/project-name-validator.js +0 -1
- package/lib/common/validators/validation-result.js +0 -1
- package/lib/common/verify-node-version.js +1 -8
- package/lib/common/yok.js +11 -32
- package/lib/config.js +1 -22
- package/lib/constants-provider.js +0 -1
- package/lib/constants.js +0 -53
- package/lib/controllers/build-controller.js +3 -4
- package/lib/controllers/debug-controller.js +3 -8
- package/lib/controllers/deploy-controller.js +0 -1
- package/lib/controllers/migrate-controller.js +3 -91
- package/lib/controllers/platform-controller.js +1 -9
- package/lib/controllers/prepare-controller.js +10 -17
- package/lib/controllers/run-controller.js +1 -17
- package/lib/controllers/update-controller-base.js +0 -1
- package/lib/controllers/update-controller.js +0 -11
- package/lib/data/build-data.js +2 -1
- package/lib/data/controller-data-base.js +0 -1
- package/lib/data/debug-data.js +0 -1
- package/lib/data/platform-data.js +0 -1
- package/lib/data/prepare-data.js +1 -1
- package/lib/data/run-data.js +0 -1
- package/lib/declarations.d.ts +12 -2
- package/lib/definitions/platform.d.ts +1 -0
- package/lib/detached-processes/cleanup-js-subprocess.js +2 -8
- package/lib/detached-processes/cleanup-process.js +14 -18
- package/lib/detached-processes/file-log-service.js +1 -2
- package/lib/device-path-provider.js +0 -1
- package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +0 -7
- package/lib/device-sockets/ios/notification.js +0 -3
- package/lib/device-sockets/ios/socket-request-executor.js +0 -3
- package/lib/helpers/android-bundle-validator-helper.js +1 -2
- package/lib/helpers/deploy-command-helper.js +0 -1
- package/lib/helpers/key-command-helper.js +2 -4
- package/lib/helpers/livesync-command-helper.js +1 -4
- package/lib/helpers/network-connectivity-validator.js +0 -1
- package/lib/helpers/options-track-helper.js +2 -3
- package/lib/helpers/package-path-helper.js +0 -1
- package/lib/helpers/platform-command-helper.js +17 -10
- package/lib/helpers/version-validator-helper.js +0 -1
- package/lib/key-commands/bootstrap.js +2 -3
- package/lib/key-commands/index.js +4 -5
- package/lib/nativescript-cli-lib-bootstrap.js +0 -4
- package/lib/nativescript-cli-lib.js +0 -1
- package/lib/nativescript-cli.js +1 -10
- package/lib/node/pbxproj-dom-xcode.js +0 -1
- package/lib/node/xcode.js +0 -1
- package/lib/node-package-manager.js +1 -11
- package/lib/options.js +123 -141
- package/lib/package-installation-manager.js +1 -8
- package/lib/package-manager.js +0 -2
- package/lib/platform-command-param.js +0 -1
- package/lib/pnpm-package-manager.js +1 -4
- package/lib/project-data.js +0 -12
- package/lib/providers/project-files-provider.js +1 -2
- package/lib/resolvers/livesync-service-resolver.js +0 -1
- package/lib/services/analytics/analytics-broker-process.js +6 -10
- package/lib/services/analytics/analytics-broker.js +1 -2
- package/lib/services/analytics/analytics-service.js +25 -29
- package/lib/services/analytics/google-analytics-provider.js +12 -13
- package/lib/services/analytics-settings-service.js +0 -5
- package/lib/services/android/android-bundle-tool-service.js +0 -1
- package/lib/services/android/gradle-build-args-service.js +0 -3
- package/lib/services/android/gradle-build-service.js +0 -1
- package/lib/services/android/gradle-command-service.js +0 -1
- package/lib/services/android-device-debug-service.js +0 -6
- package/lib/services/android-plugin-build-service.js +12 -34
- package/lib/services/android-project-service.js +22 -86
- package/lib/services/android-resources-migration-service.js +0 -7
- package/lib/services/apple-portal/apple-portal-application-service.js +0 -1
- package/lib/services/apple-portal/apple-portal-cookie-service.js +0 -1
- package/lib/services/apple-portal/apple-portal-session-service.js +4 -6
- package/lib/services/assets-generation/assets-generation-service.js +13 -17
- package/lib/services/build-artifacts-service.js +1 -2
- package/lib/services/build-data-service.js +0 -1
- package/lib/services/build-info-file-service.js +0 -1
- package/lib/services/cleanup-service.js +9 -13
- package/lib/services/cocoapods-platform-manager.js +0 -9
- package/lib/services/cocoapods-service.js +1 -21
- package/lib/services/debug-data-service.js +0 -1
- package/lib/services/debug-service-base.js +0 -7
- package/lib/services/device/device-install-app-service.js +1 -2
- package/lib/services/doctor-service.js +6 -21
- package/lib/services/extensibility-service.js +0 -8
- package/lib/services/files-hash-service.js +3 -3
- package/lib/services/hmr-status-service.js +0 -2
- package/lib/services/info-service.js +0 -1
- package/lib/services/initialize-service.js +1 -5
- package/lib/services/ios/export-options-plist-service.js +0 -4
- package/lib/services/ios/ios-signing-service.js +0 -4
- package/lib/services/ios/spm-service.js +0 -9
- package/lib/services/ios/xcodebuild-args-service.js +0 -9
- package/lib/services/ios/xcodebuild-command-service.js +0 -1
- package/lib/services/ios/xcodebuild-service.js +0 -1
- package/lib/services/ios-debugger-port-service.js +0 -1
- package/lib/services/ios-device-debug-service.js +0 -1
- package/lib/services/ios-entitlements-service.js +0 -1
- package/lib/services/ios-extensions-service.js +0 -1
- package/lib/services/ios-log-filter.js +0 -20
- package/lib/services/ios-native-target-service.js +4 -6
- package/lib/services/ios-project-service.js +24 -26
- package/lib/services/ios-provision-service.js +0 -3
- package/lib/services/ios-watch-app-service.js +0 -1
- package/lib/services/ip-service.js +0 -2
- package/lib/services/itmstransporter-service.js +0 -1
- package/lib/services/karma-execution.js +0 -2
- package/lib/services/livesync/android-device-livesync-service-base.js +0 -1
- package/lib/services/livesync/android-device-livesync-service.js +0 -2
- package/lib/services/livesync/android-device-livesync-sockets-service.js +3 -7
- package/lib/services/livesync/android-livesync-service.js +2 -3
- package/lib/services/livesync/android-livesync-tool.js +0 -4
- package/lib/services/livesync/device-livesync-service-base.js +0 -2
- package/lib/services/livesync/ios-device-livesync-service.js +0 -7
- package/lib/services/livesync/ios-livesync-service.js +2 -4
- package/lib/services/livesync/livesync-socket.js +0 -1
- package/lib/services/livesync/platform-livesync-service-base.js +4 -8
- package/lib/services/livesync-process-data-service.js +0 -1
- package/lib/services/log-parser-service.js +0 -1
- package/lib/services/log-source-map-service.js +3 -17
- package/lib/services/marking-mode-service.js +5 -8
- package/lib/services/metadata-filtering-service.js +0 -1
- package/lib/services/npm-config-service.js +0 -4
- package/lib/services/pacote-service.js +0 -7
- package/lib/services/performance-service.js +1 -3
- package/lib/services/platform/add-platform-service.js +9 -48
- package/lib/services/platform/platform-validation-service.js +0 -1
- package/lib/services/platform/prepare-native-platform-service.js +8 -8
- package/lib/services/platform-environment-requirements.js +6 -9
- package/lib/services/platform-project-service-base.js +0 -1
- package/lib/services/platforms-data-service.js +0 -1
- package/lib/services/plugins-service.js +9 -19
- package/lib/services/prepare-data-service.js +0 -1
- package/lib/services/project-backup-service.js +0 -4
- package/lib/services/project-changes-service.js +11 -13
- package/lib/services/project-cleanup-service.js +0 -2
- package/lib/services/project-config-service.js +1 -18
- package/lib/services/project-data-service.js +7 -36
- package/lib/services/project-name-service.js +0 -1
- package/lib/services/project-service.js +0 -10
- package/lib/services/project-templates-service.js +2 -3
- package/lib/services/qr-code-terminal-service.js +0 -1
- package/lib/services/require-service.js +0 -1
- package/lib/services/start-service.js +0 -1
- package/lib/services/temp-service.js +0 -1
- package/lib/services/terminal-spinner-service.js +0 -2
- package/lib/services/test-execution-service.js +2 -9
- package/lib/services/test-initialization-service.js +0 -4
- package/lib/services/timeline-profiler-service.js +0 -1
- package/lib/services/user-settings-service.js +0 -1
- package/lib/services/versions-service.js +4 -6
- package/lib/services/watch-ignore-list-service.js +0 -1
- package/lib/services/webpack/webpack-compiler-service.js +15 -48
- package/lib/services/xcconfig-service.js +0 -2
- package/lib/services/xcproj-service.js +12 -1
- package/lib/shared-event-bus.js +0 -6
- package/lib/sys-info.js +1 -2
- package/lib/tools/config-manipulation/config-transformer.js +0 -12
- package/lib/tools/node-modules/node-modules-builder.js +0 -1
- package/lib/tools/node-modules/node-modules-dependencies-builder.js +0 -6
- package/lib/yarn-package-manager.js +0 -1
- package/lib/yarn2-package-manager.js +0 -3
- package/package.json +2 -2
- package/vendor/gradle-plugin/build.gradle +21 -6
- package/vendor/gradle-plugin/settings.gradle +13 -3
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/CHANGELOG.md +0 -15
- package/node_modules/rimraf/CHANGELOG.md +0 -65
- package/node_modules/stringify-package/CHANGELOG.md +0 -16
|
@@ -47,12 +47,8 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
|
|
|
47
47
|
}
|
|
48
48
|
params = params.concat(flags);
|
|
49
49
|
const cwd = pathToSave;
|
|
50
|
-
// Npm creates `etc` directory in installation dir when --prefix is passed
|
|
51
|
-
// https://github.com/npm/npm/issues/11486
|
|
52
|
-
// we should delete it if it was created because of us
|
|
53
50
|
const etcDirectoryLocation = (0, path_1.join)(cwd, "etc");
|
|
54
51
|
const etcExistsPriorToInstallation = this.$fs.exists(etcDirectoryLocation);
|
|
55
|
-
//TODO: plamen5kov: workaround is here for a reason (remove whole file later)
|
|
56
52
|
if (config.path) {
|
|
57
53
|
let relativePathFromCwdToSource = "";
|
|
58
54
|
if (config.frameworkPath) {
|
|
@@ -68,13 +64,9 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
|
|
|
68
64
|
}
|
|
69
65
|
catch (err) {
|
|
70
66
|
if (err.message && err.message.indexOf("EPEERINVALID") !== -1) {
|
|
71
|
-
// Not installed peer dependencies are treated by npm 2 as errors, but npm 3 treats them as warnings.
|
|
72
|
-
// We'll show them as warnings and let the user install them in case they are needed.
|
|
73
67
|
this.$logger.warn(err.message);
|
|
74
68
|
}
|
|
75
69
|
else {
|
|
76
|
-
// All other errors should be handled by the caller code.
|
|
77
|
-
// Revert package.json contents to preserve valid state
|
|
78
70
|
this.$fs.writeJson(packageJsonPath, jsonContentBefore);
|
|
79
71
|
throw err;
|
|
80
72
|
}
|
|
@@ -102,7 +94,7 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
|
|
|
102
94
|
}
|
|
103
95
|
view(packageName, config) {
|
|
104
96
|
return __awaiter(this, void 0, void 0, function* () {
|
|
105
|
-
const wrappedConfig = _.extend({}, config, { json: true });
|
|
97
|
+
const wrappedConfig = _.extend({}, config, { json: true });
|
|
106
98
|
const flags = this.getFlagsString(wrappedConfig, false);
|
|
107
99
|
let viewResult;
|
|
108
100
|
try {
|
|
@@ -121,7 +113,6 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
|
|
|
121
113
|
}
|
|
122
114
|
searchNpms(keyword) {
|
|
123
115
|
return __awaiter(this, void 0, void 0, function* () {
|
|
124
|
-
// TODO: Fix the generation of url - in case it contains @ or / , the call may fail.
|
|
125
116
|
const httpRequestResult = yield this.$httpClient.httpRequest(`https://api.npms.io/v2/search?q=keywords:${keyword}`);
|
|
126
117
|
const result = JSON.parse(httpRequestResult.body);
|
|
127
118
|
return result;
|
|
@@ -163,4 +154,3 @@ __decorate([
|
|
|
163
154
|
], NodePackageManager.prototype, "getCachePath", null);
|
|
164
155
|
exports.NodePackageManager = NodePackageManager;
|
|
165
156
|
yok_1.injector.register("npm", NodePackageManager);
|
|
166
|
-
//# sourceMappingURL=node-package-manager.js.map
|
package/lib/options.js
CHANGED
|
@@ -15,6 +15,7 @@ const yargs = require("yargs");
|
|
|
15
15
|
const helpers_1 = require("yargs/helpers");
|
|
16
16
|
const _ = require("lodash");
|
|
17
17
|
const yok_1 = require("./common/yok");
|
|
18
|
+
const constants_1 = require("./constants");
|
|
18
19
|
class Options {
|
|
19
20
|
setupOptions(commandSpecificDashedOptions) {
|
|
20
21
|
if (commandSpecificDashedOptions) {
|
|
@@ -22,7 +23,6 @@ class Options {
|
|
|
22
23
|
this.setArgv();
|
|
23
24
|
}
|
|
24
25
|
this.argv.bundle = "webpack";
|
|
25
|
-
// Check if the user has explicitly provide --hmr and --release options from command line
|
|
26
26
|
if (this.initialArgv.release && this.initialArgv.hmr) {
|
|
27
27
|
this.$errors.fail("The options --release and --hmr cannot be used simultaneously.");
|
|
28
28
|
}
|
|
@@ -30,8 +30,6 @@ class Options {
|
|
|
30
30
|
this.argv.hmr = !this.argv.release;
|
|
31
31
|
}
|
|
32
32
|
if (this.argv.debugBrk) {
|
|
33
|
-
// we cannot use HMR along with debug-brk because we have to restart the app
|
|
34
|
-
// on each livesync in order to stop and allow debugging on app start
|
|
35
33
|
this.argv.hmr = false;
|
|
36
34
|
}
|
|
37
35
|
if (this.argv.justlaunch) {
|
|
@@ -49,18 +47,17 @@ class Options {
|
|
|
49
47
|
"timeout",
|
|
50
48
|
"_",
|
|
51
49
|
"$0",
|
|
52
|
-
];
|
|
50
|
+
];
|
|
53
51
|
this.globalOptions = {
|
|
54
|
-
log: { type: "string"
|
|
55
|
-
verbose: { type: "boolean"
|
|
56
|
-
version: { type: "boolean"
|
|
57
|
-
help: { type: "boolean"
|
|
58
|
-
profileDir: { type: "string"
|
|
59
|
-
analyticsClient: { type: "string"
|
|
60
|
-
path: { type: "string"
|
|
61
|
-
config: { type: "string"
|
|
62
|
-
|
|
63
|
-
_: { type: "string" /* OptionType.String */, hasSensitiveValue: false },
|
|
52
|
+
log: { type: "string", hasSensitiveValue: false },
|
|
53
|
+
verbose: { type: "boolean", hasSensitiveValue: false },
|
|
54
|
+
version: { type: "boolean", alias: "v", hasSensitiveValue: false },
|
|
55
|
+
help: { type: "boolean", alias: "h", hasSensitiveValue: false },
|
|
56
|
+
profileDir: { type: "string", hasSensitiveValue: true },
|
|
57
|
+
analyticsClient: { type: "string", hasSensitiveValue: false },
|
|
58
|
+
path: { type: "string", alias: "p", hasSensitiveValue: true },
|
|
59
|
+
config: { type: "string", alias: "c", hasSensitiveValue: true },
|
|
60
|
+
_: { type: "string", hasSensitiveValue: false },
|
|
64
61
|
};
|
|
65
62
|
this.options = _.extend({}, this.commonOptions, this.globalOptions);
|
|
66
63
|
this.setArgv();
|
|
@@ -76,157 +73,162 @@ class Options {
|
|
|
76
73
|
}
|
|
77
74
|
get commonOptions() {
|
|
78
75
|
return {
|
|
79
|
-
ipa: { type: "string"
|
|
80
|
-
frameworkPath: { type: "string"
|
|
81
|
-
frameworkName: { type: "string"
|
|
82
|
-
framework: { type: "string"
|
|
83
|
-
frameworkVersion: { type: "string"
|
|
84
|
-
forDevice: { type: "boolean"
|
|
76
|
+
ipa: { type: "string", hasSensitiveValue: true },
|
|
77
|
+
frameworkPath: { type: "string", hasSensitiveValue: true },
|
|
78
|
+
frameworkName: { type: "string", hasSensitiveValue: false },
|
|
79
|
+
framework: { type: "string", hasSensitiveValue: false },
|
|
80
|
+
frameworkVersion: { type: "string", hasSensitiveValue: false },
|
|
81
|
+
forDevice: { type: "boolean", hasSensitiveValue: false },
|
|
85
82
|
iCloudContainerEnvironment: {
|
|
86
|
-
type: "string"
|
|
83
|
+
type: "string",
|
|
87
84
|
hasSensitiveValue: false,
|
|
88
85
|
},
|
|
89
|
-
provision: { type: "object"
|
|
86
|
+
provision: { type: "object", hasSensitiveValue: true },
|
|
90
87
|
client: {
|
|
91
|
-
type: "boolean"
|
|
88
|
+
type: "boolean",
|
|
92
89
|
default: true,
|
|
93
90
|
hasSensitiveValue: false,
|
|
94
91
|
},
|
|
95
|
-
env: { type: "object"
|
|
96
|
-
production: { type: "boolean"
|
|
97
|
-
debugTransport: { type: "boolean"
|
|
98
|
-
keyStorePath: { type: "string"
|
|
99
|
-
keyStorePassword: { type: "string"
|
|
100
|
-
keyStoreAlias: { type: "string"
|
|
92
|
+
env: { type: "object", hasSensitiveValue: false },
|
|
93
|
+
production: { type: "boolean", hasSensitiveValue: false },
|
|
94
|
+
debugTransport: { type: "boolean", hasSensitiveValue: false },
|
|
95
|
+
keyStorePath: { type: "string", hasSensitiveValue: true },
|
|
96
|
+
keyStorePassword: { type: "string", hasSensitiveValue: true },
|
|
97
|
+
keyStoreAlias: { type: "string", hasSensitiveValue: true },
|
|
101
98
|
keyStoreAliasPassword: {
|
|
102
|
-
type: "string"
|
|
99
|
+
type: "string",
|
|
103
100
|
hasSensitiveValue: true,
|
|
104
101
|
},
|
|
105
|
-
ignoreScripts: { type: "boolean"
|
|
106
|
-
disableNpmInstall: { type: "boolean"
|
|
107
|
-
compileSdk: { type: "number"
|
|
108
|
-
port: { type: "number"
|
|
109
|
-
copyTo: { type: "string"
|
|
110
|
-
js: { type: "boolean"
|
|
111
|
-
javascript: { type: "boolean"
|
|
112
|
-
ng: { type: "boolean"
|
|
113
|
-
angular: { type: "boolean"
|
|
114
|
-
react: { type: "boolean"
|
|
115
|
-
reactjs: { type: "boolean"
|
|
116
|
-
vue: { type: "boolean"
|
|
117
|
-
vuejs: { type: "boolean"
|
|
118
|
-
svelte: { type: "boolean"
|
|
119
|
-
vision: { type: "boolean"
|
|
120
|
-
"vision-ng": { type: "boolean"
|
|
121
|
-
"vision-react": { type: "boolean"
|
|
122
|
-
"vision-solid": { type: "boolean"
|
|
123
|
-
"vision-svelte": { type: "boolean"
|
|
124
|
-
"vision-vue": { type: "boolean"
|
|
125
|
-
tsc: { type: "boolean"
|
|
126
|
-
ts: { type: "boolean"
|
|
127
|
-
typescript: { type: "boolean"
|
|
128
|
-
yarn: { type: "boolean"
|
|
129
|
-
yarn2: { type: "boolean"
|
|
130
|
-
pnpm: { type: "boolean"
|
|
131
|
-
androidTypings: { type: "boolean"
|
|
132
|
-
bundle: { type: "string"
|
|
133
|
-
all: { type: "boolean"
|
|
134
|
-
teamId: { type: "object"
|
|
135
|
-
chrome: { type: "boolean"
|
|
136
|
-
inspector: { type: "boolean"
|
|
137
|
-
clean: { type: "boolean"
|
|
102
|
+
ignoreScripts: { type: "boolean", hasSensitiveValue: false },
|
|
103
|
+
disableNpmInstall: { type: "boolean", hasSensitiveValue: false },
|
|
104
|
+
compileSdk: { type: "number", hasSensitiveValue: false },
|
|
105
|
+
port: { type: "number", hasSensitiveValue: false },
|
|
106
|
+
copyTo: { type: "string", hasSensitiveValue: true },
|
|
107
|
+
js: { type: "boolean", hasSensitiveValue: false },
|
|
108
|
+
javascript: { type: "boolean", hasSensitiveValue: false },
|
|
109
|
+
ng: { type: "boolean", hasSensitiveValue: false },
|
|
110
|
+
angular: { type: "boolean", hasSensitiveValue: false },
|
|
111
|
+
react: { type: "boolean", hasSensitiveValue: false },
|
|
112
|
+
reactjs: { type: "boolean", hasSensitiveValue: false },
|
|
113
|
+
vue: { type: "boolean", hasSensitiveValue: false },
|
|
114
|
+
vuejs: { type: "boolean", hasSensitiveValue: false },
|
|
115
|
+
svelte: { type: "boolean", hasSensitiveValue: false },
|
|
116
|
+
vision: { type: "boolean", hasSensitiveValue: false },
|
|
117
|
+
"vision-ng": { type: "boolean", hasSensitiveValue: false },
|
|
118
|
+
"vision-react": { type: "boolean", hasSensitiveValue: false },
|
|
119
|
+
"vision-solid": { type: "boolean", hasSensitiveValue: false },
|
|
120
|
+
"vision-svelte": { type: "boolean", hasSensitiveValue: false },
|
|
121
|
+
"vision-vue": { type: "boolean", hasSensitiveValue: false },
|
|
122
|
+
tsc: { type: "boolean", hasSensitiveValue: false },
|
|
123
|
+
ts: { type: "boolean", hasSensitiveValue: false },
|
|
124
|
+
typescript: { type: "boolean", hasSensitiveValue: false },
|
|
125
|
+
yarn: { type: "boolean", hasSensitiveValue: false },
|
|
126
|
+
yarn2: { type: "boolean", hasSensitiveValue: false },
|
|
127
|
+
pnpm: { type: "boolean", hasSensitiveValue: false },
|
|
128
|
+
androidTypings: { type: "boolean", hasSensitiveValue: false },
|
|
129
|
+
bundle: { type: "string", hasSensitiveValue: false },
|
|
130
|
+
all: { type: "boolean", hasSensitiveValue: false },
|
|
131
|
+
teamId: { type: "object", hasSensitiveValue: true },
|
|
132
|
+
chrome: { type: "boolean", hasSensitiveValue: false },
|
|
133
|
+
inspector: { type: "boolean", hasSensitiveValue: false },
|
|
134
|
+
clean: { type: "boolean", hasSensitiveValue: false },
|
|
138
135
|
watch: {
|
|
139
|
-
type: "boolean"
|
|
136
|
+
type: "boolean",
|
|
140
137
|
default: true,
|
|
141
138
|
hasSensitiveValue: false,
|
|
142
139
|
},
|
|
143
|
-
background: { type: "string"
|
|
144
|
-
username: { type: "string"
|
|
145
|
-
pluginName: { type: "string"
|
|
140
|
+
background: { type: "string", hasSensitiveValue: false },
|
|
141
|
+
username: { type: "string", hasSensitiveValue: true },
|
|
142
|
+
pluginName: { type: "string", hasSensitiveValue: false },
|
|
146
143
|
includeTypeScriptDemo: {
|
|
147
|
-
type: "string"
|
|
144
|
+
type: "string",
|
|
148
145
|
hasSensitiveValue: false,
|
|
149
146
|
},
|
|
150
|
-
includeAngularDemo: { type: "string"
|
|
147
|
+
includeAngularDemo: { type: "string", hasSensitiveValue: false },
|
|
151
148
|
hmr: {
|
|
152
|
-
type: "boolean"
|
|
149
|
+
type: "boolean",
|
|
153
150
|
hasSensitiveValue: false,
|
|
154
151
|
default: true,
|
|
155
152
|
},
|
|
156
153
|
collection: {
|
|
157
|
-
type: "string"
|
|
154
|
+
type: "string",
|
|
158
155
|
alias: "c",
|
|
159
156
|
hasSensitiveValue: false,
|
|
160
157
|
},
|
|
161
|
-
json: { type: "boolean"
|
|
162
|
-
avd: { type: "string"
|
|
163
|
-
|
|
164
|
-
config: { type: "array" /* OptionType.Array */, hasSensitiveValue: false },
|
|
158
|
+
json: { type: "boolean", hasSensitiveValue: false },
|
|
159
|
+
avd: { type: "string", hasSensitiveValue: true },
|
|
160
|
+
config: { type: "array", hasSensitiveValue: false },
|
|
165
161
|
insecure: {
|
|
166
|
-
type: "boolean"
|
|
162
|
+
type: "boolean",
|
|
167
163
|
alias: "k",
|
|
168
164
|
hasSensitiveValue: false,
|
|
169
165
|
},
|
|
170
|
-
debug: { type: "boolean"
|
|
171
|
-
timeout: { type: "string"
|
|
172
|
-
device: { type: "string"
|
|
173
|
-
availableDevices: { type: "boolean"
|
|
174
|
-
appid: { type: "string"
|
|
175
|
-
geny: { type: "string"
|
|
176
|
-
debugBrk: { type: "boolean"
|
|
177
|
-
debugPort: { type: "number"
|
|
178
|
-
start: { type: "boolean"
|
|
179
|
-
stop: { type: "boolean"
|
|
180
|
-
ddi: { type: "string"
|
|
181
|
-
justlaunch: { type: "boolean"
|
|
182
|
-
file: { type: "string"
|
|
183
|
-
force: { type: "boolean"
|
|
184
|
-
emulator: { type: "boolean"
|
|
185
|
-
simulator: { type: "boolean"
|
|
186
|
-
sdk: { type: "string"
|
|
187
|
-
template: { type: "string"
|
|
188
|
-
certificate: { type: "string"
|
|
189
|
-
certificatePassword: { type: "string"
|
|
166
|
+
debug: { type: "boolean", alias: "d", hasSensitiveValue: false },
|
|
167
|
+
timeout: { type: "string", hasSensitiveValue: false },
|
|
168
|
+
device: { type: "string", hasSensitiveValue: true },
|
|
169
|
+
availableDevices: { type: "boolean", hasSensitiveValue: false },
|
|
170
|
+
appid: { type: "string", hasSensitiveValue: true },
|
|
171
|
+
geny: { type: "string", hasSensitiveValue: true },
|
|
172
|
+
debugBrk: { type: "boolean", hasSensitiveValue: false },
|
|
173
|
+
debugPort: { type: "number", hasSensitiveValue: false },
|
|
174
|
+
start: { type: "boolean", hasSensitiveValue: false },
|
|
175
|
+
stop: { type: "boolean", hasSensitiveValue: false },
|
|
176
|
+
ddi: { type: "string", hasSensitiveValue: true },
|
|
177
|
+
justlaunch: { type: "boolean", hasSensitiveValue: false },
|
|
178
|
+
file: { type: "string", hasSensitiveValue: true },
|
|
179
|
+
force: { type: "boolean", alias: "f", hasSensitiveValue: false },
|
|
180
|
+
emulator: { type: "boolean", hasSensitiveValue: false },
|
|
181
|
+
simulator: { type: "boolean", hasSensitiveValue: false },
|
|
182
|
+
sdk: { type: "string", hasSensitiveValue: false },
|
|
183
|
+
template: { type: "string", hasSensitiveValue: true },
|
|
184
|
+
certificate: { type: "string", hasSensitiveValue: true },
|
|
185
|
+
certificatePassword: { type: "string", hasSensitiveValue: true },
|
|
190
186
|
release: {
|
|
191
|
-
type: "boolean"
|
|
187
|
+
type: "boolean",
|
|
192
188
|
alias: "r",
|
|
193
189
|
hasSensitiveValue: false,
|
|
194
190
|
},
|
|
195
|
-
markingMode: { type: "boolean"
|
|
196
|
-
var: { type: "object"
|
|
197
|
-
default: { type: "boolean"
|
|
198
|
-
count: { type: "number"
|
|
199
|
-
analyticsLogFile: { type: "string"
|
|
200
|
-
disableAnalytics: { type: "boolean"
|
|
201
|
-
cleanupLogFile: { type: "string"
|
|
191
|
+
markingMode: { type: "boolean", hasSensitiveValue: false },
|
|
192
|
+
var: { type: "object", hasSensitiveValue: true },
|
|
193
|
+
default: { type: "boolean", hasSensitiveValue: false },
|
|
194
|
+
count: { type: "number", hasSensitiveValue: false },
|
|
195
|
+
analyticsLogFile: { type: "string", hasSensitiveValue: true },
|
|
196
|
+
disableAnalytics: { type: "boolean", hasSensitiveValue: false },
|
|
197
|
+
cleanupLogFile: { type: "string", hasSensitiveValue: true },
|
|
202
198
|
hooks: {
|
|
203
|
-
type: "boolean"
|
|
199
|
+
type: "boolean",
|
|
204
200
|
default: true,
|
|
205
201
|
hasSensitiveValue: false,
|
|
206
202
|
},
|
|
207
203
|
link: {
|
|
208
|
-
type: "boolean"
|
|
204
|
+
type: "boolean",
|
|
209
205
|
default: false,
|
|
210
206
|
hasSensitiveValue: false,
|
|
211
207
|
},
|
|
212
|
-
gradlePath: { type: "string"
|
|
213
|
-
gradleArgs: { type: "string"
|
|
214
|
-
|
|
215
|
-
|
|
208
|
+
gradlePath: { type: "string", hasSensitiveValue: false },
|
|
209
|
+
gradleArgs: { type: "string", hasSensitiveValue: false },
|
|
210
|
+
nativeHost: { type: "string", hasSensitiveValue: false },
|
|
211
|
+
nativeHostModule: {
|
|
212
|
+
type: "string",
|
|
213
|
+
hasSensitiveValue: false,
|
|
214
|
+
default: constants_1.APP_FOLDER_NAME,
|
|
215
|
+
},
|
|
216
|
+
aab: { type: "boolean", hasSensitiveValue: false },
|
|
217
|
+
performance: { type: "object", hasSensitiveValue: true },
|
|
216
218
|
appleApplicationSpecificPassword: {
|
|
217
|
-
type: "string"
|
|
219
|
+
type: "string",
|
|
218
220
|
hasSensitiveValue: true,
|
|
219
221
|
},
|
|
220
|
-
appleSessionBase64: { type: "string"
|
|
221
|
-
jar: { type: "string"
|
|
222
|
-
aar: { type: "string"
|
|
223
|
-
filter: { type: "string"
|
|
222
|
+
appleSessionBase64: { type: "string", hasSensitiveValue: true },
|
|
223
|
+
jar: { type: "string", hasSensitiveValue: true },
|
|
224
|
+
aar: { type: "string", hasSensitiveValue: true },
|
|
225
|
+
filter: { type: "string", hasSensitiveValue: true },
|
|
224
226
|
git: {
|
|
225
|
-
type: "boolean"
|
|
227
|
+
type: "boolean",
|
|
226
228
|
hasSensitiveValue: false,
|
|
227
229
|
default: true,
|
|
228
230
|
},
|
|
229
|
-
dryRun: { type: "boolean"
|
|
231
|
+
dryRun: { type: "boolean", hasSensitiveValue: false },
|
|
230
232
|
};
|
|
231
233
|
}
|
|
232
234
|
get optionNames() {
|
|
@@ -244,7 +246,6 @@ class Options {
|
|
|
244
246
|
parsed[optionName] = this.getOptionValue(optionName);
|
|
245
247
|
}
|
|
246
248
|
_.each(parsed, (value, originalOptionName) => {
|
|
247
|
-
// when this.options are passed to yargs, it returns all of them and the ones that are not part of process.argv are set to undefined.
|
|
248
249
|
if (value === undefined) {
|
|
249
250
|
return;
|
|
250
251
|
}
|
|
@@ -254,14 +255,14 @@ class Options {
|
|
|
254
255
|
this.$errors.failWithHelp(`The option '${originalOptionName}' is not supported.`);
|
|
255
256
|
}
|
|
256
257
|
const optionType = this.getOptionType(optionName), optionValue = parsed[optionName];
|
|
257
|
-
if (_.isArray(optionValue) && optionType !== "array"
|
|
258
|
+
if (_.isArray(optionValue) && optionType !== "array") {
|
|
258
259
|
this.$errors.failWithHelp("The '%s' option requires a single value.", originalOptionName);
|
|
259
260
|
}
|
|
260
|
-
else if (optionType === "string"
|
|
261
|
+
else if (optionType === "string" &&
|
|
261
262
|
helpers.isNullOrWhitespace(optionValue)) {
|
|
262
263
|
this.$errors.failWithHelp("The option '%s' requires non-empty value.", originalOptionName);
|
|
263
264
|
}
|
|
264
|
-
else if (optionType === "array"
|
|
265
|
+
else if (optionType === "array" &&
|
|
265
266
|
optionValue.length === 0) {
|
|
266
267
|
this.$errors.failWithHelp(`The option '${originalOptionName}' requires one or more values, separated by a space.`);
|
|
267
268
|
}
|
|
@@ -289,16 +290,9 @@ class Options {
|
|
|
289
290
|
}
|
|
290
291
|
return true;
|
|
291
292
|
}
|
|
292
|
-
// If you pass value with dash, yargs adds it to yargs.argv in two ways:
|
|
293
|
-
// with dash and without dash, replacing first symbol after it with its toUpper equivalent
|
|
294
|
-
// ex, "$ <cli name> emulate android --profile-dir" will add profile-dir to yargs.argv as profile-dir and profileDir
|
|
295
|
-
// IMPORTANT: In your code, it is better to use the value without dashes (profileDir in the example).
|
|
296
|
-
// This way your code will work in case "$ <cli name> emulate android --profile-dir" or "$ <cli name> emulate android --profileDir" is used by user.
|
|
297
293
|
getNonDashedOptionName(optionName) {
|
|
298
294
|
const matchUpperCaseLetters = optionName.match(Options.NONDASHED_OPTION_REGEX);
|
|
299
295
|
if (matchUpperCaseLetters) {
|
|
300
|
-
// get here if option with upperCase letter is specified, for example profileDir
|
|
301
|
-
// check if in knownOptions we have its kebabCase presentation
|
|
302
296
|
const secondaryOptionName = matchUpperCaseLetters[1] +
|
|
303
297
|
matchUpperCaseLetters[2].toUpperCase() +
|
|
304
298
|
matchUpperCaseLetters[3] || "";
|
|
@@ -327,18 +321,15 @@ class Options {
|
|
|
327
321
|
const args = argv._.slice(1);
|
|
328
322
|
const commands = yok_1.injector
|
|
329
323
|
.getRegisteredCommandsNames(false)
|
|
330
|
-
.filter((c) => c != "/?");
|
|
324
|
+
.filter((c) => c != "/?");
|
|
331
325
|
const currentDepth = args.length > 0 ? args.length - 1 : 0;
|
|
332
326
|
const current = (_a = current_ !== null && current_ !== void 0 ? current_ : args[currentDepth]) !== null && _a !== void 0 ? _a : "";
|
|
333
|
-
// split all commands into their components ie. "device|list" => ["device", "list"]
|
|
334
327
|
const matchGroups = commands.map((c) => c.split("|"));
|
|
335
|
-
// find all commands that match the current depth and all the previous args
|
|
336
328
|
const possibleMatches = matchGroups.filter((group) => {
|
|
337
329
|
return group.slice(0, currentDepth).every((g, i) => {
|
|
338
330
|
return g === args[i] || args[i].at(0) === "-";
|
|
339
331
|
});
|
|
340
332
|
});
|
|
341
|
-
// filter out duplicates
|
|
342
333
|
const completions = [
|
|
343
334
|
...new Set(possibleMatches
|
|
344
335
|
.map((match) => {
|
|
@@ -346,28 +337,21 @@ class Options {
|
|
|
346
337
|
})
|
|
347
338
|
.filter(Boolean)),
|
|
348
339
|
];
|
|
349
|
-
// autocomplete long -- options
|
|
350
340
|
if (current.startsWith("--")) {
|
|
351
341
|
return this.optionNames.filter((o) => o !== "_").map((o) => `--${o}`);
|
|
352
342
|
}
|
|
353
|
-
// autocomple short - options
|
|
354
343
|
if (current.startsWith("-")) {
|
|
355
344
|
return this.shorthands.map((o) => `-${o}`);
|
|
356
345
|
}
|
|
357
|
-
// autocomplete matched completions
|
|
358
346
|
return completions;
|
|
359
347
|
}));
|
|
360
348
|
this.initialArgv = parsed.argv;
|
|
361
349
|
this.argv = parsed.options(opts).argv;
|
|
362
|
-
// For backwards compatibility
|
|
363
|
-
// Previously profileDir had a default option and calling `this.$options.profileDir` always returned valid result.
|
|
364
|
-
// Now the profileDir should be used from $settingsService, but ensure the `this.$options.profileDir` returns the same value.
|
|
365
350
|
this.$settingsService.setSettings({
|
|
366
351
|
profileDir: this.argv.profileDir,
|
|
367
352
|
});
|
|
368
353
|
this.argv.profileDir = this.argv["profile-dir"] =
|
|
369
354
|
this.$settingsService.getProfileDir();
|
|
370
|
-
// if justlaunch is set, it takes precedence over the --watch flag and the default true value
|
|
371
355
|
if (this.argv.justlaunch) {
|
|
372
356
|
this.argv.watch = false;
|
|
373
357
|
}
|
|
@@ -383,7 +367,6 @@ class Options {
|
|
|
383
367
|
if (this.argv.javascript) {
|
|
384
368
|
this.argv.js = true;
|
|
385
369
|
}
|
|
386
|
-
// alias --simulator to --emulator
|
|
387
370
|
if (this.argv.simulator) {
|
|
388
371
|
this.argv.emulator = this.argv.simulator;
|
|
389
372
|
}
|
|
@@ -408,4 +391,3 @@ Options.DASHED_OPTION_REGEX = /(.+?)([A-Z])(.*)/;
|
|
|
408
391
|
Options.NONDASHED_OPTION_REGEX = /(.+?)[-]([a-zA-Z])(.*)/;
|
|
409
392
|
exports.Options = Options;
|
|
410
393
|
yok_1.injector.register("options", Options);
|
|
411
|
-
//# sourceMappingURL=options.js.map
|
|
@@ -38,7 +38,6 @@ class PackageInstallationManager {
|
|
|
38
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
39
39
|
referenceVersion = referenceVersion || this.$staticConfig.version;
|
|
40
40
|
const isPreReleaseVersion = semver.prerelease(referenceVersion) !== null;
|
|
41
|
-
// if the user has some v.v.v-prerelease-xx.xx pre-release version, include pre-release versions in the search query.
|
|
42
41
|
const compatibleVersionRange = isPreReleaseVersion
|
|
43
42
|
? `~${referenceVersion}`
|
|
44
43
|
: `~${semver.major(referenceVersion)}.${semver.minor(referenceVersion)}.0`;
|
|
@@ -134,14 +133,13 @@ class PackageInstallationManager {
|
|
|
134
133
|
getInspectorFromCache(inspectorNpmPackageName, projectDir) {
|
|
135
134
|
return __awaiter(this, void 0, void 0, function* () {
|
|
136
135
|
const inspectorPath = path.join(projectDir, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);
|
|
137
|
-
// local installation takes precedence over cache
|
|
138
136
|
if (this.inspectorAlreadyInstalled(inspectorPath)) {
|
|
139
137
|
return inspectorPath;
|
|
140
138
|
}
|
|
141
139
|
const cachePath = this.getInspectorCachePath();
|
|
142
140
|
this.prepareCacheDir(cachePath);
|
|
143
141
|
const pathToPackageInCache = path.join(cachePath, constants.NODE_MODULES_FOLDER_NAME, inspectorNpmPackageName);
|
|
144
|
-
const iOSFrameworkNSValue = this.$projectDataService.getRuntimePackage(projectDir, "ios"
|
|
142
|
+
const iOSFrameworkNSValue = this.$projectDataService.getRuntimePackage(projectDir, "ios");
|
|
145
143
|
const version = yield this.getLatestCompatibleVersion(inspectorNpmPackageName, iOSFrameworkNSValue.version);
|
|
146
144
|
let shouldInstall = !this.$fs.exists(pathToPackageInCache);
|
|
147
145
|
if (!shouldInstall) {
|
|
@@ -207,10 +205,6 @@ class PackageInstallationManager {
|
|
|
207
205
|
return yield this.$packageManager.install(packageName, pathToSave, npmOptions);
|
|
208
206
|
});
|
|
209
207
|
}
|
|
210
|
-
/**
|
|
211
|
-
* This function must not be used with packageName being a URL or local file,
|
|
212
|
-
* because npm view doens't work with those
|
|
213
|
-
*/
|
|
214
208
|
getVersion(packageName, version) {
|
|
215
209
|
var _a;
|
|
216
210
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -225,4 +219,3 @@ class PackageInstallationManager {
|
|
|
225
219
|
}
|
|
226
220
|
exports.PackageInstallationManager = PackageInstallationManager;
|
|
227
221
|
yok_1.injector.register("packageInstallationManager", PackageInstallationManager);
|
|
228
|
-
//# sourceMappingURL=package-installation-manager.js.map
|
package/lib/package-manager.js
CHANGED
|
@@ -114,7 +114,6 @@ class PackageManager {
|
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
116
|
catch (err) {
|
|
117
|
-
// ignore error, but log info
|
|
118
117
|
this.$logger.trace("Tried to read cli.packageManager from project config and failed. Error is: ", err);
|
|
119
118
|
}
|
|
120
119
|
if (pm === constants_1.PackageManagers.yarn || this.$options.yarn) {
|
|
@@ -183,4 +182,3 @@ __decorate([
|
|
|
183
182
|
], PackageManager.prototype, "getCachePath", null);
|
|
184
183
|
exports.PackageManager = PackageManager;
|
|
185
184
|
yok_1.injector.register("packageManager", PackageManager);
|
|
186
|
-
//# sourceMappingURL=package-manager.js.map
|
|
@@ -34,14 +34,13 @@ class PnpmPackageManager extends base_package_manager_1.BasePackageManager {
|
|
|
34
34
|
if (config.disableNpmInstall) {
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
|
-
delete config.dev;
|
|
37
|
+
delete config.dev;
|
|
38
38
|
if (config.ignoreScripts) {
|
|
39
39
|
config["ignore-scripts"] = true;
|
|
40
40
|
}
|
|
41
41
|
const packageJsonPath = path.join(pathToSave, "package.json");
|
|
42
42
|
const jsonContentBefore = this.$fs.readJson(packageJsonPath);
|
|
43
43
|
const flags = this.getFlagsString(config, true);
|
|
44
|
-
// With pnpm we need to install as "flat" or some imports wont be found
|
|
45
44
|
let params = ["i", "--shamefully-hoist"];
|
|
46
45
|
const isInstallingAllDependencies = packageName === pathToSave;
|
|
47
46
|
if (!isInstallingAllDependencies) {
|
|
@@ -60,7 +59,6 @@ class PnpmPackageManager extends base_package_manager_1.BasePackageManager {
|
|
|
60
59
|
});
|
|
61
60
|
}
|
|
62
61
|
uninstall(packageName, config, cwd) {
|
|
63
|
-
// pnpm does not want save option in remove. It saves it by default
|
|
64
62
|
delete config["save"];
|
|
65
63
|
const flags = this.getFlagsString(config, false);
|
|
66
64
|
return this.$childProcess.exec(`pnpm remove ${packageName} ${flags}`, {
|
|
@@ -136,4 +134,3 @@ __decorate([
|
|
|
136
134
|
], PnpmPackageManager.prototype, "getCachePath", null);
|
|
137
135
|
exports.PnpmPackageManager = PnpmPackageManager;
|
|
138
136
|
yok_1.injector.register("pnpm", PnpmPackageManager);
|
|
139
|
-
//# sourceMappingURL=pnpm-package-manager.js.map
|
package/lib/project-data.js
CHANGED
|
@@ -19,7 +19,6 @@ class ProjectData {
|
|
|
19
19
|
this.warnProjectId();
|
|
20
20
|
return this.projectIdentifiers.ios;
|
|
21
21
|
}
|
|
22
|
-
//just in case hook/extension modifies it.
|
|
23
22
|
set projectId(identifier) {
|
|
24
23
|
this.warnProjectId();
|
|
25
24
|
this.projectIdentifiers.ios = identifier;
|
|
@@ -45,7 +44,6 @@ class ProjectData {
|
|
|
45
44
|
return;
|
|
46
45
|
}
|
|
47
46
|
projectDir = projectDir || this.$projectHelper.projectDir;
|
|
48
|
-
// If no project found, projectDir should be null
|
|
49
47
|
if (projectDir) {
|
|
50
48
|
const projectFilePath = this.getProjectFilePath(projectDir);
|
|
51
49
|
if (this.$fs.exists(projectFilePath)) {
|
|
@@ -109,7 +107,6 @@ class ProjectData {
|
|
|
109
107
|
errorInvalidProject(projectDir) {
|
|
110
108
|
const currentDir = path.resolve(".");
|
|
111
109
|
this.$logger.trace(`Unable to find project. projectDir: ${projectDir}, options.path: ${this.$options.path}, ${currentDir}`);
|
|
112
|
-
// This is the case when no project file found
|
|
113
110
|
this.$errors.fail("No project found at or above '%s' and neither was a --path specified.", projectDir || this.$options.path || currentDir);
|
|
114
111
|
}
|
|
115
112
|
getProjectFilePath(projectDir) {
|
|
@@ -125,10 +122,6 @@ class ProjectData {
|
|
|
125
122
|
return this.nsConfig[constants.CONFIG_NS_APP_RESOURCES_ENTRY];
|
|
126
123
|
}
|
|
127
124
|
return constants.APP_RESOURCES_FOLDER_NAME;
|
|
128
|
-
// return path.join(
|
|
129
|
-
// this.getAppDirectoryRelativePath(),
|
|
130
|
-
// constants.APP_RESOURCES_FOLDER_NAME
|
|
131
|
-
// );
|
|
132
125
|
}
|
|
133
126
|
getAppDirectoryPath(projectDir) {
|
|
134
127
|
const appRelativePath = this.getAppDirectoryRelativePath();
|
|
@@ -142,7 +135,6 @@ class ProjectData {
|
|
|
142
135
|
return constants.SRC_DIR;
|
|
143
136
|
}
|
|
144
137
|
else {
|
|
145
|
-
// legacy project setup often uses app folder
|
|
146
138
|
return constants.APP_FOLDER_NAME;
|
|
147
139
|
}
|
|
148
140
|
}
|
|
@@ -199,9 +191,6 @@ class ProjectData {
|
|
|
199
191
|
this.$logger.warn("[WARNING]: IProjectData.projectId is deprecated. Please use IProjectData.projectIdentifiers[platform].");
|
|
200
192
|
}
|
|
201
193
|
}
|
|
202
|
-
/**
|
|
203
|
-
* NOTE: Order of the elements is important as the TypeScript dependencies are commonly included in Angular project as well.
|
|
204
|
-
*/
|
|
205
194
|
ProjectData.PROJECT_TYPES = [
|
|
206
195
|
{
|
|
207
196
|
type: constants.ProjectTypes.JsFlavorName,
|
|
@@ -240,4 +229,3 @@ __decorate([
|
|
|
240
229
|
], ProjectData.prototype, "warnProjectId", null);
|
|
241
230
|
exports.ProjectData = ProjectData;
|
|
242
231
|
yok_1.injector.register("projectData", ProjectData, true);
|
|
243
|
-
//# sourceMappingURL=project-data.js.map
|
|
@@ -23,7 +23,7 @@ class ProjectFilesProvider extends project_files_provider_base_1.ProjectFilesPro
|
|
|
23
23
|
}
|
|
24
24
|
else {
|
|
25
25
|
relativePath = path.relative(projectData.appDirectoryPath, parsedFilePath);
|
|
26
|
-
mappedFilePath = path.join(platformData.appDestinationDirectoryPath,
|
|
26
|
+
mappedFilePath = path.join(platformData.appDestinationDirectoryPath, this.$options.nativeHostModule, relativePath);
|
|
27
27
|
}
|
|
28
28
|
const appResourcesDirectoryPath = projectData.appResourcesDirectoryPath;
|
|
29
29
|
const platformSpecificAppResourcesDirectoryPath = path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName);
|
|
@@ -44,4 +44,3 @@ class ProjectFilesProvider extends project_files_provider_base_1.ProjectFilesPro
|
|
|
44
44
|
ProjectFilesProvider.INTERNAL_NONPROJECT_FILES = ["**/*.ts"];
|
|
45
45
|
exports.ProjectFilesProvider = ProjectFilesProvider;
|
|
46
46
|
yok_1.injector.register("projectFilesProvider", ProjectFilesProvider);
|
|
47
|
-
//# sourceMappingURL=project-files-provider.js.map
|