nativescript 8.7.0-rc.0 → 8.7.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/lib/android-tools-info.js +12 -0
- package/lib/base-package-manager.js +7 -0
- package/lib/bootstrap.js +7 -1
- package/lib/color.js +3 -0
- package/lib/commands/add-platform.js +1 -0
- package/lib/commands/apple-login.js +1 -0
- package/lib/commands/appstore-list.js +1 -0
- package/lib/commands/appstore-upload.js +4 -0
- package/lib/commands/build.js +20 -3
- package/lib/commands/clean.js +22 -1
- package/lib/commands/command-base.js +1 -0
- package/lib/commands/config.js +3 -0
- package/lib/commands/create-project.js +34 -19
- package/lib/commands/debug.js +6 -1
- package/lib/commands/deploy.js +3 -2
- package/lib/commands/extensibility/install-extension.js +1 -0
- package/lib/commands/extensibility/list-extensions.js +1 -0
- package/lib/commands/extensibility/uninstall-extension.js +1 -0
- package/lib/commands/fonts.js +1 -0
- package/lib/commands/generate-assets.js +1 -0
- package/lib/commands/generate-help.js +1 -0
- package/lib/commands/generate.js +12 -2
- package/lib/commands/info.js +1 -0
- package/lib/commands/install.js +1 -0
- package/lib/commands/list-platforms.js +1 -0
- package/lib/commands/migrate.js +1 -0
- package/lib/commands/platform-clean.js +1 -0
- package/lib/commands/plugin/add-plugin.js +1 -0
- package/lib/commands/plugin/build-plugin.js +1 -0
- package/lib/commands/plugin/create-plugin.js +5 -0
- package/lib/commands/plugin/list-plugins.js +1 -0
- package/lib/commands/plugin/remove-plugin.js +2 -0
- package/lib/commands/plugin/update-plugin.js +1 -0
- package/lib/commands/post-install.js +6 -0
- package/lib/commands/prepare.js +3 -2
- package/lib/commands/preview.js +2 -0
- package/lib/commands/remove-platform.js +1 -0
- package/lib/commands/resources/resources-update.js +2 -0
- package/lib/commands/run.js +1 -0
- package/lib/commands/setup.js +1 -0
- package/lib/commands/start.js +1 -0
- package/lib/commands/test-init.js +4 -0
- package/lib/commands/test.js +9 -2
- package/lib/commands/typings.js +1 -0
- package/lib/commands/update-platform.js +5 -0
- package/lib/commands/update.js +2 -0
- package/lib/common/bootstrap.js +1 -0
- package/lib/common/child-process.js +3 -0
- package/lib/common/codeGeneration/code-entity.js +1 -0
- package/lib/common/codeGeneration/code-printer.js +1 -0
- package/lib/common/command-params.js +1 -0
- package/lib/common/commands/analytics.js +3 -0
- package/lib/common/commands/autocompletion.js +3 -0
- package/lib/common/commands/device/device-log-stream.js +1 -0
- package/lib/common/commands/device/get-file.js +2 -0
- package/lib/common/commands/device/list-applications.js +1 -0
- package/lib/common/commands/device/list-devices.js +3 -0
- package/lib/common/commands/device/list-files.js +2 -0
- package/lib/common/commands/device/put-file.js +2 -0
- package/lib/common/commands/device/run-application.js +1 -0
- package/lib/common/commands/device/stop-application.js +1 -0
- package/lib/common/commands/device/uninstall-application.js +1 -0
- package/lib/common/commands/doctor.js +3 -2
- package/lib/common/commands/generate-messages.js +1 -0
- package/lib/common/commands/help.js +1 -0
- package/lib/common/commands/package-manager-get.js +1 -0
- package/lib/common/commands/package-manager-set.js +1 -0
- package/lib/common/commands/post-install.js +1 -0
- package/lib/common/commands/preuninstall.js +11 -2
- package/lib/common/commands/proxy/proxy-base.js +4 -0
- package/lib/common/commands/proxy/proxy-clear.js +1 -0
- package/lib/common/commands/proxy/proxy-get.js +1 -0
- package/lib/common/commands/proxy/proxy-set.js +1 -0
- package/lib/common/common-lib.js +1 -0
- package/lib/common/constants.js +11 -0
- package/lib/common/decorators.js +48 -0
- package/lib/common/definitions/mobile.d.ts +1 -1
- package/lib/common/dispatchers.js +10 -1
- package/lib/common/errors.js +13 -3
- package/lib/common/file-system.js +13 -2
- package/lib/common/header.js +3 -0
- package/lib/common/helpers.js +89 -3
- package/lib/common/host-info.js +4 -0
- package/lib/common/http-client.js +20 -0
- package/lib/common/logger/appenders/cli-appender.js +4 -0
- package/lib/common/logger/appenders/emit-appender.js +4 -0
- package/lib/common/logger/layouts/cli-layout.js +1 -0
- package/lib/common/logger/logger.js +5 -0
- package/lib/common/messages/messages.js +6 -0
- package/lib/common/mobile/android/android-application-manager.js +20 -1
- package/lib/common/mobile/android/android-debug-bridge-result-handler.js +1 -0
- package/lib/common/mobile/android/android-debug-bridge.js +6 -0
- package/lib/common/mobile/android/android-device-file-system.js +4 -0
- package/lib/common/mobile/android/android-device-hash-service.js +3 -0
- package/lib/common/mobile/android/android-device.js +8 -0
- package/lib/common/mobile/android/android-emulator-services.js +2 -1
- package/lib/common/mobile/android/android-ini-file-parser.js +9 -0
- package/lib/common/mobile/android/android-log-filter.js +4 -0
- package/lib/common/mobile/android/android-virtual-device-service.js +26 -0
- package/lib/common/mobile/android/device-android-debug-bridge.js +1 -0
- package/lib/common/mobile/android/genymotion/genymotion-service.js +5 -0
- package/lib/common/mobile/android/genymotion/virtualbox-service.js +11 -0
- package/lib/common/mobile/android/logcat-helper.js +20 -1
- package/lib/common/mobile/application-manager-base.js +6 -0
- package/lib/common/mobile/device-emitter.js +4 -0
- package/lib/common/mobile/device-log-emitter.js +1 -0
- package/lib/common/mobile/device-log-provider-base.js +1 -0
- package/lib/common/mobile/device-log-provider.js +23 -0
- package/lib/common/mobile/device-platforms-constants.js +1 -0
- package/lib/common/mobile/emulator-helper.js +3 -0
- package/lib/common/mobile/ios/device/ios-application-manager.js +3 -0
- package/lib/common/mobile/ios/device/ios-device-file-system.js +1 -0
- package/lib/common/mobile/ios/device/ios-device-operations.js +4 -0
- package/lib/common/mobile/ios/device/ios-device.js +4 -0
- package/lib/common/mobile/ios/ios-device-base.js +1 -0
- package/lib/common/mobile/ios/ios-device-product-name-mapper.js +2 -0
- package/lib/common/mobile/ios/ios-log-filter.js +1 -0
- package/lib/common/mobile/ios/simulator/ios-emulator-services.js +4 -0
- package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +1 -0
- package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +6 -0
- package/lib/common/mobile/ios/simulator/ios-simulator-device.js +5 -0
- package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +1 -0
- package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +1 -0
- package/lib/common/mobile/local-to-device-path-data-factory.js +1 -0
- package/lib/common/mobile/log-filter.js +2 -0
- package/lib/common/mobile/logging-levels.js +1 -0
- package/lib/common/mobile/mobile-core/android-device-discovery.js +2 -0
- package/lib/common/mobile/mobile-core/android-emulator-discovery.js +3 -0
- package/lib/common/mobile/mobile-core/android-process-service.js +32 -0
- package/lib/common/mobile/mobile-core/device-discovery.js +1 -0
- package/lib/common/mobile/mobile-core/devices-service.js +72 -3
- package/lib/common/mobile/mobile-core/ios-device-discovery.js +3 -1
- package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +3 -0
- package/lib/common/mobile/mobile-helper.js +2 -1
- package/lib/common/mobile/wp8/wp8-emulator-services.js +1 -0
- package/lib/common/opener.js +1 -0
- package/lib/common/os-info.js +1 -0
- package/lib/common/plist-parser.js +1 -0
- package/lib/common/project-helper.js +1 -0
- package/lib/common/prompter.js +9 -1
- package/lib/common/queue.js +1 -0
- package/lib/common/resource-loader.js +1 -0
- package/lib/common/services/auto-completion-service.js +12 -1
- package/lib/common/services/cancellation.js +2 -1
- package/lib/common/services/commands-service.js +17 -6
- package/lib/common/services/help-service.js +11 -3
- package/lib/common/services/hooks-service.js +13 -0
- package/lib/common/services/ios-notification-service.js +1 -0
- package/lib/common/services/json-file-settings-service.js +6 -0
- package/lib/common/services/lock-service.js +6 -0
- package/lib/common/services/message-contract-generator.js +1 -0
- package/lib/common/services/messages-service.js +1 -0
- package/lib/common/services/micro-templating-service.js +6 -0
- package/lib/common/services/net-service.js +3 -0
- package/lib/common/services/project-files-manager.js +5 -0
- package/lib/common/services/project-files-provider-base.js +1 -0
- package/lib/common/services/proxy-service.js +1 -0
- package/lib/common/services/qr.js +1 -0
- package/lib/common/services/settings-service.js +1 -0
- package/lib/common/services/xcode-select-service.js +1 -0
- package/lib/common/utils.js +1 -0
- package/lib/common/validators/project-name-validator.js +1 -0
- package/lib/common/validators/validation-result.js +1 -0
- package/lib/common/verify-node-version.js +8 -1
- package/lib/common/yok.js +32 -11
- package/lib/config.js +22 -1
- package/lib/constants-provider.js +1 -0
- package/lib/constants.js +58 -5
- package/lib/controllers/build-controller.js +4 -3
- package/lib/controllers/debug-controller.js +8 -3
- package/lib/controllers/deploy-controller.js +1 -0
- package/lib/controllers/migrate-controller.js +91 -3
- package/lib/controllers/platform-controller.js +9 -1
- package/lib/controllers/prepare-controller.js +15 -5
- package/lib/controllers/run-controller.js +17 -1
- package/lib/controllers/update-controller-base.js +1 -0
- package/lib/controllers/update-controller.js +11 -0
- package/lib/data/build-data.js +1 -0
- package/lib/data/controller-data-base.js +1 -0
- package/lib/data/debug-data.js +1 -0
- package/lib/data/platform-data.js +1 -0
- package/lib/data/prepare-data.js +1 -0
- package/lib/data/run-data.js +1 -0
- package/lib/detached-processes/cleanup-js-subprocess.js +8 -2
- package/lib/detached-processes/cleanup-process.js +18 -14
- package/lib/detached-processes/file-log-service.js +2 -1
- package/lib/device-path-provider.js +3 -2
- package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +7 -0
- package/lib/device-sockets/ios/notification.js +3 -0
- package/lib/device-sockets/ios/socket-request-executor.js +3 -0
- package/lib/helpers/android-bundle-validator-helper.js +2 -1
- package/lib/helpers/deploy-command-helper.js +1 -0
- package/lib/helpers/key-command-helper.js +4 -2
- package/lib/helpers/livesync-command-helper.js +5 -2
- package/lib/helpers/network-connectivity-validator.js +1 -0
- package/lib/helpers/options-track-helper.js +3 -2
- package/lib/helpers/package-path-helper.js +1 -0
- package/lib/helpers/platform-command-helper.js +7 -2
- package/lib/helpers/version-validator-helper.js +1 -0
- package/lib/key-commands/bootstrap.js +3 -2
- package/lib/key-commands/index.js +5 -4
- package/lib/nativescript-cli-lib-bootstrap.js +4 -0
- package/lib/nativescript-cli-lib.js +1 -0
- package/lib/nativescript-cli.js +10 -1
- package/lib/node/pbxproj-dom-xcode.js +1 -0
- package/lib/node/xcode.js +1 -0
- package/lib/node-package-manager.js +11 -1
- package/lib/options.js +141 -115
- package/lib/package-installation-manager.js +8 -1
- package/lib/package-manager.js +2 -0
- package/lib/platform-command-param.js +1 -0
- package/lib/pnpm-package-manager.js +4 -1
- package/lib/project-data.js +12 -0
- package/lib/providers/project-files-provider.js +1 -0
- package/lib/resolvers/livesync-service-resolver.js +2 -1
- package/lib/services/analytics/analytics-broker-process.js +10 -6
- package/lib/services/analytics/analytics-broker.js +2 -1
- package/lib/services/analytics/analytics-service.js +29 -25
- package/lib/services/analytics/google-analytics-provider.js +13 -12
- package/lib/services/analytics-settings-service.js +5 -0
- package/lib/services/android/android-bundle-tool-service.js +1 -0
- package/lib/services/android/gradle-build-args-service.js +3 -0
- package/lib/services/android/gradle-build-service.js +1 -0
- package/lib/services/android/gradle-command-service.js +1 -0
- package/lib/services/android-device-debug-service.js +6 -0
- package/lib/services/android-plugin-build-service.js +28 -0
- package/lib/services/android-project-service.js +71 -4
- package/lib/services/android-resources-migration-service.js +7 -0
- package/lib/services/apple-portal/apple-portal-application-service.js +1 -0
- package/lib/services/apple-portal/apple-portal-cookie-service.js +1 -0
- package/lib/services/apple-portal/apple-portal-session-service.js +6 -4
- package/lib/services/assets-generation/assets-generation-service.js +16 -5
- package/lib/services/build-artifacts-service.js +2 -1
- package/lib/services/build-data-service.js +2 -1
- package/lib/services/build-info-file-service.js +1 -0
- package/lib/services/cleanup-service.js +13 -9
- package/lib/services/cocoapods-platform-manager.js +9 -0
- package/lib/services/cocoapods-service.js +21 -1
- package/lib/services/debug-data-service.js +1 -0
- package/lib/services/debug-service-base.js +7 -0
- package/lib/services/device/device-install-app-service.js +2 -1
- package/lib/services/doctor-service.js +21 -6
- package/lib/services/extensibility-service.js +8 -0
- package/lib/services/files-hash-service.js +1 -0
- package/lib/services/hmr-status-service.js +2 -0
- package/lib/services/info-service.js +1 -0
- package/lib/services/initialize-service.js +5 -1
- package/lib/services/ios/export-options-plist-service.js +4 -0
- package/lib/services/ios/ios-signing-service.js +4 -0
- package/lib/services/ios/spm-service.js +10 -1
- package/lib/services/ios/xcodebuild-args-service.js +13 -4
- package/lib/services/ios/xcodebuild-command-service.js +1 -0
- package/lib/services/ios/xcodebuild-service.js +1 -0
- package/lib/services/ios-debugger-port-service.js +1 -0
- package/lib/services/ios-device-debug-service.js +1 -0
- package/lib/services/ios-entitlements-service.js +1 -0
- package/lib/services/ios-extensions-service.js +1 -0
- package/lib/services/ios-log-filter.js +20 -0
- package/lib/services/ios-native-target-service.js +6 -4
- package/lib/services/ios-project-service.js +29 -7
- package/lib/services/ios-provision-service.js +3 -0
- package/lib/services/ios-watch-app-service.js +1 -0
- package/lib/services/ip-service.js +2 -0
- package/lib/services/itmstransporter-service.js +1 -0
- package/lib/services/karma-execution.js +2 -0
- package/lib/services/livesync/android-device-livesync-service-base.js +1 -0
- package/lib/services/livesync/android-device-livesync-service.js +2 -0
- package/lib/services/livesync/android-device-livesync-sockets-service.js +3 -0
- package/lib/services/livesync/android-livesync-service.js +1 -0
- package/lib/services/livesync/android-livesync-tool.js +4 -0
- package/lib/services/livesync/device-livesync-service-base.js +2 -0
- package/lib/services/livesync/ios-device-livesync-service.js +7 -0
- package/lib/services/livesync/ios-livesync-service.js +2 -0
- package/lib/services/livesync/livesync-socket.js +1 -0
- package/lib/services/livesync/platform-livesync-service-base.js +5 -0
- package/lib/services/livesync-process-data-service.js +1 -0
- package/lib/services/log-parser-service.js +1 -0
- package/lib/services/log-source-map-service.js +15 -0
- package/lib/services/marking-mode-service.js +8 -5
- package/lib/services/metadata-filtering-service.js +1 -0
- package/lib/services/npm-config-service.js +4 -0
- package/lib/services/pacote-service.js +7 -0
- package/lib/services/performance-service.js +3 -1
- package/lib/services/platform/add-platform-service.js +47 -2
- package/lib/services/platform/platform-validation-service.js +1 -0
- package/lib/services/platform/prepare-native-platform-service.js +5 -2
- package/lib/services/platform-environment-requirements.js +8 -3
- package/lib/services/platform-project-service-base.js +1 -0
- package/lib/services/platforms-data-service.js +1 -0
- package/lib/services/plugins-service.js +18 -2
- package/lib/services/prepare-data-service.js +2 -1
- package/lib/services/project-backup-service.js +4 -0
- package/lib/services/project-changes-service.js +12 -3
- package/lib/services/project-cleanup-service.js +2 -0
- package/lib/services/project-config-service.js +18 -1
- package/lib/services/project-data-service.js +36 -7
- package/lib/services/project-name-service.js +1 -0
- package/lib/services/project-service.js +10 -0
- package/lib/services/project-templates-service.js +3 -2
- package/lib/services/qr-code-terminal-service.js +1 -0
- package/lib/services/require-service.js +1 -0
- package/lib/services/start-service.js +1 -0
- package/lib/services/temp-service.js +1 -0
- package/lib/services/terminal-spinner-service.js +2 -0
- package/lib/services/test-execution-service.js +9 -2
- package/lib/services/test-initialization-service.js +4 -0
- package/lib/services/timeline-profiler-service.js +1 -0
- package/lib/services/user-settings-service.js +1 -0
- package/lib/services/versions-service.js +6 -4
- package/lib/services/watch-ignore-list-service.js +1 -0
- package/lib/services/webpack/webpack-compiler-service.js +42 -1
- package/lib/services/xcconfig-service.js +2 -0
- package/lib/services/xcproj-service.js +1 -0
- package/lib/shared-event-bus.js +6 -0
- package/lib/sys-info.js +2 -1
- package/lib/tools/config-manipulation/config-transformer.js +12 -0
- package/lib/tools/node-modules/node-modules-builder.js +1 -0
- package/lib/tools/node-modules/node-modules-dependencies-builder.js +6 -0
- package/lib/yarn-package-manager.js +1 -0
- package/lib/yarn2-package-manager.js +3 -0
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/CHANGELOG.md +15 -0
- package/node_modules/rimraf/CHANGELOG.md +65 -0
- package/node_modules/stringify-package/CHANGELOG.md +16 -0
- package/package.json +1 -1
|
@@ -9,6 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
// NOTE: This file is used to track data in a separate process.
|
|
13
|
+
// The instances here are not shared with the ones in main CLI process.
|
|
12
14
|
const fs = require("fs");
|
|
13
15
|
const analytics_broker_1 = require("./analytics-broker");
|
|
14
16
|
const file_log_service_1 = require("../../detached-processes/file-log-service");
|
|
@@ -18,6 +20,7 @@ if (!pathToBootstrap || !fs.existsSync(pathToBootstrap)) {
|
|
|
18
20
|
throw new Error("Invalid path to bootstrap.");
|
|
19
21
|
}
|
|
20
22
|
const logFile = process.argv[3];
|
|
23
|
+
// After requiring the bootstrap we can use $injector
|
|
21
24
|
require(pathToBootstrap);
|
|
22
25
|
const analyticsLoggingService = yok_1.injector.resolve(file_log_service_1.FileLogService, { logFile });
|
|
23
26
|
analyticsLoggingService.logData({ message: "Initializing AnalyticsBroker." });
|
|
@@ -47,15 +50,15 @@ process.on("message", (data) => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
47
50
|
analyticsLoggingService.logData({
|
|
48
51
|
message: `analytics-broker-process received message of type: ${JSON.stringify(data)}`,
|
|
49
52
|
});
|
|
50
|
-
if (data.type === "FinishTracking") {
|
|
53
|
+
if (data.type === "FinishTracking" /* TrackingTypes.FinishTracking */) {
|
|
51
54
|
yield finishTracking();
|
|
52
55
|
if (process.connected) {
|
|
53
56
|
analyticsLoggingService.logData({
|
|
54
|
-
message: `analytics-broker-process will send ${"ProcessFinishedTasks"} message`,
|
|
57
|
+
message: `analytics-broker-process will send ${"ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */} message`,
|
|
55
58
|
});
|
|
56
|
-
process.send("ProcessFinishedTasks"
|
|
59
|
+
process.send("ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */, () => {
|
|
57
60
|
analyticsLoggingService.logData({
|
|
58
|
-
message: `analytics-broker-process sent ${"ProcessFinishedTasks"} message and will exit gracefully now`,
|
|
61
|
+
message: `analytics-broker-process sent ${"ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */} message and will exit gracefully now`,
|
|
59
62
|
});
|
|
60
63
|
killCurrentProcessGracefully();
|
|
61
64
|
});
|
|
@@ -72,6 +75,7 @@ process.on("disconnect", () => __awaiter(void 0, void 0, void 0, function* () {
|
|
|
72
75
|
killCurrentProcessGracefully();
|
|
73
76
|
}));
|
|
74
77
|
analyticsLoggingService.logData({
|
|
75
|
-
message: `analytics-broker-process will send ${"ProcessReadyToReceive"} message`,
|
|
78
|
+
message: `analytics-broker-process will send ${"ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */} message`,
|
|
76
79
|
});
|
|
77
|
-
process.send("ProcessReadyToReceive");
|
|
80
|
+
process.send("ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */);
|
|
81
|
+
//# sourceMappingURL=analytics-broker-process.js.map
|
|
@@ -41,7 +41,7 @@ class AnalyticsBroker {
|
|
|
41
41
|
catch (err) {
|
|
42
42
|
this.analyticsLoggingService.logData({
|
|
43
43
|
message: `AnalyticsBroker unable to execute action in sendDataForTracking: ${err}`,
|
|
44
|
-
type: "Error"
|
|
44
|
+
type: "Error" /* FileLogMessageType.Error */,
|
|
45
45
|
});
|
|
46
46
|
}
|
|
47
47
|
});
|
|
@@ -51,3 +51,4 @@ __decorate([
|
|
|
51
51
|
(0, decorators_1.cache)()
|
|
52
52
|
], AnalyticsBroker.prototype, "getGoogleAnalyticsProvider", null);
|
|
53
53
|
exports.AnalyticsBroker = AnalyticsBroker;
|
|
54
|
+
//# sourceMappingURL=analytics-broker.js.map
|
|
@@ -44,7 +44,7 @@ class AnalyticsService {
|
|
|
44
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
45
|
if (yield this.$analyticsSettingsService.canDoRequest()) {
|
|
46
46
|
const initialTrackFeatureUsageStatus = yield this.getStatus(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME);
|
|
47
|
-
let trackFeatureUsage = initialTrackFeatureUsageStatus === "enabled"
|
|
47
|
+
let trackFeatureUsage = initialTrackFeatureUsageStatus === "enabled" /* AnalyticsStatus.enabled */;
|
|
48
48
|
if ((yield this.isNotConfirmed(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME)) &&
|
|
49
49
|
(0, helpers_1.isInteractive)()) {
|
|
50
50
|
const message = `Do you want to help us improve ${this.$analyticsSettingsService.getClientName()} by automatically sending anonymous usage statistics? We will not use this information to identify or contact you.`;
|
|
@@ -65,15 +65,15 @@ class AnalyticsService {
|
|
|
65
65
|
setStatus(settingName, enabled) {
|
|
66
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
67
67
|
this.analyticsStatuses[settingName] = enabled
|
|
68
|
-
? "enabled"
|
|
69
|
-
: "disabled"
|
|
68
|
+
? "enabled" /* AnalyticsStatus.enabled */
|
|
69
|
+
: "disabled" /* AnalyticsStatus.disabled */;
|
|
70
70
|
yield this.$userSettingsService.saveSetting(settingName, enabled.toString());
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
isEnabled(settingName) {
|
|
74
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
75
|
const analyticsStatus = yield this.getStatus(settingName);
|
|
76
|
-
return analyticsStatus === "enabled"
|
|
76
|
+
return analyticsStatus === "enabled" /* AnalyticsStatus.enabled */;
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
79
|
getStatusMessage(settingName, jsonFormat, readableSettingName) {
|
|
@@ -86,8 +86,8 @@ class AnalyticsService {
|
|
|
86
86
|
return __awaiter(this, void 0, void 0, function* () {
|
|
87
87
|
const acceptTracking = !!(settings && settings.acceptTrackFeatureUsage);
|
|
88
88
|
const googleAnalyticsEventData = {
|
|
89
|
-
googleAnalyticsDataType: "event"
|
|
90
|
-
action: "Accept Tracking"
|
|
89
|
+
googleAnalyticsDataType: "event" /* GoogleAnalyticsDataType.Event */,
|
|
90
|
+
action: "Accept Tracking" /* TrackActionNames.AcceptTracking */,
|
|
91
91
|
label: acceptTracking.toString(),
|
|
92
92
|
};
|
|
93
93
|
yield this.forcefullyTrackInGoogleAnalytics(googleAnalyticsEventData);
|
|
@@ -97,7 +97,7 @@ class AnalyticsService {
|
|
|
97
97
|
return __awaiter(this, void 0, void 0, function* () {
|
|
98
98
|
yield this.initAnalyticsStatuses();
|
|
99
99
|
if (!this.$staticConfig.disableAnalytics &&
|
|
100
|
-
this.analyticsStatuses[this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME] === "enabled") {
|
|
100
|
+
this.analyticsStatuses[this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME] === "enabled" /* AnalyticsStatus.enabled */) {
|
|
101
101
|
return this.forcefullyTrackInGoogleAnalytics(gaSettings);
|
|
102
102
|
}
|
|
103
103
|
});
|
|
@@ -112,6 +112,8 @@ class AnalyticsService {
|
|
|
112
112
|
const isForDevice = device ? !device.isEmulator : data.isForDevice;
|
|
113
113
|
let label = "";
|
|
114
114
|
label = this.addDataToLabel(label, normalizedPlatform);
|
|
115
|
+
// In some cases (like in case action is Build and platform is Android), we do not know if the deviceType is emulator or device.
|
|
116
|
+
// Just exclude the device_type in this case.
|
|
115
117
|
if (isForDevice !== null && isForDevice !== undefined) {
|
|
116
118
|
const deviceType = isForDevice
|
|
117
119
|
? constants_1.DeviceTypes.Device
|
|
@@ -129,7 +131,7 @@ class AnalyticsService {
|
|
|
129
131
|
const customDimensions = {};
|
|
130
132
|
this.setProjectRelatedCustomDimensions(customDimensions, data.projectDir);
|
|
131
133
|
const googleAnalyticsEventData = {
|
|
132
|
-
googleAnalyticsDataType: "event"
|
|
134
|
+
googleAnalyticsDataType: "event" /* GoogleAnalyticsDataType.Event */,
|
|
133
135
|
action: data.action,
|
|
134
136
|
label,
|
|
135
137
|
customDimensions,
|
|
@@ -144,7 +146,7 @@ class AnalyticsService {
|
|
|
144
146
|
if (this.brokerProcess && this.brokerProcess.connected) {
|
|
145
147
|
let timer;
|
|
146
148
|
const handler = (data) => {
|
|
147
|
-
if (data === "ProcessFinishedTasks") {
|
|
149
|
+
if (data === "ProcessFinishedTasks" /* DetachedProcessMessages.ProcessFinishedTasks */) {
|
|
148
150
|
this.brokerProcess.removeListener("message", handler);
|
|
149
151
|
clearTimeout(timer);
|
|
150
152
|
resolve();
|
|
@@ -155,7 +157,7 @@ class AnalyticsService {
|
|
|
155
157
|
resolve();
|
|
156
158
|
}, 3000);
|
|
157
159
|
this.brokerProcess.on("message", handler);
|
|
158
|
-
const msg = { type: "FinishTracking" };
|
|
160
|
+
const msg = { type: "FinishTracking" /* TrackingTypes.FinishTracking */ };
|
|
159
161
|
this.brokerProcess.send(msg, (err) => this.$logger.trace(`Error while sending ${JSON.stringify(msg)}`));
|
|
160
162
|
}
|
|
161
163
|
else {
|
|
@@ -166,13 +168,13 @@ class AnalyticsService {
|
|
|
166
168
|
}
|
|
167
169
|
forcefullyTrackInGoogleAnalytics(gaSettings) {
|
|
168
170
|
gaSettings.customDimensions = gaSettings.customDimensions || {};
|
|
169
|
-
gaSettings.customDimensions["cd5"] =
|
|
171
|
+
gaSettings.customDimensions["cd5" /* GoogleAnalyticsCustomDimensions.client */] =
|
|
170
172
|
this.$options.analyticsClient ||
|
|
171
|
-
((0, helpers_1.isInteractive)() ? "CLI" : "Unknown");
|
|
173
|
+
((0, helpers_1.isInteractive)() ? "CLI" /* AnalyticsClients.Cli */ : "Unknown" /* AnalyticsClients.Unknown */);
|
|
172
174
|
this.setProjectRelatedCustomDimensions(gaSettings.customDimensions);
|
|
173
175
|
const googleAnalyticsData = _.merge({
|
|
174
|
-
type: "googleAnalyticsData"
|
|
175
|
-
category: "CLI"
|
|
176
|
+
type: "googleAnalyticsData" /* TrackingTypes.GoogleAnalyticsData */,
|
|
177
|
+
category: "CLI" /* AnalyticsClients.Cli */,
|
|
176
178
|
}, gaSettings);
|
|
177
179
|
this.$logger.trace("Will send the following information to Google Analytics:", googleAnalyticsData);
|
|
178
180
|
return this.sendMessageToBroker(googleAnalyticsData);
|
|
@@ -183,14 +185,15 @@ class AnalyticsService {
|
|
|
183
185
|
projectDir = this.$projectHelper.projectDir;
|
|
184
186
|
}
|
|
185
187
|
catch (err) {
|
|
188
|
+
// In case there's no project dir here, the above getter will fail.
|
|
186
189
|
this.$logger.trace("Unable to get the projectDir from projectHelper", err);
|
|
187
190
|
}
|
|
188
191
|
}
|
|
189
192
|
if (projectDir) {
|
|
190
193
|
const projectData = this.$projectDataService.getProjectData(projectDir);
|
|
191
|
-
customDimensions["cd2"] =
|
|
194
|
+
customDimensions["cd2" /* GoogleAnalyticsCustomDimensions.projectType */] =
|
|
192
195
|
projectData.projectType;
|
|
193
|
-
customDimensions["cd9"] = projectData.isShared.toString();
|
|
196
|
+
customDimensions["cd9" /* GoogleAnalyticsCustomDimensions.isShared */] = projectData.isShared.toString();
|
|
194
197
|
}
|
|
195
198
|
return customDimensions;
|
|
196
199
|
}
|
|
@@ -227,7 +230,7 @@ class AnalyticsService {
|
|
|
227
230
|
}
|
|
228
231
|
});
|
|
229
232
|
broker.on("message", (data) => {
|
|
230
|
-
if (data === "ProcessReadyToReceive") {
|
|
233
|
+
if (data === "ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */) {
|
|
231
234
|
clearTimeout(timeoutId);
|
|
232
235
|
if (!isSettled) {
|
|
233
236
|
isSettled = true;
|
|
@@ -252,7 +255,7 @@ class AnalyticsService {
|
|
|
252
255
|
return __awaiter(this, void 0, void 0, function* () {
|
|
253
256
|
yield this.initAnalyticsStatuses();
|
|
254
257
|
if (!this.$staticConfig.disableAnalytics &&
|
|
255
|
-
this.analyticsStatuses[settingName] === "enabled") {
|
|
258
|
+
this.analyticsStatuses[settingName] === "enabled" /* AnalyticsStatus.enabled */) {
|
|
256
259
|
return this.sendMessageToBroker(trackingInfo);
|
|
257
260
|
}
|
|
258
261
|
});
|
|
@@ -306,14 +309,14 @@ class AnalyticsService {
|
|
|
306
309
|
if (settingValue) {
|
|
307
310
|
const isEnabled = (0, helpers_1.toBoolean)(settingValue);
|
|
308
311
|
if (isEnabled) {
|
|
309
|
-
this.analyticsStatuses[settingName] = "enabled"
|
|
312
|
+
this.analyticsStatuses[settingName] = "enabled" /* AnalyticsStatus.enabled */;
|
|
310
313
|
}
|
|
311
314
|
else {
|
|
312
|
-
this.analyticsStatuses[settingName] = "disabled"
|
|
315
|
+
this.analyticsStatuses[settingName] = "disabled" /* AnalyticsStatus.disabled */;
|
|
313
316
|
}
|
|
314
317
|
}
|
|
315
318
|
else {
|
|
316
|
-
this.analyticsStatuses[settingName] = "not confirmed"
|
|
319
|
+
this.analyticsStatuses[settingName] = "not confirmed" /* AnalyticsStatus.notConfirmed */;
|
|
317
320
|
}
|
|
318
321
|
}
|
|
319
322
|
return this.analyticsStatuses[settingName];
|
|
@@ -322,7 +325,7 @@ class AnalyticsService {
|
|
|
322
325
|
isNotConfirmed(settingName) {
|
|
323
326
|
return __awaiter(this, void 0, void 0, function* () {
|
|
324
327
|
const analyticsStatus = yield this.getStatus(settingName);
|
|
325
|
-
return analyticsStatus === "not confirmed"
|
|
328
|
+
return analyticsStatus === "not confirmed" /* AnalyticsStatus.notConfirmed */;
|
|
326
329
|
});
|
|
327
330
|
}
|
|
328
331
|
getHumanReadableStatusMessage(settingName, readableSettingName) {
|
|
@@ -340,15 +343,15 @@ class AnalyticsService {
|
|
|
340
343
|
getJsonStatusMessage(settingName) {
|
|
341
344
|
return __awaiter(this, void 0, void 0, function* () {
|
|
342
345
|
const status = yield this.getStatus(settingName);
|
|
343
|
-
const enabled = status === "not confirmed"
|
|
346
|
+
const enabled = status === "not confirmed" /* AnalyticsStatus.notConfirmed */
|
|
344
347
|
? null
|
|
345
|
-
: status === "enabled"
|
|
348
|
+
: status === "enabled" /* AnalyticsStatus.enabled */;
|
|
346
349
|
return JSON.stringify({ enabled });
|
|
347
350
|
});
|
|
348
351
|
}
|
|
349
352
|
trackException(exception, message) {
|
|
350
353
|
const data = {
|
|
351
|
-
type: "exception"
|
|
354
|
+
type: "exception" /* TrackingTypes.Exception */,
|
|
352
355
|
exception,
|
|
353
356
|
message,
|
|
354
357
|
};
|
|
@@ -364,3 +367,4 @@ __decorate([
|
|
|
364
367
|
], AnalyticsService.prototype, "initAnalyticsStatuses", null);
|
|
365
368
|
exports.AnalyticsService = AnalyticsService;
|
|
366
369
|
yok_1.injector.register("analyticsService", AnalyticsService);
|
|
370
|
+
//# sourceMappingURL=analytics-service.js.map
|
|
@@ -39,7 +39,7 @@ class GoogleAnalyticsProvider {
|
|
|
39
39
|
}
|
|
40
40
|
catch (e) {
|
|
41
41
|
this.analyticsLoggingService.logData({
|
|
42
|
-
type: "Error"
|
|
42
|
+
type: "Error" /* FileLogMessageType.Error */,
|
|
43
43
|
message: `Unable to track information ${JSON.stringify(trackInfo)}. Error is: ${e}`,
|
|
44
44
|
});
|
|
45
45
|
this.$logger.trace("Analytics exception: ", e);
|
|
@@ -73,10 +73,10 @@ class GoogleAnalyticsProvider {
|
|
|
73
73
|
const visitor = this.getVisitor(gaTrackingId, proxy);
|
|
74
74
|
yield this.setCustomDimensions(visitor, trackInfo.customDimensions, sessionId);
|
|
75
75
|
switch (trackInfo.googleAnalyticsDataType) {
|
|
76
|
-
case "pageview"
|
|
76
|
+
case "pageview" /* GoogleAnalyticsDataType.Page */:
|
|
77
77
|
yield this.trackPageView(visitor, trackInfo);
|
|
78
78
|
break;
|
|
79
|
-
case "event"
|
|
79
|
+
case "event" /* GoogleAnalyticsDataType.Event */:
|
|
80
80
|
yield this.trackEvent(visitor, trackInfo);
|
|
81
81
|
break;
|
|
82
82
|
}
|
|
@@ -85,13 +85,13 @@ class GoogleAnalyticsProvider {
|
|
|
85
85
|
setCustomDimensions(visitor, customDimensions, sessionId) {
|
|
86
86
|
return __awaiter(this, void 0, void 0, function* () {
|
|
87
87
|
const defaultValues = {
|
|
88
|
-
["cd1"]: this.$staticConfig.version,
|
|
89
|
-
["cd6"]: process.version,
|
|
90
|
-
["cd3"]: this.clientId,
|
|
91
|
-
["cd2"]: null,
|
|
92
|
-
["cd9"]: null,
|
|
93
|
-
["cd4"]: sessionId,
|
|
94
|
-
["cd5"]: "Unknown"
|
|
88
|
+
["cd1" /* GoogleAnalyticsCustomDimensions.cliVersion */]: this.$staticConfig.version,
|
|
89
|
+
["cd6" /* GoogleAnalyticsCustomDimensions.nodeVersion */]: process.version,
|
|
90
|
+
["cd3" /* GoogleAnalyticsCustomDimensions.clientID */]: this.clientId,
|
|
91
|
+
["cd2" /* GoogleAnalyticsCustomDimensions.projectType */]: null,
|
|
92
|
+
["cd9" /* GoogleAnalyticsCustomDimensions.isShared */]: null,
|
|
93
|
+
["cd4" /* GoogleAnalyticsCustomDimensions.sessionID */]: sessionId,
|
|
94
|
+
["cd5" /* GoogleAnalyticsCustomDimensions.client */]: "Unknown" /* AnalyticsClients.Unknown */,
|
|
95
95
|
};
|
|
96
96
|
customDimensions = _.merge(defaultValues, customDimensions);
|
|
97
97
|
_.each(customDimensions, (value, key) => {
|
|
@@ -109,7 +109,7 @@ class GoogleAnalyticsProvider {
|
|
|
109
109
|
this.analyticsLoggingService.logData({
|
|
110
110
|
message: `Unable to track event with category: '${trackInfo.category}', action: '${trackInfo.action}', label: '${trackInfo.label}', ` +
|
|
111
111
|
`value: '${trackInfo.value}' attached page: ${this.currentPage}. Error is: ${err}.`,
|
|
112
|
-
type: "Error"
|
|
112
|
+
type: "Error" /* FileLogMessageType.Error */,
|
|
113
113
|
});
|
|
114
114
|
reject(err);
|
|
115
115
|
return;
|
|
@@ -132,7 +132,7 @@ class GoogleAnalyticsProvider {
|
|
|
132
132
|
if (err) {
|
|
133
133
|
this.analyticsLoggingService.logData({
|
|
134
134
|
message: `Unable to track pageview with path '${trackInfo.path}' and title: '${trackInfo.title}' Error is: ${err}.`,
|
|
135
|
-
type: "Error"
|
|
135
|
+
type: "Error" /* FileLogMessageType.Error */,
|
|
136
136
|
});
|
|
137
137
|
reject(err);
|
|
138
138
|
return;
|
|
@@ -150,3 +150,4 @@ __decorate([
|
|
|
150
150
|
], GoogleAnalyticsProvider.prototype, "getVisitor", null);
|
|
151
151
|
exports.GoogleAnalyticsProvider = GoogleAnalyticsProvider;
|
|
152
152
|
yok_1.injector.register("googleAnalyticsProvider", GoogleAnalyticsProvider);
|
|
153
|
+
//# sourceMappingURL=google-analytics-provider.js.map
|
|
@@ -76,6 +76,10 @@ class AnalyticsSettingsService {
|
|
|
76
76
|
return userAgent;
|
|
77
77
|
}
|
|
78
78
|
getMacOSReleaseVersion(osRelease) {
|
|
79
|
+
// https://en.wikipedia.org/wiki/Darwin_(operating_system)#Release_history
|
|
80
|
+
// Each macOS version is labeled 10.<version>, where it looks like <versions> is taken from the major version returned by os.release() (16.x.x for example) and subtracting 4 from it.
|
|
81
|
+
// So the version becomes "10.12" in this case.
|
|
82
|
+
// Could be improved by spawning `system_profiler SPSoftwareDataType` and getting the System Version line from the result.
|
|
79
83
|
const majorVersion = osRelease && _.first(osRelease.split("."));
|
|
80
84
|
return majorVersion && `10.${+majorVersion - 4}`;
|
|
81
85
|
}
|
|
@@ -102,3 +106,4 @@ __decorate([
|
|
|
102
106
|
(0, decorators_1.exported)("analyticsSettingsService")
|
|
103
107
|
], AnalyticsSettingsService.prototype, "getUserAgentString", null);
|
|
104
108
|
yok_1.injector.register("analyticsSettingsService", AnalyticsSettingsService);
|
|
109
|
+
//# sourceMappingURL=analytics-settings-service.js.map
|
|
@@ -29,6 +29,7 @@ class GradleBuildArgsService {
|
|
|
29
29
|
if (yield this.$analyticsService.isEnabled(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME)) {
|
|
30
30
|
args.push("-PgatherAnalyticsData=true");
|
|
31
31
|
}
|
|
32
|
+
// allow modifying gradle args from a `before-build-task-args` hook
|
|
32
33
|
yield this.$hooksService.executeBeforeHooks("build-task-args", {
|
|
33
34
|
hookArgs: { args },
|
|
34
35
|
});
|
|
@@ -45,6 +46,7 @@ class GradleBuildArgsService {
|
|
|
45
46
|
const toolsInfo = this.$androidToolsInfo.getToolsInfo({
|
|
46
47
|
projectDir: buildData.projectDir,
|
|
47
48
|
});
|
|
49
|
+
// ensure we initialize project data
|
|
48
50
|
this.$projectData.initializeProjectData(buildData.projectDir);
|
|
49
51
|
args.push(`-PcompileSdk=android-${toolsInfo.compileSdkVersion}`, `-PtargetSdk=${toolsInfo.targetSdkVersion}`, `-PbuildToolsVersion=${toolsInfo.buildToolsVersion}`, `-PgenerateTypings=${toolsInfo.generateTypings}`, `-PappPath=${this.$projectData.getAppDirectoryPath()}`, `-PappResourcesPath=${this.$projectData.getAppResourcesDirectoryPath()}`);
|
|
50
52
|
if (buildData.gradleArgs) {
|
|
@@ -76,3 +78,4 @@ class GradleBuildArgsService {
|
|
|
76
78
|
}
|
|
77
79
|
exports.GradleBuildArgsService = GradleBuildArgsService;
|
|
78
80
|
yok_1.injector.register("gradleBuildArgsService", GradleBuildArgsService);
|
|
81
|
+
//# sourceMappingURL=gradle-build-args-service.js.map
|
|
@@ -43,6 +43,7 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
|
|
|
43
43
|
return __awaiter(this, void 0, void 0, function* () {
|
|
44
44
|
this._packageName = debugData.applicationIdentifier;
|
|
45
45
|
const result = yield this.debugCore(debugData.applicationIdentifier, debugOptions);
|
|
46
|
+
// TODO: extract this logic outside the debug service
|
|
46
47
|
if (debugOptions.start && !debugOptions.justlaunch) {
|
|
47
48
|
const pid = yield this.$androidProcessService.getAppProcessId(this.deviceIdentifier, debugData.applicationIdentifier);
|
|
48
49
|
if (pid) {
|
|
@@ -68,6 +69,7 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
|
|
|
68
69
|
]);
|
|
69
70
|
});
|
|
70
71
|
}
|
|
72
|
+
// TODO: Remove this method and reuse logic from androidProcessService
|
|
71
73
|
getForwardedDebugPort(deviceId, packageName) {
|
|
72
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
73
75
|
let port = -1;
|
|
@@ -76,6 +78,7 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
|
|
|
76
78
|
"--list",
|
|
77
79
|
]);
|
|
78
80
|
const unixSocketName = `${packageName}-inspectorServer`;
|
|
81
|
+
//matches 123a188909e6czzc tcp:40001 localabstract:org.nativescript.testUnixSockets-debug
|
|
79
82
|
const regexp = new RegExp(`(?:${deviceId} tcp:)([\\d]+)(?= localabstract:${unixSocketName})`, "g");
|
|
80
83
|
const match = regexp.exec(forwardsResult);
|
|
81
84
|
if (match) {
|
|
@@ -92,6 +95,7 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
|
|
|
92
95
|
return port;
|
|
93
96
|
});
|
|
94
97
|
}
|
|
98
|
+
// TODO: Remove this method and reuse logic from androidProcessService
|
|
95
99
|
unixSocketForward(local, remote) {
|
|
96
100
|
return __awaiter(this, void 0, void 0, function* () {
|
|
97
101
|
yield this.device.adb.executeCommand([
|
|
@@ -123,6 +127,7 @@ class AndroidDeviceDebugService extends debug_service_base_1.DebugServiceBase {
|
|
|
123
127
|
this.$logger.info("device: " + deviceId + " debug port: " + port + "\n");
|
|
124
128
|
});
|
|
125
129
|
}
|
|
130
|
+
// TODO: extract this logic outside the debug service
|
|
126
131
|
validateRunningApp(deviceId, packageName) {
|
|
127
132
|
return __awaiter(this, void 0, void 0, function* () {
|
|
128
133
|
if (!(yield this.isAppRunning(packageName, deviceId))) {
|
|
@@ -171,3 +176,4 @@ __decorate([
|
|
|
171
176
|
], AndroidDeviceDebugService.prototype, "debugCore", null);
|
|
172
177
|
exports.AndroidDeviceDebugService = AndroidDeviceDebugService;
|
|
173
178
|
yok_1.injector.register("androidDeviceDebugService", AndroidDeviceDebugService, false);
|
|
179
|
+
//# sourceMappingURL=android-device-debug-service.js.map
|
|
@@ -63,12 +63,15 @@ class AndroidPluginBuildService {
|
|
|
63
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
64
|
let xml = yield this.getXml(oldManifestContent);
|
|
65
65
|
let packageName = defaultPackageName;
|
|
66
|
+
// if the manifest file is full-featured and declares settings inside the manifest scope
|
|
66
67
|
if (xml["manifest"]) {
|
|
67
68
|
if (xml["manifest"]["$"]["package"]) {
|
|
68
69
|
packageName = xml["manifest"]["$"]["package"];
|
|
69
70
|
}
|
|
71
|
+
// set the xml as the value to iterate over its properties
|
|
70
72
|
xml = xml["manifest"];
|
|
71
73
|
}
|
|
74
|
+
// if the manifest file doesn't have a <manifest> scope, only the first setting will be picked up
|
|
72
75
|
const newManifest = { manifest: {} };
|
|
73
76
|
for (const prop in xml) {
|
|
74
77
|
newManifest.manifest[prop] = xml[prop];
|
|
@@ -144,6 +147,14 @@ class AndroidPluginBuildService {
|
|
|
144
147
|
}
|
|
145
148
|
return result;
|
|
146
149
|
}
|
|
150
|
+
/**
|
|
151
|
+
* Returns whether the build has completed or not
|
|
152
|
+
* @param {Object} options
|
|
153
|
+
* @param {string} options.pluginName - The name of the plugin. E.g. 'nativescript-barcodescanner'
|
|
154
|
+
* @param {string} options.platformsAndroidDirPath - The path to the 'plugin/src/platforms/android' directory.
|
|
155
|
+
* @param {string} options.aarOutputDir - The path where the aar should be copied after a successful build.
|
|
156
|
+
* @param {string} options.tempPluginDirPath - The path where the android plugin will be built.
|
|
157
|
+
*/
|
|
147
158
|
buildAar(options) {
|
|
148
159
|
return __awaiter(this, void 0, void 0, function* () {
|
|
149
160
|
this.validateOptions(options);
|
|
@@ -181,6 +192,7 @@ class AndroidPluginBuildService {
|
|
|
181
192
|
});
|
|
182
193
|
}
|
|
183
194
|
cleanPluginDir(pluginTempDir) {
|
|
195
|
+
// In case plugin was already built in the current process, we need to clean the old sources as they may break the new build.
|
|
184
196
|
this.$fs.deleteDirectory(pluginTempDir);
|
|
185
197
|
this.$fs.ensureDirectoryExists(pluginTempDir);
|
|
186
198
|
}
|
|
@@ -299,6 +311,7 @@ class AndroidPluginBuildService {
|
|
|
299
311
|
});
|
|
300
312
|
}
|
|
301
313
|
getLocalGradleVersions() {
|
|
314
|
+
// try reading from installed runtime first before reading from the npm registry...
|
|
302
315
|
const installedRuntimePackageJSONPath = (0, resolve_package_path_1.resolvePackageJSONPath)(constants_1.SCOPED_ANDROID_RUNTIME_NAME, {
|
|
303
316
|
paths: [this.$projectData.projectDir],
|
|
304
317
|
});
|
|
@@ -333,13 +346,23 @@ class AndroidPluginBuildService {
|
|
|
333
346
|
if (localVersionInfo) {
|
|
334
347
|
return localVersionInfo;
|
|
335
348
|
}
|
|
349
|
+
// fallback to reading from npm...
|
|
336
350
|
try {
|
|
337
351
|
let output = yield this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { version_info: true });
|
|
338
352
|
output = (_a = output === null || output === void 0 ? void 0 : output["version_info"]) !== null && _a !== void 0 ? _a : output;
|
|
339
353
|
if (!output) {
|
|
354
|
+
/**
|
|
355
|
+
* fallback to the old 'gradle' key in package.json
|
|
356
|
+
*
|
|
357
|
+
* format:
|
|
358
|
+
*
|
|
359
|
+
* gradle: { version: '6.4', android: '3.6.4' }
|
|
360
|
+
*
|
|
361
|
+
*/
|
|
340
362
|
output = yield this.$packageManager.view(`${constants_1.SCOPED_ANDROID_RUNTIME_NAME}@${runtimeVersion}`, { gradle: true });
|
|
341
363
|
output = (_b = output === null || output === void 0 ? void 0 : output["gradle"]) !== null && _b !== void 0 ? _b : output;
|
|
342
364
|
const { version, android } = output;
|
|
365
|
+
// covert output to the new format...
|
|
343
366
|
output = {
|
|
344
367
|
gradle: version,
|
|
345
368
|
gradleAndroid: android,
|
|
@@ -412,6 +435,10 @@ class AndroidPluginBuildService {
|
|
|
412
435
|
this.$errors.fail(`No built aar found at ${pathToBuiltAar}`);
|
|
413
436
|
}
|
|
414
437
|
}
|
|
438
|
+
/**
|
|
439
|
+
* @param {Object} options
|
|
440
|
+
* @param {string} options.platformsAndroidDirPath - The path to the 'plugin/src/platforms/android' directory.
|
|
441
|
+
*/
|
|
415
442
|
migrateIncludeGradle(options) {
|
|
416
443
|
this.validatePlatformsAndroidDirPathOption(options);
|
|
417
444
|
const includeGradleFilePath = path.join(options.platformsAndroidDirPath, constants_1.INCLUDE_GRADLE_NAME);
|
|
@@ -516,3 +543,4 @@ __decorate([
|
|
|
516
543
|
], AndroidPluginBuildService.prototype, "buildPlugin", null);
|
|
517
544
|
exports.AndroidPluginBuildService = AndroidPluginBuildService;
|
|
518
545
|
yok_1.injector.register("androidPluginBuildService", AndroidPluginBuildService);
|
|
546
|
+
//# sourceMappingURL=android-plugin-build-service.js.map
|