nativescript 8.8.3 → 8.9.0-alpha.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/.d.ts +1 -0
- 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 +0 -1
- package/lib/commands/apple-login.js +0 -1
- package/lib/commands/appstore-list.js +0 -1
- package/lib/commands/appstore-upload.js +3 -10
- 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/embedding/embed.js +0 -7
- 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/native-add.js +0 -5
- 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 +3 -4
- 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 -14
- 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 +9 -19
- 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 +0 -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 +1 -1
- package/lib/definitions/prepare.d.ts +2 -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 +2 -7
- package/lib/helpers/version-validator-helper.js +0 -1
- package/lib/key-commands/bootstrap.js +2 -3
- package/lib/key-commands/index.js +32 -26
- 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 +119 -143
- 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 +0 -1
- 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 +0 -29
- package/lib/services/android-project-service.js +4 -71
- package/lib/services/android-resources-migration-service.js +0 -7
- package/lib/services/apple-portal/apple-portal-application-service.js +1 -2
- package/lib/services/apple-portal/apple-portal-cookie-service.js +0 -1
- package/lib/services/apple-portal/apple-portal-session-service.js +42 -15
- package/lib/services/apple-portal/srp/srp-wrapper.js +76 -0
- package/lib/services/assets-generation/assets-generation-service.js +5 -16
- 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 +0 -1
- 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 +4 -6
- package/lib/services/ios/ios-signing-service.js +45 -27
- 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 +2 -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 +2 -94
- 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 +0 -3
- package/lib/services/livesync/android-livesync-service.js +0 -1
- 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 +0 -2
- package/lib/services/livesync/livesync-socket.js +0 -1
- package/lib/services/livesync/platform-livesync-service-base.js +0 -5
- 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 +0 -15
- 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 +2 -49
- package/lib/services/platform/platform-validation-service.js +0 -1
- package/lib/services/platform/prepare-native-platform-service.js +2 -5
- package/lib/services/platform-environment-requirements.js +3 -8
- 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 +2 -20
- 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 +3 -14
- package/lib/services/project-cleanup-service.js +0 -2
- package/lib/services/project-config-service.js +2 -22
- 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 +9 -44
- package/lib/services/xcconfig-service.js +0 -2
- package/lib/services/xcproj-service.js +0 -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 +3 -2
|
@@ -5,20 +5,8 @@ const yok_1 = require("../common/yok");
|
|
|
5
5
|
class IOSLogFilter {
|
|
6
6
|
constructor($loggingLevels) {
|
|
7
7
|
this.$loggingLevels = $loggingLevels;
|
|
8
|
-
// Used to recognize output related to the current project
|
|
9
|
-
// This looks for artifacts like: AppName[22432] or AppName(SomeTextHere)[23123]
|
|
10
8
|
this.appOutputRegex = /([^\s\(\)]+)(?:\(([^\s]+)\))?\[[0-9]+\]/;
|
|
11
|
-
// Used to trim the passed messages to a simpler output
|
|
12
|
-
// Example:
|
|
13
|
-
// This: "May 24 15:54:52 Dragons-iPhone NativeScript250(NativeScript)[356] <Notice>: CONSOLE ERROR file:///app/tns_modules/@angular/core/bundles/core.umd.js:3477:36: ORIGINAL STACKTRACE:"
|
|
14
|
-
// Becomes: CONSOLE ERROR file:///app/tns_modules/@angular/core/bundles/core.umd.js:3477:36: ORIGINAL STACKTRACE:
|
|
15
9
|
this.infoFilterRegex = new RegExp(`^.*(?:<Notice>:[ \t]?|<Error>:[ \t]?|<Warning>:[ \t]?|\\(NativeScript\\)[ \t]?|${this.appOutputRegex.source}:[ \t]?){1}`);
|
|
16
|
-
// Used to post filter messages that slip through but are not coming from NativeScript itself.
|
|
17
|
-
// Looks for text in parenthesis at the beginning
|
|
18
|
-
// Example:
|
|
19
|
-
// (RunningBoardServices) [com.apple.runningboard:connection] Identity resolved as application<...>
|
|
20
|
-
// ^(~~capture group~~~)^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
21
|
-
// we then use this to filter out non-NativeScript lines
|
|
22
10
|
this.postFilterRegex = /^\((.+)\) \[com\.apple.+\]/;
|
|
23
11
|
this.filterActive = true;
|
|
24
12
|
this.partialLine = null;
|
|
@@ -41,15 +29,11 @@ class IOSLogFilter {
|
|
|
41
29
|
this.partialLine = currentLine;
|
|
42
30
|
break;
|
|
43
31
|
}
|
|
44
|
-
// Legacy filter moved to preFilter
|
|
45
32
|
if (this.preFilter(data, currentLine)) {
|
|
46
33
|
continue;
|
|
47
34
|
}
|
|
48
35
|
const matchResult = this.appOutputRegex.exec(currentLine);
|
|
49
36
|
if (matchResult && matchResult.length > 1) {
|
|
50
|
-
// Check if the name of the app equals the name of the CLI project and turn on the filter if not.
|
|
51
|
-
// We call initializeProjectData in order to obtain the current project name as the instance
|
|
52
|
-
// of this filter may be used accross multiple projects.
|
|
53
37
|
const projectName = loggingOptions && loggingOptions.projectName;
|
|
54
38
|
this.filterActive = matchResult[1] !== projectName;
|
|
55
39
|
if (matchResult === null || matchResult === void 0 ? void 0 : matchResult[2]) {
|
|
@@ -64,11 +48,8 @@ class IOSLogFilter {
|
|
|
64
48
|
currentLine = currentLine.replace(filteredLineInfo[0], "");
|
|
65
49
|
}
|
|
66
50
|
currentLine = currentLine
|
|
67
|
-
// remove lading space before CONSOLE
|
|
68
51
|
.replace(/^\s*CONSOLE/, "CONSOLE")
|
|
69
|
-
// trim trailing spaces only to preserve indentation
|
|
70
52
|
.trimEnd();
|
|
71
|
-
// post filtering: (<anything>) check if <anything> is not "NativeScript"
|
|
72
53
|
const postFilterMatch = this.postFilterRegex.exec(currentLine);
|
|
73
54
|
if (postFilterMatch && (postFilterMatch === null || postFilterMatch === void 0 ? void 0 : postFilterMatch[1]) !== "NativeScript") {
|
|
74
55
|
continue;
|
|
@@ -87,4 +68,3 @@ class IOSLogFilter {
|
|
|
87
68
|
}
|
|
88
69
|
exports.IOSLogFilter = IOSLogFilter;
|
|
89
70
|
yok_1.injector.register("iOSLogFilter", IOSLogFilter);
|
|
90
|
-
//# sourceMappingURL=ios-log-filter.js.map
|
|
@@ -58,8 +58,8 @@ class IOSNativeTargetService {
|
|
|
58
58
|
setXcodeTargetBuildConfigurationProperties(properties, targetName, project) {
|
|
59
59
|
properties.forEach((property) => {
|
|
60
60
|
const buildNames = property.buildNames || [
|
|
61
|
-
"Debug"
|
|
62
|
-
"Release"
|
|
61
|
+
"Debug",
|
|
62
|
+
"Release",
|
|
63
63
|
];
|
|
64
64
|
buildNames.forEach((buildName) => {
|
|
65
65
|
project.addBuildProperty(property.name, property.value, buildName, targetName);
|
|
@@ -76,7 +76,6 @@ class IOSNativeTargetService {
|
|
|
76
76
|
project.addToBuildSettings("ASSETCATALOG_COMPILER_APPICON_NAME", configurationJson.assetcatalogCompilerAppiconName, targetUuid);
|
|
77
77
|
}
|
|
78
78
|
const properties = [];
|
|
79
|
-
// Set for both release and debug
|
|
80
79
|
if (configurationJson.targetBuildConfigurationProperties) {
|
|
81
80
|
_.forEach(configurationJson.targetBuildConfigurationProperties, (value, name) => properties.push({ value, name }));
|
|
82
81
|
}
|
|
@@ -85,11 +84,11 @@ class IOSNativeTargetService {
|
|
|
85
84
|
var buildName = null;
|
|
86
85
|
switch (name) {
|
|
87
86
|
case "debug": {
|
|
88
|
-
buildName = "Debug"
|
|
87
|
+
buildName = "Debug";
|
|
89
88
|
break;
|
|
90
89
|
}
|
|
91
90
|
case "release": {
|
|
92
|
-
buildName = "Release"
|
|
91
|
+
buildName = "Release";
|
|
93
92
|
break;
|
|
94
93
|
}
|
|
95
94
|
default: {
|
|
@@ -107,4 +106,3 @@ class IOSNativeTargetService {
|
|
|
107
106
|
}
|
|
108
107
|
exports.IOSNativeTargetService = IOSNativeTargetService;
|
|
109
108
|
yok_1.injector.register("iOSNativeTargetService", IOSNativeTargetService);
|
|
110
|
-
//# sourceMappingURL=ios-native-target-service.js.map
|
|
@@ -145,7 +145,7 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
145
145
|
".ico",
|
|
146
146
|
".cur",
|
|
147
147
|
".xbm",
|
|
148
|
-
],
|
|
148
|
+
],
|
|
149
149
|
};
|
|
150
150
|
}
|
|
151
151
|
return this._platformData;
|
|
@@ -198,12 +198,9 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
198
198
|
shell.cp("-R", path.join(frameworkDir, "*"), this.getPlatformData(projectData).projectRoot);
|
|
199
199
|
});
|
|
200
200
|
}
|
|
201
|
-
//TODO: plamen5kov: revisit this method, might have unnecessary/obsolete logic
|
|
202
201
|
interpolateData(projectData) {
|
|
203
202
|
return __awaiter(this, void 0, void 0, function* () {
|
|
204
203
|
const projectRootFilePath = path.join(this.getPlatformData(projectData).projectRoot, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER);
|
|
205
|
-
// Starting with NativeScript for iOS 1.6.0, the project Info.plist file resides not in the platform project,
|
|
206
|
-
// but in the hello-world app template as a platform specific resource.
|
|
207
204
|
if (this.$fs.exists(path.join(projectRootFilePath, IOSProjectService.IOS_PROJECT_NAME_PLACEHOLDER + "-Info.plist"))) {
|
|
208
205
|
this.replaceFileName("-Info.plist", projectRootFilePath, projectData);
|
|
209
206
|
}
|
|
@@ -314,34 +311,18 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
314
311
|
frameworkAddOptions["sign"] = true;
|
|
315
312
|
}
|
|
316
313
|
if (this.$options.hostProjectPath) {
|
|
317
|
-
// always mark xcframeworks for embedding
|
|
318
314
|
frameworkAddOptions["embed"] = true;
|
|
319
315
|
frameworkAddOptions["sign"] = false;
|
|
320
316
|
}
|
|
321
|
-
// Note: we used to prepend "$(SRCROOT)/" to the framework path, but seems like it's not needed anymore
|
|
322
|
-
// "$(SRCROOT)/" +
|
|
323
317
|
const frameworkRelativePath = this.getLibSubpathRelativeToProjectPath(frameworkPath, projectData);
|
|
324
318
|
project.addFramework(frameworkRelativePath, frameworkAddOptions);
|
|
325
|
-
// filePathsArray, buildPhaseType, comment, target, optionsOrFolderType, subfolderPath
|
|
326
|
-
// project.addBuildPhase(
|
|
327
|
-
// [],
|
|
328
|
-
// "PBXShellScriptBuildPhase",
|
|
329
|
-
// "Debug SRCROOT",
|
|
330
|
-
// undefined,
|
|
331
|
-
// {
|
|
332
|
-
// shellPath: "/bin/sh",
|
|
333
|
-
// shellScript: `echo "SRCROOT: $SRCROOT"`,
|
|
334
|
-
// }
|
|
335
|
-
// );
|
|
336
319
|
this.savePbxProj(project, projectData);
|
|
337
320
|
});
|
|
338
321
|
}
|
|
339
322
|
addStaticLibrary(staticLibPath, projectData) {
|
|
340
323
|
return __awaiter(this, void 0, void 0, function* () {
|
|
341
|
-
// Copy files to lib folder.
|
|
342
324
|
const libraryName = path.basename(staticLibPath, ".a");
|
|
343
325
|
const headersSubpath = path.join(path.dirname(staticLibPath), "include", libraryName);
|
|
344
|
-
// Add static library to project file and setup header search paths
|
|
345
326
|
const project = this.createPbxProj(projectData);
|
|
346
327
|
const relativeStaticLibPath = this.getLibSubpathRelativeToProjectPath(staticLibPath, projectData);
|
|
347
328
|
project.addFramework(relativeStaticLibPath);
|
|
@@ -378,60 +359,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
378
359
|
filesRelativeToProject: true,
|
|
379
360
|
uuid: "NATIVESCRIPTNATIVESCRIPT",
|
|
380
361
|
});
|
|
381
|
-
|
|
382
|
-
* 1. Add platforms/ios/{projectname}/app build to the host app
|
|
383
|
-
*/
|
|
384
|
-
// Note: allow customization of this targetFolderName
|
|
385
|
-
// const targetFolderName = "app";
|
|
386
|
-
const buildFolderPath = path.join(this.$options.hostProjectPath, projectData.projectName
|
|
387
|
-
// targetFolderName
|
|
388
|
-
);
|
|
362
|
+
const buildFolderPath = path.join(this.$options.hostProjectPath, projectData.projectName);
|
|
389
363
|
project.addResourceFile(buildFolderPath, {}, "NATIVESCRIPTNATIVESCRIPT");
|
|
390
|
-
// filePathsArray, buildPhaseType, comment, target, optionsOrFolderType, subfolderPath
|
|
391
|
-
// project.addBuildPhase(
|
|
392
|
-
// [],
|
|
393
|
-
// "PBXShellScriptBuildPhase",
|
|
394
|
-
// "Copy Metadata (DEBUG)",
|
|
395
|
-
// undefined,
|
|
396
|
-
// {
|
|
397
|
-
// shellPath: "/bin/sh",
|
|
398
|
-
// shellScript: `cp ./platforms/ios/build/Debug-iphonesimulator/metadata-arm64.bin $CONFIGURATION_BUILD_DIR`,
|
|
399
|
-
// outputPaths: [
|
|
400
|
-
// JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-arm64.bin"),
|
|
401
|
-
// // JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-arm64e.bin"),
|
|
402
|
-
// // JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-i386.bin"),
|
|
403
|
-
// // JSON.stringify("$(CONFIGURATION_BUILD_DIR)/metadata-x86_64.bin"),
|
|
404
|
-
// ],
|
|
405
|
-
// }
|
|
406
|
-
// );
|
|
407
364
|
const metadataPath = path.relative(this.$options.hostProjectPath, buildFolderPath);
|
|
408
365
|
project.addToOtherLinkerFlags(JSON.stringify(`-sectcreate __DATA __TNSMetadata "${metadataPath}/metadata-arm64.bin"`));
|
|
409
|
-
// // no shorthand way to get UUID of build phase that i can tell
|
|
410
|
-
// // methods return the phase as an object but ommitted the actual key (uuid we need)
|
|
411
|
-
// // this does it same way nativescript-dev-xcode does but gets the uuid we need
|
|
412
|
-
// const resourcesBuildPhaseKeys = Object.keys(
|
|
413
|
-
// project.hash.project.objects["PBXResourcesBuildPhase"]
|
|
414
|
-
// );
|
|
415
|
-
// // console.log('resourcesBuildPhaseKeys:', resourcesBuildPhaseKeys);
|
|
416
|
-
// const buildPhaseUUID = resourcesBuildPhaseKeys[0];
|
|
417
|
-
// const comment = `${targetFolderName} in Resources`;
|
|
418
|
-
// project.hash.project.objects["PBXResourcesBuildPhase"][
|
|
419
|
-
// buildPhaseUUID
|
|
420
|
-
// ].files.forEach((f: any) => {
|
|
421
|
-
// console.log(f);
|
|
422
|
-
// });
|
|
423
|
-
// if (
|
|
424
|
-
// !project.hash.project.objects["PBXResourcesBuildPhase"][
|
|
425
|
-
// buildPhaseUUID
|
|
426
|
-
// ].files.find((f: any) => f.comment === comment)
|
|
427
|
-
// ) {
|
|
428
|
-
// project.addResourceFile(buildFolderPath, {}, buildPhaseUUID);
|
|
429
|
-
// }
|
|
430
|
-
/**
|
|
431
|
-
* 2. Ensure metadata is copied as a file
|
|
432
|
-
* The apps metadata-{arch}.bin should be added as a file reference.
|
|
433
|
-
*/
|
|
434
|
-
// TODO
|
|
435
366
|
this.savePbxProj(project, projectData);
|
|
436
367
|
}
|
|
437
368
|
catch (err) {
|
|
@@ -479,12 +410,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
479
410
|
this.$fs.deleteDirectory(platformsAppResourcesPath);
|
|
480
411
|
this.$fs.ensureDirectoryExists(platformsAppResourcesPath);
|
|
481
412
|
const platformAppResourcesPath = path.join(projectAppResourcesPath, platformData.normalizedPlatformName);
|
|
482
|
-
// this allows App_Resources/visionOS
|
|
483
413
|
if (this.$fs.exists(platformAppResourcesPath)) {
|
|
484
414
|
this.$fs.copyFile(path.join(platformAppResourcesPath, "*"), platformsAppResourcesPath);
|
|
485
415
|
}
|
|
486
416
|
else {
|
|
487
|
-
// otherwise falls back to App_Resources/iOS
|
|
488
417
|
this.$fs.copyFile(path.join(projectAppResourcesPath, this.$devicePlatformsConstants.iOS, "*"), platformsAppResourcesPath);
|
|
489
418
|
}
|
|
490
419
|
this.$fs.deleteFile(path.join(platformsAppResourcesPath, platformData.configurationFileName));
|
|
@@ -587,12 +516,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
587
516
|
getLibSubpathRelativeToProjectPath(targetPath, projectData) {
|
|
588
517
|
const projectRoot = this.getPlatformData(projectData).projectRoot;
|
|
589
518
|
const frameworkPath = path.relative(projectRoot, targetPath);
|
|
590
|
-
// console.log({
|
|
591
|
-
// targetPath,
|
|
592
|
-
// projectRoot,
|
|
593
|
-
// frameworkPath,
|
|
594
|
-
// resolved: path.resolve(projectRoot, frameworkPath),
|
|
595
|
-
// });
|
|
596
519
|
return frameworkPath;
|
|
597
520
|
}
|
|
598
521
|
getPbxProjPath(projectData) {
|
|
@@ -645,10 +568,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
645
568
|
const projectPodfilePath = this.$cocoapodsService.getProjectPodfilePath(platformData.projectRoot);
|
|
646
569
|
if (this.$fs.exists(projectPodfilePath)) {
|
|
647
570
|
yield this.$cocoapodsService.executePodInstall(platformData.projectRoot, this.$xcprojService.getXcodeprojPath(projectData, platformData.projectRoot));
|
|
648
|
-
// The `pod install` command adds a new target to the .pbxproject. This target adds additional build phases to Xcode project.
|
|
649
|
-
// Some of these phases relies on env variables (like PODS_PODFILE_DIR_PATH or PODS_ROOT).
|
|
650
|
-
// These variables are produced from merge of pod's xcconfig file and project's xcconfig file.
|
|
651
|
-
// So the correct order is `pod install` to be executed before merging pod's xcconfig file.
|
|
652
571
|
yield this.$cocoapodsService.mergePodXcconfigFile(projectData, platformData, opts);
|
|
653
572
|
}
|
|
654
573
|
yield this.$spmService.applySPMPackages(platformData, projectData);
|
|
@@ -663,7 +582,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
663
582
|
const hasProvision = provision !== undefined;
|
|
664
583
|
const hasTeamId = teamId !== undefined;
|
|
665
584
|
if (hasProvision || hasTeamId) {
|
|
666
|
-
// Check if the native project's signing is set to the provided provision...
|
|
667
585
|
const pbxprojPath = this.getPbxProjPath(projectData);
|
|
668
586
|
if (this.$fs.exists(pbxprojPath)) {
|
|
669
587
|
const xcode = this.$pbxprojDomXcode.Xcode.open(pbxprojPath);
|
|
@@ -679,9 +597,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
679
597
|
}
|
|
680
598
|
}
|
|
681
599
|
else {
|
|
682
|
-
// Specifying provisioning profile requires "Manual" signing style.
|
|
683
|
-
// If the current signing style was not "Manual" it was probably "Automatic" or,
|
|
684
|
-
// it was not uniform for the debug and release build configurations.
|
|
685
600
|
changesInfo.signingChanged = true;
|
|
686
601
|
}
|
|
687
602
|
}
|
|
@@ -695,8 +610,6 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
695
610
|
}
|
|
696
611
|
}
|
|
697
612
|
else {
|
|
698
|
-
// Specifying team id or name requires "Automatic" signing style.
|
|
699
|
-
// If the current signing style was not "Automatic" it was probably "Manual".
|
|
700
613
|
changesInfo.signingChanged = true;
|
|
701
614
|
}
|
|
702
615
|
}
|
|
@@ -915,14 +828,10 @@ class IOSProjectService extends projectServiceBaseLib.PlatformProjectServiceBase
|
|
|
915
828
|
}
|
|
916
829
|
for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
|
|
917
830
|
if (!this.$fs.exists(pluginsXcconfigFilePath)) {
|
|
918
|
-
// We need the pluginsXcconfig file to exist in platforms dir as it is required in the native template:
|
|
919
|
-
// https://github.com/NativeScript/ios-runtime/blob/9c2b7b5f70b9bee8452b7a24aa6b646214c7d2be/build/project-template/__PROJECT_NAME__/build-debug.xcconfig#L3
|
|
920
|
-
// From Xcode 10 in case the file is missing, this include fails and the build itself fails (was a warning in previous Xcode versions).
|
|
921
831
|
this.$fs.writeFile(pluginsXcconfigFilePath, "");
|
|
922
832
|
}
|
|
923
833
|
}
|
|
924
834
|
for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
|
|
925
|
-
// Set Entitlements Property to point to default file if not set explicitly by the user.
|
|
926
835
|
const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
|
|
927
836
|
if (entitlementsPropertyValue === null &&
|
|
928
837
|
this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
|
|
@@ -970,4 +879,3 @@ __decorate([
|
|
|
970
879
|
], IOSProjectService.prototype, "buildProject", null);
|
|
971
880
|
exports.IOSProjectService = IOSProjectService;
|
|
972
881
|
yok_1.injector.register("iOSProjectService", IOSProjectService);
|
|
973
|
-
//# sourceMappingURL=ios-project-service.js.map
|
|
@@ -145,8 +145,6 @@ class IOSProvisionService {
|
|
|
145
145
|
getDevelopmentTeams() {
|
|
146
146
|
return __awaiter(this, void 0, void 0, function* () {
|
|
147
147
|
const teams = {};
|
|
148
|
-
// NOTE: We are reading all provisioning profiles and collect team information from them.
|
|
149
|
-
// It would be better if we can check the Apple ID registered in Xcode and read the teams associated with it.
|
|
150
148
|
mobileprovision.provision.read().forEach((provision) => provision.TeamIdentifier &&
|
|
151
149
|
provision.TeamIdentifier.forEach((id) => {
|
|
152
150
|
if (!teams[provision.TeamName]) {
|
|
@@ -173,4 +171,3 @@ class IOSProvisionService {
|
|
|
173
171
|
}
|
|
174
172
|
exports.IOSProvisionService = IOSProvisionService;
|
|
175
173
|
yok_1.injector.register("iOSProvisionService", IOSProvisionService);
|
|
176
|
-
//# sourceMappingURL=ios-provision-service.js.map
|
|
@@ -74,4 +74,3 @@ IOSWatchAppService.WATCH_APP_IDENTIFIER = "watchkitapp";
|
|
|
74
74
|
IOSWatchAppService.WACTCH_EXTENSION_IDENTIFIER = "watchkitextension";
|
|
75
75
|
exports.IOSWatchAppService = IOSWatchAppService;
|
|
76
76
|
yok_1.injector.register("iOSWatchAppService", IOSWatchAppService);
|
|
77
|
-
//# sourceMappingURL=ios-watch-app-service.js.map
|
|
@@ -52,7 +52,6 @@ class IPService {
|
|
|
52
52
|
}
|
|
53
53
|
getIPAddressFromIpifyOrgAPI() {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
-
// https://www.ipify.org/
|
|
56
55
|
const ipifyOrgAPIEndpoint = "https://api.ipify.org";
|
|
57
56
|
let ipAddress = null;
|
|
58
57
|
try {
|
|
@@ -77,4 +76,3 @@ __decorate([
|
|
|
77
76
|
], IPService.prototype, "getCurrentIPv4Address", null);
|
|
78
77
|
exports.IPService = IPService;
|
|
79
78
|
yok_1.injector.register("ipService", IPService);
|
|
80
|
-
//# sourceMappingURL=ip-service.js.map
|
|
@@ -214,4 +214,3 @@ __decorate([
|
|
|
214
214
|
], ITMSTransporterService.prototype, "getITMSTransporterPath", null);
|
|
215
215
|
exports.ITMSTransporterService = ITMSTransporterService;
|
|
216
216
|
yok_1.injector.register("itmsTransporterService", ITMSTransporterService);
|
|
217
|
-
//# sourceMappingURL=itmstransporter-service.js.map
|
|
@@ -9,10 +9,8 @@ process.on("message", (data) => {
|
|
|
9
9
|
});
|
|
10
10
|
const KarmaServer = require(path.join(pathToKarma, "lib/server"));
|
|
11
11
|
const karma = new KarmaServer(data.karmaConfig, (exitCode) => {
|
|
12
|
-
// Exit with the correct exit code and signal the manager process.
|
|
13
12
|
process.exit(exitCode);
|
|
14
13
|
});
|
|
15
14
|
karma.start();
|
|
16
15
|
}
|
|
17
16
|
});
|
|
18
|
-
//# sourceMappingURL=karma-execution.js.map
|
|
@@ -119,7 +119,6 @@ class AndroidDeviceLiveSyncService extends android_device_livesync_service_base_
|
|
|
119
119
|
]);
|
|
120
120
|
const regex = new RegExp(`^-.*${deviceRootBasename}$`, "m");
|
|
121
121
|
const matchingFile = (listResult || "").match(regex);
|
|
122
|
-
// Check if there is already a file with deviceRootBasename. If so, delete it as it breaks LiveSyncing.
|
|
123
122
|
if (matchingFile && matchingFile[0] && _.startsWith(matchingFile[0], "-")) {
|
|
124
123
|
yield this.device.adb.executeShellCommand(["rm", "-f", deviceRootPath]);
|
|
125
124
|
}
|
|
@@ -202,4 +201,3 @@ __decorate([
|
|
|
202
201
|
(0, decorators_1.performanceLog)()
|
|
203
202
|
], AndroidDeviceLiveSyncService.prototype, "removeFiles", null);
|
|
204
203
|
exports.AndroidDeviceLiveSyncService = AndroidDeviceLiveSyncService;
|
|
205
|
-
//# sourceMappingURL=android-device-livesync-service.js.map
|
|
@@ -111,8 +111,6 @@ class AndroidDeviceSocketsLiveSyncService extends android_device_livesync_servic
|
|
|
111
111
|
yield this.$cleanupService.removeCleanupCommand(cleanupCommand);
|
|
112
112
|
});
|
|
113
113
|
yield this.$cleanupService.addCleanupCommand(cleanupCommand);
|
|
114
|
-
// We need to clear resources when the action fails
|
|
115
|
-
// But we also need the real result of the action.
|
|
116
114
|
yield doSyncPromise.then(actionOnEnd.bind(this), actionOnEnd.bind(this));
|
|
117
115
|
result = yield doSyncPromise;
|
|
118
116
|
}
|
|
@@ -197,4 +195,3 @@ class AndroidDeviceSocketsLiveSyncService extends android_device_livesync_servic
|
|
|
197
195
|
AndroidDeviceSocketsLiveSyncService.STATUS_UPDATE_INTERVAL = 10000;
|
|
198
196
|
AndroidDeviceSocketsLiveSyncService.MINIMAL_VERSION_LONG_LIVING_CONNECTION = "0.2.0";
|
|
199
197
|
exports.AndroidDeviceSocketsLiveSyncService = AndroidDeviceSocketsLiveSyncService;
|
|
200
|
-
//# sourceMappingURL=android-device-livesync-sockets-service.js.map
|
|
@@ -159,12 +159,9 @@ class AndroidLivesyncTool {
|
|
|
159
159
|
error =
|
|
160
160
|
error ||
|
|
161
161
|
this.getErrorWithMessage("Socket connection ended before sync operation is complete.");
|
|
162
|
-
//remove listeners and delete this.socketConnection
|
|
163
162
|
this.cleanState(socketUid);
|
|
164
|
-
//call end of the connection (close and error callbacks won't be called - listeners removed)
|
|
165
163
|
socket.end();
|
|
166
164
|
socket.destroy();
|
|
167
|
-
//reject all pending sync requests and clear timeouts
|
|
168
165
|
this.rejectPendingSyncOperations(socketUid, error);
|
|
169
166
|
}
|
|
170
167
|
}
|
|
@@ -428,4 +425,3 @@ AndroidLivesyncTool.SOCKET_CONNECTION_TIMED_OUT_ERROR = "Socket connection timed
|
|
|
428
425
|
AndroidLivesyncTool.NO_SOCKET_CONNECTION_AVAILABLE_ERROR = "No socket connection available.";
|
|
429
426
|
exports.AndroidLivesyncTool = AndroidLivesyncTool;
|
|
430
427
|
yok_1.injector.register("androidLivesyncTool", AndroidLivesyncTool);
|
|
431
|
-
//# sourceMappingURL=android-livesync-tool.js.map
|
|
@@ -52,7 +52,6 @@ class DeviceLiveSyncServiceBase {
|
|
|
52
52
|
}
|
|
53
53
|
finalizeSync(liveSyncInfo, projectData) {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
-
//implement in case a sync point for all remove/create operation is needed
|
|
56
55
|
return {
|
|
57
56
|
didRefresh: true,
|
|
58
57
|
operationId: "",
|
|
@@ -68,4 +67,3 @@ __decorate([
|
|
|
68
67
|
(0, decorators_2.performanceLog)()
|
|
69
68
|
], DeviceLiveSyncServiceBase.prototype, "transferFiles", null);
|
|
70
69
|
exports.DeviceLiveSyncServiceBase = DeviceLiveSyncServiceBase;
|
|
71
|
-
//# sourceMappingURL=device-livesync-service-base.js.map
|
|
@@ -47,13 +47,11 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
|
|
|
47
47
|
}
|
|
48
48
|
setupSocketIfNeeded(projectData) {
|
|
49
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
50
|
-
// TODO: persist the sockets per app in order to support LiveSync on multiple apps on the same device
|
|
51
50
|
if (this.socket) {
|
|
52
51
|
return true;
|
|
53
52
|
}
|
|
54
53
|
const appId = projectData.projectIdentifiers.ios;
|
|
55
54
|
try {
|
|
56
|
-
// TODO: temp workaround till we setup the sockets along with the app start
|
|
57
55
|
const ensureAppStarted = true;
|
|
58
56
|
this.socket = yield this.device.getDebugSocket(appId, projectData.projectName, projectData.projectDir, ensureAppStarted);
|
|
59
57
|
}
|
|
@@ -145,7 +143,6 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
|
|
|
145
143
|
projectDir: projectData.projectDir,
|
|
146
144
|
});
|
|
147
145
|
if (liveSyncInfo.useHotModuleReload) {
|
|
148
|
-
// enable HOT updates
|
|
149
146
|
yield this.setupSocketIfNeeded(projectData);
|
|
150
147
|
}
|
|
151
148
|
});
|
|
@@ -208,9 +205,6 @@ class IOSDeviceLiveSyncService extends device_livesync_service_base_1.DeviceLive
|
|
|
208
205
|
destroySocket() {
|
|
209
206
|
return __awaiter(this, void 0, void 0, function* () {
|
|
210
207
|
if (this.socket) {
|
|
211
|
-
// we do not support LiveSync on multiple apps on the same device
|
|
212
|
-
// in order to do that, we should cache the socket per app
|
|
213
|
-
// and destroy just the current app socket when possible
|
|
214
208
|
yield this.device.destroyAllSockets();
|
|
215
209
|
this.socket = null;
|
|
216
210
|
}
|
|
@@ -222,4 +216,3 @@ __decorate([
|
|
|
222
216
|
(0, decorators_1.performanceLog)()
|
|
223
217
|
], IOSDeviceLiveSyncService.prototype, "removeFiles", null);
|
|
224
218
|
exports.IOSDeviceLiveSyncService = IOSDeviceLiveSyncService;
|
|
225
|
-
//# sourceMappingURL=ios-device-livesync-service.js.map
|
|
@@ -73,7 +73,6 @@ class IOSLiveSyncService extends platform_livesync_service_base_1.PlatformLiveSy
|
|
|
73
73
|
syncAfterInstall(device, liveSyncInfo) {
|
|
74
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
75
|
if (!device.isEmulator) {
|
|
76
|
-
// In this case we should execute fullsync because iOS Runtime requires the full content of app dir to be extracted in the root of sync dir.
|
|
77
76
|
yield this.fullSync({
|
|
78
77
|
projectData: liveSyncInfo.projectData,
|
|
79
78
|
device,
|
|
@@ -94,4 +93,3 @@ __decorate([
|
|
|
94
93
|
], IOSLiveSyncService.prototype, "fullSync", null);
|
|
95
94
|
exports.IOSLiveSyncService = IOSLiveSyncService;
|
|
96
95
|
yok_1.injector.register("iOSLiveSyncService", IOSLiveSyncService);
|
|
97
|
-
//# sourceMappingURL=ios-livesync-service.js.map
|
|
@@ -52,7 +52,6 @@ class PlatformLiveSyncServiceBase {
|
|
|
52
52
|
}
|
|
53
53
|
syncAfterInstall(device, liveSyncInfo) {
|
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
-
/* intentionally left blank */
|
|
56
55
|
});
|
|
57
56
|
}
|
|
58
57
|
restartApplication(projectData, liveSyncInfo) {
|
|
@@ -106,8 +105,6 @@ class PlatformLiveSyncServiceBase {
|
|
|
106
105
|
let modifiedLocalToDevicePaths = [];
|
|
107
106
|
if (liveSyncInfo.filesToSync.length) {
|
|
108
107
|
const filesToSync = liveSyncInfo.filesToSync;
|
|
109
|
-
// const mappedFiles = _.map(filesToSync, filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData));
|
|
110
|
-
// Some plugins modify platforms dir on afterPrepare (check nativescript-dev-sass) - we want to sync only existing file.
|
|
111
108
|
const existingFiles = filesToSync.filter((m) => m && this.$fs.exists(m));
|
|
112
109
|
this.$logger.trace("Will execute livesync for files: ", existingFiles);
|
|
113
110
|
const skippedFiles = _.difference(filesToSync, existingFiles);
|
|
@@ -126,7 +123,6 @@ class PlatformLiveSyncServiceBase {
|
|
|
126
123
|
const filePaths = liveSyncInfo.filesToRemove;
|
|
127
124
|
const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
|
|
128
125
|
const mappedFiles = _(filePaths)
|
|
129
|
-
// .map(filePath => this.$projectFilesProvider.mapFilePath(filePath, device.deviceInfo.platform, projectData))
|
|
130
126
|
.filter((filePath) => !!filePath)
|
|
131
127
|
.value();
|
|
132
128
|
const projectFilesPath = path.join(platformData.appDestinationDirectoryPath, constants_1.APP_FOLDER_NAME);
|
|
@@ -183,4 +179,3 @@ __decorate([
|
|
|
183
179
|
(0, decorators_1.performanceLog)()
|
|
184
180
|
], PlatformLiveSyncServiceBase.prototype, "liveSyncWatchAction", null);
|
|
185
181
|
exports.PlatformLiveSyncServiceBase = PlatformLiveSyncServiceBase;
|
|
186
|
-
//# sourceMappingURL=platform-livesync-service-base.js.map
|
|
@@ -41,7 +41,6 @@ class LogSourceMapService {
|
|
|
41
41
|
if (!this.$fs.getFsStats(filePath).isDirectory()) {
|
|
42
42
|
const mapFile = filePath + ".map";
|
|
43
43
|
let sourceMapRaw;
|
|
44
|
-
// Skip files bigger than 50MB
|
|
45
44
|
if (this.$fs.getFileSize(filePath) > 50 * 1000 * 1000) {
|
|
46
45
|
this.$logger.trace(`Skipping source map for file ${filePath} because it is too big (> 50MB).`);
|
|
47
46
|
return;
|
|
@@ -167,8 +166,6 @@ class LogSourceMapService {
|
|
|
167
166
|
}
|
|
168
167
|
}
|
|
169
168
|
parseAndroidLog(projectData, rawMessage) {
|
|
170
|
-
// "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap (file:///data/data/org.nativescript.sourceMap/files/app/bundle.js:303:17)"
|
|
171
|
-
// "System.err: File: "file:///data/data/org.nativescript.sourceMap/files/app/bundle.js, line: 304, column: 8"
|
|
172
169
|
const fileIndex = rawMessage.lastIndexOf(LogSourceMapService.FILE_PREFIX);
|
|
173
170
|
const deviceProjectPath = util.format(constants_1.ANDROID_DEVICE_APP_ROOT_TEMPLATE, projectData.projectIdentifiers.android);
|
|
174
171
|
let separator = ",";
|
|
@@ -176,25 +173,18 @@ class LogSourceMapService {
|
|
|
176
173
|
let parts, filePath, line, column, messagePrefix;
|
|
177
174
|
if (fileIndex >= 0) {
|
|
178
175
|
const fileSubstring = rawMessage.substring(fileIndex + LogSourceMapService.FILE_PREFIX.length);
|
|
179
|
-
//"data/data/org.nativescript.sourceMap/files/app/bundle.js, line: 304, column: 8"
|
|
180
176
|
parts = fileSubstring.split(separator);
|
|
181
177
|
if (parts.length >= 3) {
|
|
182
|
-
// "data/data/org.nativescript.sourceMap/files/app/bundle.js"
|
|
183
178
|
parts[0] = parts[0].replace("'", "");
|
|
184
|
-
// " line: 304"
|
|
185
179
|
parts[1] = parts[1].replace(" line: ", "");
|
|
186
|
-
// " column: 8"
|
|
187
180
|
parts[2] = parts[2].replace(" column: ", "");
|
|
188
181
|
}
|
|
189
182
|
else {
|
|
190
|
-
// "data/data/org.nativescript.sourceMap/files/app/bundle.js:303:17)"
|
|
191
183
|
separator = ":";
|
|
192
184
|
parts = fileSubstring.split(separator);
|
|
193
185
|
}
|
|
194
186
|
if (parts.length >= 3) {
|
|
195
|
-
// "/data/data/org.nativescript.sourceMap/files/app/"
|
|
196
187
|
const devicePath = `${deviceProjectPath}/${constants_1.APP_FOLDER_NAME}/`;
|
|
197
|
-
// "bundle.js"
|
|
198
188
|
filePath = path.relative(devicePath, `${"/"}${parts[0]}`);
|
|
199
189
|
line = parseInt(parts[1]);
|
|
200
190
|
column = parseInt(parts[2]);
|
|
@@ -202,24 +192,20 @@ class LogSourceMapService {
|
|
|
202
192
|
for (let i = 3; i < parts.length; i++) {
|
|
203
193
|
messageSuffix += `${parts[i]}${i === parts.length - 1 ? "" : separator}`;
|
|
204
194
|
}
|
|
205
|
-
// "JS: at module.exports.push../main-view-model.ts.HelloWorldModel.onTap ("
|
|
206
195
|
messagePrefix = _.trimEnd(messagePrefix, "(");
|
|
207
196
|
}
|
|
208
197
|
}
|
|
209
198
|
return { filePath, line, column, messagePrefix, messageSuffix };
|
|
210
199
|
}
|
|
211
200
|
parseIosLog(rawMessage) {
|
|
212
|
-
// "CONSOLE INFO file:///app/vendor.js:131:36: HMR: Hot Module Replacement Enabled. Waiting for signal."
|
|
213
201
|
const fileIndex = rawMessage.lastIndexOf(LogSourceMapService.FILE_PREFIX);
|
|
214
202
|
let messageSuffix = "";
|
|
215
203
|
let parts, filePath, line, column, messagePrefix;
|
|
216
204
|
if (fileIndex >= 0) {
|
|
217
|
-
// "app/vendor.js:131:36: HMR: Hot Module Replacement Enabled. Waiting for signal."
|
|
218
205
|
const fileSubstring = rawMessage.substring(fileIndex + LogSourceMapService.FILE_PREFIX.length);
|
|
219
206
|
parts = fileSubstring.split(":");
|
|
220
207
|
if (parts && parts.length >= 3) {
|
|
221
208
|
filePath = parts[0];
|
|
222
|
-
// "app/vendor.js"
|
|
223
209
|
if (_.startsWith(filePath, constants_1.APP_FOLDER_NAME)) {
|
|
224
210
|
filePath = path.relative(constants_1.APP_FOLDER_NAME, parts[0]);
|
|
225
211
|
}
|
|
@@ -248,4 +234,3 @@ LogSourceMapService.FILE_PREFIX_REPLACEMENT = "file: ";
|
|
|
248
234
|
LogSourceMapService.MEMOIZE_FUNCTION_RANDOM_KEY_FOR_JOIN = "__some_random_value__";
|
|
249
235
|
exports.LogSourceMapService = LogSourceMapService;
|
|
250
236
|
yok_1.injector.register("logSourceMapService", LogSourceMapService);
|
|
251
|
-
//# sourceMappingURL=log-source-map-service.js.map
|
|
@@ -15,7 +15,7 @@ const constants_1 = require("../constants");
|
|
|
15
15
|
const yok_1 = require("../common/yok");
|
|
16
16
|
const semver = require("semver/preload");
|
|
17
17
|
const MARKING_MODE_PROP = "markingMode";
|
|
18
|
-
const MARKING_MODE_FULL_DEPRECATION_MSG = `In the current version of NativeScript "${MARKING_MODE_PROP}:${"full"
|
|
18
|
+
const MARKING_MODE_FULL_DEPRECATION_MSG = `In the current version of NativeScript "${MARKING_MODE_PROP}:${"full"}" is no longer supported.`;
|
|
19
19
|
class MarkingModeService {
|
|
20
20
|
constructor($logger, $projectConfigService, $projectHelper, $projectDataService) {
|
|
21
21
|
this.$logger = $logger;
|
|
@@ -28,13 +28,11 @@ class MarkingModeService {
|
|
|
28
28
|
const markingModeValue = this.$projectConfigService.getValue("android.markingMode");
|
|
29
29
|
const { skipWarnings, forceSwitch } = options;
|
|
30
30
|
if (forceSwitch) {
|
|
31
|
-
yield this.setMarkingMode("none"
|
|
31
|
+
yield this.setMarkingMode("none");
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
|
-
if (!skipWarnings && (markingModeValue === null || markingModeValue === void 0 ? void 0 : markingModeValue.toLowerCase()) !== "none"
|
|
35
|
-
|
|
36
|
-
// if version is null - we are about to add the latest runtime, so no need to warn
|
|
37
|
-
const { version } = this.$projectDataService.getRuntimePackage(this.$projectHelper.projectDir, "android" /* PlatformTypes.android */);
|
|
34
|
+
if (!skipWarnings && (markingModeValue === null || markingModeValue === void 0 ? void 0 : markingModeValue.toLowerCase()) !== "none") {
|
|
35
|
+
const { version } = this.$projectDataService.getRuntimePackage(this.$projectHelper.projectDir, "android");
|
|
38
36
|
const isMarkingModeFullDefault = version && semver.lt(semver.coerce(version), "7.0.0-rc.5");
|
|
39
37
|
if (isMarkingModeFullDefault) {
|
|
40
38
|
this.showMarkingModeFullWarning();
|
|
@@ -48,7 +46,7 @@ class MarkingModeService {
|
|
|
48
46
|
});
|
|
49
47
|
}
|
|
50
48
|
showMarkingModeFullWarning() {
|
|
51
|
-
const markingModeFullWarning = `You are using the deprecated "${MARKING_MODE_PROP}:${"full"
|
|
49
|
+
const markingModeFullWarning = `You are using the deprecated "${MARKING_MODE_PROP}:${"full"}".${os_1.EOL}${os_1.EOL}${MARKING_MODE_FULL_DEPRECATION_MSG}${os_1.EOL}${os_1.EOL}You should update your marking mode by executing 'ns update --markingMode'.`;
|
|
52
50
|
this.$logger.warn(markingModeFullWarning, {
|
|
53
51
|
[constants_1.LoggerConfigData.wrapMessageWithBorders]: true,
|
|
54
52
|
});
|
|
@@ -56,4 +54,3 @@ class MarkingModeService {
|
|
|
56
54
|
}
|
|
57
55
|
exports.MarkingModeService = MarkingModeService;
|
|
58
56
|
yok_1.injector.register("markingModeService", MarkingModeService);
|
|
59
|
-
//# sourceMappingURL=marking-mode-service.js.map
|