nativescript 8.8.3 → 8.9.0-alpha.1
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 +4 -3
|
@@ -82,7 +82,6 @@ class CocoaPodsPlatformManager {
|
|
|
82
82
|
_.each(allPodfiles, (podfileContent) => {
|
|
83
83
|
const platformMatch = platformRowRegExp.exec(podfileContent);
|
|
84
84
|
const podfilePathMatch = podfilePathRegExp.exec(podfileContent) || [];
|
|
85
|
-
// platform without version -> select it with highest priority
|
|
86
85
|
if (platformMatch && platformMatch[0] && !platformMatch[2]) {
|
|
87
86
|
selectedPlatformData = {
|
|
88
87
|
version: null,
|
|
@@ -91,7 +90,6 @@ class CocoaPodsPlatformManager {
|
|
|
91
90
|
};
|
|
92
91
|
return false;
|
|
93
92
|
}
|
|
94
|
-
// platform with version
|
|
95
93
|
if (platformMatch && platformMatch[0] && platformMatch[2]) {
|
|
96
94
|
if (!selectedPlatformData ||
|
|
97
95
|
semver.gt(semver.coerce(platformMatch[2]), semver.coerce(selectedPlatformData.version))) {
|
|
@@ -106,12 +104,6 @@ class CocoaPodsPlatformManager {
|
|
|
106
104
|
return selectedPlatformData;
|
|
107
105
|
}
|
|
108
106
|
shouldReplacePlatformSection(projectData, oldPodfilePlatformData, currentPodfilePlatformData) {
|
|
109
|
-
// The selected platform should be replaced in the following cases:
|
|
110
|
-
// 1. When the pod file is from App_Resources and the selected platform is not from App_Resources
|
|
111
|
-
// 2. When the pod file is from App_Resources, the selected platform is also from App_Resources
|
|
112
|
-
// and the pod's version is greater than the selected one
|
|
113
|
-
// 3. When the pod file doesn't have platform's version -> `platform :ios`
|
|
114
|
-
// 4. When the pod file has a version greater than the selected platform's version
|
|
115
107
|
const appResourcesPodfilePath = path.join(projectData.getAppResourcesDirectoryPath(), "iOS", constants_1.PODFILE_NAME);
|
|
116
108
|
const isFromAppResources = oldPodfilePlatformData.path !== appResourcesPodfilePath &&
|
|
117
109
|
currentPodfilePlatformData.path === appResourcesPodfilePath;
|
|
@@ -143,4 +135,3 @@ class CocoaPodsPlatformManager {
|
|
|
143
135
|
}
|
|
144
136
|
exports.CocoaPodsPlatformManager = CocoaPodsPlatformManager;
|
|
145
137
|
yok_1.injector.register("cocoaPodsPlatformManager", CocoaPodsPlatformManager);
|
|
146
|
-
//# sourceMappingURL=cocoapods-platform-manager.js.map
|
|
@@ -44,12 +44,6 @@ class CocoaPodsService {
|
|
|
44
44
|
let podTool = this.$config.USE_POD_SANDBOX ? "sandbox-pod" : "pod";
|
|
45
45
|
const args = ["install"];
|
|
46
46
|
if (process.platform === "darwin" && process.arch === "arm64") {
|
|
47
|
-
// check if pod is installed as an x86_64 binary or a native arm64 one
|
|
48
|
-
// we run the following:
|
|
49
|
-
// arch -x86_64 pod --version
|
|
50
|
-
// if it's an arm64 binary, we'll get something like this as a result:
|
|
51
|
-
// arch: posix_spawnp: pod: Bad CPU type in executable
|
|
52
|
-
// in which case, we should run it natively.
|
|
53
47
|
const res = yield this.$childProcess
|
|
54
48
|
.exec("arch -x86_64 pod --version", null, {
|
|
55
49
|
showStderr: true,
|
|
@@ -63,11 +57,8 @@ class CocoaPodsService {
|
|
|
63
57
|
podTool = "arch";
|
|
64
58
|
}
|
|
65
59
|
}
|
|
66
|
-
// cocoapods print a lot of non-error information on stderr. Pipe the `stderr` to `stdout`, so we won't polute CLI's stderr output.
|
|
67
60
|
const podInstallResult = yield this.$childProcess.spawnFromEvent(podTool, args, "close", { cwd: projectRoot, stdio: ["pipe", process.stdout, process.stdout] }, { throwError: false });
|
|
68
61
|
if (podInstallResult.exitCode !== 0) {
|
|
69
|
-
// https://github.com/CocoaPods/CocoaPods/blob/92aaf0f1120d32f3487960b485fb69fcaf61486c/lib/cocoapods/resolver.rb#L498
|
|
70
|
-
// TODO add article
|
|
71
62
|
const versionResolutionHint = podInstallResult.exitCode === 31
|
|
72
63
|
? `For more information on resolving CocoaPod issues in NativeScript read.`
|
|
73
64
|
: "";
|
|
@@ -105,7 +96,6 @@ ${versionResolutionHint}`);
|
|
|
105
96
|
applyPodfileArchExclusions(projectData, platformData) {
|
|
106
97
|
return __awaiter(this, void 0, void 0, function* () {
|
|
107
98
|
const xcodeVersionData = yield this.$xcodeSelectService.getXcodeVersion();
|
|
108
|
-
// only apply EXCLUDED_ARCHS workaround on XCode 12
|
|
109
99
|
if (+xcodeVersionData.major !== 12) {
|
|
110
100
|
return;
|
|
111
101
|
}
|
|
@@ -124,7 +114,6 @@ end`.trim();
|
|
|
124
114
|
this.$fs.writeFile(exclusionsPodfile, exclusions);
|
|
125
115
|
}
|
|
126
116
|
yield this.applyPodfileToProject("NativeScript-CLI-Architecture-Exclusions", exclusionsPodfile, projectData, platformData);
|
|
127
|
-
// clean up
|
|
128
117
|
this.$fs.deleteFile(exclusionsPodfile);
|
|
129
118
|
});
|
|
130
119
|
}
|
|
@@ -149,7 +138,6 @@ end`.trim();
|
|
|
149
138
|
podfilePath: path.join(extensionFolderPath, name, constants.PODFILE_NAME),
|
|
150
139
|
}));
|
|
151
140
|
extensionsPodfile.forEach(({ targetName, podfilePath }) => {
|
|
152
|
-
// Remove the data between #Begin Podfile and #EndPodfile
|
|
153
141
|
const regExpToRemove = new RegExp(`${this.getExtensionPodfileHeader(podfilePath, targetName)}[\\s\\S]*?${this.getExtensionPodfileEnd()}`, "mg");
|
|
154
142
|
projectPodFileContent = projectPodFileContent.replace(regExpToRemove, "");
|
|
155
143
|
if (this.$fs.exists(podfilePath)) {
|
|
@@ -178,7 +166,6 @@ end`.trim();
|
|
|
178
166
|
? this.$fs.readText(pathToProjectPodfile).trim()
|
|
179
167
|
: "";
|
|
180
168
|
if (projectPodfileContent.indexOf(podfileContent) === -1) {
|
|
181
|
-
// Remove old occurences of the plugin from the project's Podfile.
|
|
182
169
|
this.removePodfileFromProject(moduleName, podfilePath, projectData, nativeProjectPath);
|
|
183
170
|
let finalPodfileContent = this.$fs.exists(pathToProjectPodfile)
|
|
184
171
|
? this.getPodfileContentWithoutTarget(projectData, this.$fs.readText(pathToProjectPodfile))
|
|
@@ -197,7 +184,6 @@ end`.trim();
|
|
|
197
184
|
removePodfileFromProject(moduleName, podfilePath, projectData, projectRoot) {
|
|
198
185
|
if (this.$fs.exists(this.getProjectPodfilePath(projectRoot))) {
|
|
199
186
|
let projectPodFileContent = this.$fs.readText(this.getProjectPodfilePath(projectRoot));
|
|
200
|
-
// Remove the data between #Begin Podfile and #EndPodfile
|
|
201
187
|
const regExpToRemove = new RegExp(`${this.getPluginPodfileHeader(podfilePath)}[\\s\\S]*?${this.getPluginPodfileEnd()}`, "mg");
|
|
202
188
|
projectPodFileContent = projectPodFileContent.replace(regExpToRemove, "");
|
|
203
189
|
projectPodFileContent = this.removePostInstallHook(moduleName, projectPodFileContent);
|
|
@@ -218,7 +204,7 @@ end`.trim();
|
|
|
218
204
|
}
|
|
219
205
|
}
|
|
220
206
|
getPluginPodfilePath(pluginData) {
|
|
221
|
-
const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath("ios"
|
|
207
|
+
const pluginPlatformsFolderPath = pluginData.pluginPlatformsFolderPath("ios");
|
|
222
208
|
const pluginPodFilePath = path.join(pluginPlatformsFolderPath, constants_1.PODFILE_NAME);
|
|
223
209
|
return pluginPodFilePath;
|
|
224
210
|
}
|
|
@@ -254,7 +240,6 @@ end`.trim();
|
|
|
254
240
|
if (_.startsWith(projectPodfileContent, podFileHeader)) {
|
|
255
241
|
projectPodfileContent = projectPodfileContent.substr(podFileHeader.length);
|
|
256
242
|
const podFileFooter = this.getPodfileFooter();
|
|
257
|
-
// Only remove the final end in case the file starts with the podFileHeader
|
|
258
243
|
if (_.endsWith(projectPodfileContent, podFileFooter)) {
|
|
259
244
|
projectPodfileContent = projectPodfileContent.substr(0, projectPodfileContent.length - podFileFooter.length);
|
|
260
245
|
}
|
|
@@ -275,8 +260,6 @@ end`.trim();
|
|
|
275
260
|
return projectPodFileContent;
|
|
276
261
|
}
|
|
277
262
|
getHookBasicFuncNameForPlugin(hookName, pluginName) {
|
|
278
|
-
// nativescript-hook and nativescript_hook should have different names, so replace all _ with ___ first and then replace all special symbols with _
|
|
279
|
-
// This will lead to a clash in case plugins are called nativescript-hook and nativescript___hook
|
|
280
263
|
const replacedPluginName = pluginName
|
|
281
264
|
.replace(/_/g, "___")
|
|
282
265
|
.replace(/[^A-Za-z0-9_]/g, "_");
|
|
@@ -290,7 +273,6 @@ end`.trim();
|
|
|
290
273
|
const newFunctionName = `${this.getHookBasicFuncNameForPlugin(hookName, pluginName)}_${newFunctions.length}`;
|
|
291
274
|
let newDefinition = `def ${newFunctionName}`;
|
|
292
275
|
const rubyFunction = { functionName: newFunctionName };
|
|
293
|
-
// firstGroup is the block parameter, secondGroup is the block parameter name.
|
|
294
276
|
if (firstGroup && secondGroup) {
|
|
295
277
|
newDefinition = `${newDefinition} (${secondGroup})`;
|
|
296
278
|
rubyFunction.functionParameters = secondGroup;
|
|
@@ -301,7 +283,6 @@ end`.trim();
|
|
|
301
283
|
return { replacedContent, newFunctions };
|
|
302
284
|
}
|
|
303
285
|
getPluginPodfileHeader(pluginPodFilePath) {
|
|
304
|
-
// escape special + from the podfile path (pnpm)
|
|
305
286
|
pluginPodFilePath = pluginPodFilePath.replace(/\+/g, "\\+");
|
|
306
287
|
return `# Begin Podfile - ${pluginPodFilePath}`;
|
|
307
288
|
}
|
|
@@ -371,4 +352,3 @@ CocoaPodsService.PODFILE_POST_INSTALL_SECTION_NAME = "post_install";
|
|
|
371
352
|
CocoaPodsService.INSTALLER_BLOCK_PARAMETER_NAME = "installer";
|
|
372
353
|
exports.CocoaPodsService = CocoaPodsService;
|
|
373
354
|
yok_1.injector.register("cocoapodsService", CocoaPodsService);
|
|
374
|
-
//# sourceMappingURL=cocoapods-service.js.map
|
|
@@ -27,12 +27,6 @@ class DebugServiceBase extends events_1.EventEmitter {
|
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
getChromeDebugUrl(debugOptions, port) {
|
|
30
|
-
// corresponds to 55.0.2883 Chrome version
|
|
31
|
-
// SHA is taken from https://chromium.googlesource.com/chromium/src/+/55.0.2883.100
|
|
32
|
-
// This SHA is old and does not support debugging with HMR.
|
|
33
|
-
// In case we want to stick with concrete SHA, get it from one of the tags https://chromium.googlesource.com/chromium/src/
|
|
34
|
-
// IMPORTANT: When you get the SHA, ensure you are using the `parent` commit, not the actual one.
|
|
35
|
-
// Using the actual commit will result in 404 error in the remote serve.
|
|
36
30
|
const commitSHA = debugOptions.devToolsCommit || "02e6bde1bbe34e43b309d4ef774b1168d25fd024";
|
|
37
31
|
const devToolsProtocol = `devtools`;
|
|
38
32
|
let chromeDevToolsPrefix = `${devToolsProtocol}://devtools/remote/serve_file/@${commitSHA}`;
|
|
@@ -48,4 +42,3 @@ class DebugServiceBase extends events_1.EventEmitter {
|
|
|
48
42
|
}
|
|
49
43
|
}
|
|
50
44
|
exports.DebugServiceBase = DebugServiceBase;
|
|
51
|
-
//# sourceMappingURL=debug-service-base.js.map
|
|
@@ -31,7 +31,7 @@ class DeviceInstallAppService {
|
|
|
31
31
|
const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
|
|
32
32
|
const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
|
|
33
33
|
yield this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
34
|
-
action: "Deploy"
|
|
34
|
+
action: "Deploy",
|
|
35
35
|
device,
|
|
36
36
|
projectDir: projectData.projectDir,
|
|
37
37
|
});
|
|
@@ -94,4 +94,3 @@ class DeviceInstallAppService {
|
|
|
94
94
|
}
|
|
95
95
|
exports.DeviceInstallAppService = DeviceInstallAppService;
|
|
96
96
|
yok_1.injector.register("deviceInstallAppService", DeviceInstallAppService);
|
|
97
|
-
//# sourceMappingURL=device-install-app-service.js.map
|
|
@@ -62,13 +62,9 @@ class DoctorService {
|
|
|
62
62
|
this.printPackageManagerTip();
|
|
63
63
|
}
|
|
64
64
|
if (!configOptions || configOptions.trackResult) {
|
|
65
|
-
// TODO(Analytics): Consider sending this information to Google Analytics
|
|
66
|
-
// await this.$analyticsService.track("DoctorEnvironmentSetup", hasWarnings ? "incorrect" : "correct");
|
|
67
65
|
}
|
|
68
66
|
if (hasWarnings) {
|
|
69
67
|
this.$logger.info("There seem to be issues with your configuration.");
|
|
70
|
-
// cleanup the cache file as there seems to be issues with the current config
|
|
71
|
-
// all projects need to be rechecked
|
|
72
68
|
this.$fs.deleteFile(this.jsonFileSettingsPath);
|
|
73
69
|
}
|
|
74
70
|
else {
|
|
@@ -82,7 +78,6 @@ class DoctorService {
|
|
|
82
78
|
catch (err) {
|
|
83
79
|
this.$logger.error("Cannot get the latest versions information from npm. Please try again later.");
|
|
84
80
|
}
|
|
85
|
-
// todo: check for deprecated imports from `tns-core-modules`
|
|
86
81
|
this.checkForDeprecatedShortImportsInAppDir(configOptions.projectDir);
|
|
87
82
|
yield this.$injector
|
|
88
83
|
.resolve("platformEnvironmentRequirements")
|
|
@@ -97,12 +92,12 @@ class DoctorService {
|
|
|
97
92
|
runSetupScript() {
|
|
98
93
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
94
|
yield this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
100
|
-
action: "Run Setup Script"
|
|
95
|
+
action: "Run Setup Script",
|
|
101
96
|
additionalData: "Starting",
|
|
102
97
|
});
|
|
103
98
|
if (this.$hostInfo.isLinux) {
|
|
104
99
|
yield this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
105
|
-
action: "Run Setup Script"
|
|
100
|
+
action: "Run Setup Script",
|
|
106
101
|
additionalData: "Skipped as OS is Linux",
|
|
107
102
|
});
|
|
108
103
|
return;
|
|
@@ -115,7 +110,7 @@ class DoctorService {
|
|
|
115
110
|
yield this.runSetupScriptCore(DoctorService.WindowsSetupScriptExecutable, DoctorService.WindowsSetupScriptArguments);
|
|
116
111
|
}
|
|
117
112
|
yield this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
118
|
-
action: "Run Setup Script"
|
|
113
|
+
action: "Run Setup Script",
|
|
119
114
|
additionalData: "Finished",
|
|
120
115
|
});
|
|
121
116
|
});
|
|
@@ -123,7 +118,7 @@ class DoctorService {
|
|
|
123
118
|
canExecuteLocalBuild(configuration) {
|
|
124
119
|
return __awaiter(this, void 0, void 0, function* () {
|
|
125
120
|
yield this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
126
|
-
action: "Check Local Build Setup"
|
|
121
|
+
action: "Check Local Build Setup",
|
|
127
122
|
additionalData: "Starting",
|
|
128
123
|
});
|
|
129
124
|
const sysInfoConfig = {
|
|
@@ -135,11 +130,9 @@ class DoctorService {
|
|
|
135
130
|
const warnings = this.filterInfosByType(infos, doctor_1.constants.WARNING_TYPE_NAME);
|
|
136
131
|
const hasWarnings = warnings.length > 0;
|
|
137
132
|
if (hasWarnings) {
|
|
138
|
-
// cleanup the cache file as there seems to be issues with the current config
|
|
139
|
-
// all projects need to be rechecked
|
|
140
133
|
this.$fs.deleteFile(this.jsonFileSettingsPath);
|
|
141
134
|
yield this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
142
|
-
action: "Check Local Build Setup"
|
|
135
|
+
action: "Check Local Build Setup",
|
|
143
136
|
additionalData: `Warnings:${warnings.map((w) => w.message).join("__")}`,
|
|
144
137
|
});
|
|
145
138
|
this.printInfosCore(infos);
|
|
@@ -149,7 +142,7 @@ class DoctorService {
|
|
|
149
142
|
yield this.$jsonFileSettingsService.saveSetting(this.getKeyForConfiguration(sysInfoConfig), infos);
|
|
150
143
|
}
|
|
151
144
|
yield this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
152
|
-
action: "Check Local Build Setup"
|
|
145
|
+
action: "Check Local Build Setup",
|
|
153
146
|
additionalData: `Finished: Is setup correct: ${!hasWarnings}`,
|
|
154
147
|
});
|
|
155
148
|
return !hasWarnings;
|
|
@@ -198,13 +191,6 @@ class DoctorService {
|
|
|
198
191
|
.getFsStats(path.join(pathToTnsCoreModules, entry))
|
|
199
192
|
.isDirectory());
|
|
200
193
|
const stringRegularExpressionsPerDir = coreModulesSubDirs.map((c) => {
|
|
201
|
-
// require("text");
|
|
202
|
-
// require("text/smth");
|
|
203
|
-
// require( "text/smth");
|
|
204
|
-
// require( "text/smth" );
|
|
205
|
-
// import * as text from "text";
|
|
206
|
-
// import { a } from "text";
|
|
207
|
-
// import {a } from "text/abc"
|
|
208
194
|
const subDirPart = `[\"\']${c}[\"\'/]`;
|
|
209
195
|
return `(\\brequire\\s*?\\(\\s*?${subDirPart})|(\\bimport\\b.*?from\\s*?${subDirPart})`;
|
|
210
196
|
});
|
|
@@ -306,4 +292,3 @@ __decorate([
|
|
|
306
292
|
], DoctorService.prototype, "$jsonFileSettingsService", null);
|
|
307
293
|
exports.DoctorService = DoctorService;
|
|
308
294
|
yok_1.injector.register("doctorService", DoctorService);
|
|
309
|
-
//# sourceMappingURL=doctor-service.js.map
|
|
@@ -135,17 +135,12 @@ class ExtensibilityService {
|
|
|
135
135
|
for (const extensionData of allExtensions) {
|
|
136
136
|
const extensionName = extensionData.package.name;
|
|
137
137
|
try {
|
|
138
|
-
// now get full package.json for the latest version of the package
|
|
139
138
|
const registryData = yield this.$packageManager.getRegistryPackageData(extensionName);
|
|
140
139
|
const latestPackageData = registryData.versions[registryData["dist-tags"].latest];
|
|
141
140
|
const commands = latestPackageData &&
|
|
142
141
|
latestPackageData.nativescript &&
|
|
143
142
|
latestPackageData.nativescript.commands;
|
|
144
143
|
if (commands && commands.length) {
|
|
145
|
-
// For each default command we need to add its short syntax in the array of commands.
|
|
146
|
-
// For example in case there's a default command called devices list, the commands array will contain devices|*list.
|
|
147
|
-
// However, in case the user executes just tns devices, CLI will still execute the tns devices list command.
|
|
148
|
-
// So we need to add the devices command as well.
|
|
149
144
|
_.filter(commands, (command) => command.indexOf(inputOpts.defaultCommandDelimiter) !== -1).forEach((defaultCommand) => {
|
|
150
145
|
commands.push(defaultCommand.replace(defaultCommandRegExp, ""));
|
|
151
146
|
});
|
|
@@ -167,7 +162,6 @@ class ExtensibilityService {
|
|
|
167
162
|
}
|
|
168
163
|
}
|
|
169
164
|
catch (err) {
|
|
170
|
-
// We do not want to stop the whole process in case we are unable to find data for one of the extensions.
|
|
171
165
|
this.$logger.trace(`Unable to get data for ${extensionName}. Error is: ${err}`);
|
|
172
166
|
}
|
|
173
167
|
}
|
|
@@ -203,7 +197,6 @@ class ExtensibilityService {
|
|
|
203
197
|
this.assertExtensionsDirExists();
|
|
204
198
|
if (!this.$fs.exists(this.pathToPackageJson)) {
|
|
205
199
|
this.$logger.trace(`Creating ${this.pathToPackageJson}.`);
|
|
206
|
-
// create default package.json
|
|
207
200
|
this.$fs.writeJson(this.pathToPackageJson, {
|
|
208
201
|
name: "nativescript-extensibility",
|
|
209
202
|
version: "1.0.0",
|
|
@@ -225,4 +218,3 @@ __decorate([
|
|
|
225
218
|
], ExtensibilityService.prototype, "assertPackageJsonExists", null);
|
|
226
219
|
exports.ExtensibilityService = ExtensibilityService;
|
|
227
220
|
yok_1.injector.register("extensibilityService", ExtensibilityService);
|
|
228
|
-
//# sourceMappingURL=extensibility-service.js.map
|
|
@@ -56,7 +56,6 @@ class HmrStatusService {
|
|
|
56
56
|
name: "failedLiveSync",
|
|
57
57
|
platform: this.$devicePlatformsConstants.iOS.toLowerCase(),
|
|
58
58
|
});
|
|
59
|
-
// webpack5
|
|
60
59
|
const statusStringMap = {
|
|
61
60
|
success: constants_1.HmrConstants.HMR_SUCCESS_STATUS,
|
|
62
61
|
failure: constants_1.HmrConstants.HMR_ERROR_STATUS,
|
|
@@ -127,4 +126,3 @@ __decorate([
|
|
|
127
126
|
], HmrStatusService.prototype, "attachToHmrStatusEvent", null);
|
|
128
127
|
exports.HmrStatusService = HmrStatusService;
|
|
129
128
|
yok_1.injector.register("hmrStatusService", HmrStatusService);
|
|
130
|
-
//# sourceMappingURL=hmr-status-service.js.map
|
|
@@ -15,8 +15,6 @@ const _ = require("lodash");
|
|
|
15
15
|
const constants_1 = require("../constants");
|
|
16
16
|
const yok_1 = require("../common/yok");
|
|
17
17
|
class InitializeService {
|
|
18
|
-
// NOTE: Do not inject anything here, use $injector.resolve in the code
|
|
19
|
-
// Injecting something may lead to logger initialization, but we want to initialize it from here.
|
|
20
18
|
constructor($injector) {
|
|
21
19
|
this.$injector = $injector;
|
|
22
20
|
}
|
|
@@ -45,7 +43,6 @@ class InitializeService {
|
|
|
45
43
|
}
|
|
46
44
|
}
|
|
47
45
|
if ($options.json) {
|
|
48
|
-
// speed up --json commands by not gathering system warnings...
|
|
49
46
|
$logger.trace("Skipping system warnings for --json commands");
|
|
50
47
|
}
|
|
51
48
|
else {
|
|
@@ -59,7 +56,7 @@ class InitializeService {
|
|
|
59
56
|
const systemWarnings = yield $sysInfo.getSystemWarnings();
|
|
60
57
|
_.each(systemWarnings, (systemWarning) => {
|
|
61
58
|
const message = `${os_1.EOL}${systemWarning.message}${os_1.EOL}`;
|
|
62
|
-
if (systemWarning.severity === "high"
|
|
59
|
+
if (systemWarning.severity === "high") {
|
|
63
60
|
$logger.error(message);
|
|
64
61
|
}
|
|
65
62
|
else {
|
|
@@ -71,4 +68,3 @@ class InitializeService {
|
|
|
71
68
|
}
|
|
72
69
|
exports.InitializeService = InitializeService;
|
|
73
70
|
yok_1.injector.register("initializeService", InitializeService);
|
|
74
|
-
//# sourceMappingURL=initialize-service.js.map
|
|
@@ -64,13 +64,11 @@ class ExportOptionsPlistService {
|
|
|
64
64
|
plistTemplate += `
|
|
65
65
|
</dict>
|
|
66
66
|
</plist>`;
|
|
67
|
-
// Save the options...
|
|
68
67
|
const exportOptionsPlistFilePath = yield this.$tempService.path({
|
|
69
68
|
prefix: "export-",
|
|
70
69
|
suffix: ".plist",
|
|
71
70
|
});
|
|
72
71
|
this.$fs.writeFile(exportOptionsPlistFilePath, plistTemplate);
|
|
73
|
-
// The xcodebuild exportPath expects directory and writes the <project-name>.ipa at that directory.
|
|
74
72
|
const exportFileDir = path.resolve(path.dirname(archivePath));
|
|
75
73
|
const exportFilePath = path.join(exportFileDir, projectData.projectName + ".ipa");
|
|
76
74
|
return { exportFileDir, exportFilePath, exportOptionsPlistFilePath };
|
|
@@ -91,7 +89,9 @@ class ExportOptionsPlistService {
|
|
|
91
89
|
`;
|
|
92
90
|
}
|
|
93
91
|
if (provision) {
|
|
94
|
-
plistTemplate += `
|
|
92
|
+
plistTemplate += ` <key>signingStyle</key>
|
|
93
|
+
<string>manual</string>
|
|
94
|
+
<key>provisioningProfiles</key>
|
|
95
95
|
<dict>
|
|
96
96
|
<key>${projectData.projectIdentifiers.ios}</key>
|
|
97
97
|
<string>${provision}</string>
|
|
@@ -99,7 +99,7 @@ class ExportOptionsPlistService {
|
|
|
99
99
|
</dict>`;
|
|
100
100
|
}
|
|
101
101
|
plistTemplate += ` <key>method</key>
|
|
102
|
-
<string>app-store</string>
|
|
102
|
+
<string>app-store-connect</string>
|
|
103
103
|
<key>uploadBitcode</key>
|
|
104
104
|
<false/>
|
|
105
105
|
<key>compileBitcode</key>
|
|
@@ -108,7 +108,6 @@ class ExportOptionsPlistService {
|
|
|
108
108
|
<false/>
|
|
109
109
|
</dict>
|
|
110
110
|
</plist>`;
|
|
111
|
-
// Save the options...
|
|
112
111
|
const exportOptionsPlistFilePath = yield this.$tempService.path({
|
|
113
112
|
prefix: "export-",
|
|
114
113
|
suffix: ".plist",
|
|
@@ -132,4 +131,3 @@ class ExportOptionsPlistService {
|
|
|
132
131
|
}
|
|
133
132
|
exports.ExportOptionsPlistService = ExportOptionsPlistService;
|
|
134
133
|
yok_1.injector.register("exportOptionsPlistService", ExportOptionsPlistService);
|
|
135
|
-
//# sourceMappingURL=export-options-plist-service.js.map
|
|
@@ -57,7 +57,6 @@ class IOSSigningService {
|
|
|
57
57
|
let shouldUpdateXcode = false;
|
|
58
58
|
if (signing && signing.style === "Automatic") {
|
|
59
59
|
if (signing.team !== teamId) {
|
|
60
|
-
// Maybe the provided team is name such as "Telerik AD" and we need to convert it to CH******37
|
|
61
60
|
const teamIdsForName = yield this.$iOSProvisionService.getTeamIdsWithName(teamId);
|
|
62
61
|
if (!teamIdsForName.some((id) => id === signing.team)) {
|
|
63
62
|
shouldUpdateXcode = true;
|
|
@@ -93,7 +92,6 @@ class IOSSigningService {
|
|
|
93
92
|
setupSigningFromProvision(projectRoot, projectData, provision, mobileProvisionData) {
|
|
94
93
|
return __awaiter(this, void 0, void 0, function* () {
|
|
95
94
|
if (!provision) {
|
|
96
|
-
// read uuid from Xcode an cache...
|
|
97
95
|
return;
|
|
98
96
|
}
|
|
99
97
|
const xcode = this.$pbxprojDomXcode.Xcode.open(this.getPbxProjPath(projectData, projectRoot));
|
|
@@ -126,7 +124,6 @@ class IOSSigningService {
|
|
|
126
124
|
this.$logger.trace(`Set Manual signing style and provisioning profile: ${configuration.name} (${configuration.uuid})`);
|
|
127
125
|
});
|
|
128
126
|
xcode.save();
|
|
129
|
-
// this.cache(uuid);
|
|
130
127
|
}
|
|
131
128
|
else {
|
|
132
129
|
this.$logger.trace(`The specified provisioning profile is already set in the Xcode: ${provision}`);
|
|
@@ -198,6 +195,18 @@ class IOSSigningService {
|
|
|
198
195
|
getPbxProjPath(projectData, projectRoot) {
|
|
199
196
|
return path.join(this.$xcprojService.getXcodeprojPath(projectData, projectRoot), "project.pbxproj");
|
|
200
197
|
}
|
|
198
|
+
readTeamIdFromFile(projectRoot) {
|
|
199
|
+
try {
|
|
200
|
+
const filePath = path.join(projectRoot, "teamid");
|
|
201
|
+
if (this.$fs.exists(filePath)) {
|
|
202
|
+
return this.$fs.readText(filePath);
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
catch (e) {
|
|
206
|
+
this.$logger.trace("Unable to read file: teamid. Error is: ", e);
|
|
207
|
+
}
|
|
208
|
+
return undefined;
|
|
209
|
+
}
|
|
201
210
|
getDevelopmentTeam(projectData, projectRoot, teamId) {
|
|
202
211
|
return __awaiter(this, void 0, void 0, function* () {
|
|
203
212
|
teamId = teamId || this.readXCConfigDevelopmentTeam(projectData);
|
|
@@ -217,30 +226,40 @@ class IOSSigningService {
|
|
|
217
226
|
if (!helpers.isInteractive()) {
|
|
218
227
|
this.$errors.fail(`Unable to determine default development team. Available development teams are: ${_.map(teams, (team) => team.id)}. Specify team in app/App_Resources/iOS/build.xcconfig file in the following way: DEVELOPMENT_TEAM = <team id>`);
|
|
219
228
|
}
|
|
220
|
-
const
|
|
221
|
-
|
|
222
|
-
|
|
229
|
+
const fromFile = this.readTeamIdFromFile(projectRoot);
|
|
230
|
+
if (fromFile) {
|
|
231
|
+
const idFromFile = teams.find((value) => value.id === fromFile);
|
|
232
|
+
if (idFromFile) {
|
|
233
|
+
teamId = idFromFile.id;
|
|
234
|
+
this.$logger.info(`Team Id resolved from file: '${teamId}'.`);
|
|
235
|
+
}
|
|
223
236
|
}
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
237
|
+
if (!teamId) {
|
|
238
|
+
const choices = [];
|
|
239
|
+
for (const team of teams) {
|
|
240
|
+
choices.push(team.name + " (" + team.id + ")");
|
|
241
|
+
}
|
|
242
|
+
const choice = yield this.$prompter.promptForChoice("Found multiple development teams, select one:", choices);
|
|
243
|
+
teamId = teams[choices.indexOf(choice)].id;
|
|
244
|
+
const choicesPersist = [
|
|
245
|
+
"Yes, set the DEVELOPMENT_TEAM setting in build.xcconfig file.",
|
|
246
|
+
"Yes, persist the team id in platforms folder.",
|
|
247
|
+
"No, don't persist this setting.",
|
|
248
|
+
];
|
|
249
|
+
const choicePersist = yield this.$prompter.promptForChoice("Do you want to make teamId: " +
|
|
250
|
+
teamId +
|
|
251
|
+
" a persistent choice for your app?", choicesPersist);
|
|
252
|
+
switch (choicesPersist.indexOf(choicePersist)) {
|
|
253
|
+
case 0:
|
|
254
|
+
const xcconfigFile = path.join(projectData.appResourcesDirectoryPath, "iOS", constants_1.BUILD_XCCONFIG_FILE_NAME);
|
|
255
|
+
this.$fs.appendFile(xcconfigFile, "\nDEVELOPMENT_TEAM = " + teamId + "\n");
|
|
256
|
+
break;
|
|
257
|
+
case 1:
|
|
258
|
+
this.$fs.writeFile(path.join(projectRoot, "teamid"), teamId);
|
|
259
|
+
break;
|
|
260
|
+
default:
|
|
261
|
+
break;
|
|
262
|
+
}
|
|
244
263
|
}
|
|
245
264
|
}
|
|
246
265
|
}
|
|
@@ -266,4 +285,3 @@ class IOSSigningService {
|
|
|
266
285
|
}
|
|
267
286
|
exports.IOSSigningService = IOSSigningService;
|
|
268
287
|
yok_1.injector.register("iOSSigningService", IOSSigningService);
|
|
269
|
-
//# sourceMappingURL=ios-signing-service.js.map
|
|
@@ -24,10 +24,6 @@ class SPMService {
|
|
|
24
24
|
const spmPackages = this.$projectConfigService.getValue(`${platform}.SPMPackages`, []);
|
|
25
25
|
return spmPackages;
|
|
26
26
|
}
|
|
27
|
-
// note: this is not used anywhere at the moment.
|
|
28
|
-
// public hasSPMPackages(projectData: IProjectData): boolean {
|
|
29
|
-
// return this.getSPMPackages(projectData).length > 0;
|
|
30
|
-
// }
|
|
31
27
|
applySPMPackages(platformData, projectData) {
|
|
32
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
33
29
|
try {
|
|
@@ -43,15 +39,12 @@ class SPMService {
|
|
|
43
39
|
enableAndroid: false,
|
|
44
40
|
});
|
|
45
41
|
yield project.load();
|
|
46
|
-
// note: in trapeze both visionOS and iOS are handled by the ios project.
|
|
47
42
|
if (!project.ios) {
|
|
48
43
|
this.$logger.trace("SPM: no iOS project found via trapeze.");
|
|
49
44
|
return;
|
|
50
45
|
}
|
|
51
|
-
// todo: handle removing packages? Or just warn and require a clean?
|
|
52
46
|
for (const pkg of spmPackages) {
|
|
53
47
|
if ("path" in pkg) {
|
|
54
|
-
// resolve the path relative to the project root
|
|
55
48
|
this.$logger.trace("SPM: resolving path for package: ", pkg.path);
|
|
56
49
|
pkg.path = path.resolve(projectData.projectDir, pkg.path);
|
|
57
50
|
}
|
|
@@ -59,7 +52,6 @@ class SPMService {
|
|
|
59
52
|
yield project.ios.addSPMPackage(projectData.projectName, pkg);
|
|
60
53
|
}
|
|
61
54
|
yield project.commit();
|
|
62
|
-
// finally resolve the dependencies
|
|
63
55
|
yield this.resolveSPMDependencies(platformData, projectData);
|
|
64
56
|
}
|
|
65
57
|
catch (err) {
|
|
@@ -84,4 +76,3 @@ class SPMService {
|
|
|
84
76
|
}
|
|
85
77
|
exports.SPMService = SPMService;
|
|
86
78
|
yok_1.injector.register("spmService", SPMService);
|
|
87
|
-
//# sourceMappingURL=spm-service.js.map
|
|
@@ -103,8 +103,6 @@ class XcodebuildArgsService {
|
|
|
103
103
|
}
|
|
104
104
|
getXcodeProjectArgs(platformData, projectData) {
|
|
105
105
|
const xcworkspacePath = path.join(platformData.projectRoot, `${projectData.projectName}.xcworkspace`);
|
|
106
|
-
// Introduced in Xcode 14+
|
|
107
|
-
// ref: https://forums.swift.org/t/telling-xcode-14-beta-4-to-trust-build-tool-plugins-programatically/59305/5
|
|
108
106
|
const skipPackageValidation = "-skipPackagePluginValidation";
|
|
109
107
|
const extraArgs = [
|
|
110
108
|
"-scheme",
|
|
@@ -112,12 +110,6 @@ class XcodebuildArgsService {
|
|
|
112
110
|
skipPackageValidation,
|
|
113
111
|
];
|
|
114
112
|
const BUILD_SETTINGS_FILE_PATH = path.join(projectData.appResourcesDirectoryPath, platformData.normalizedPlatformName, constants.BUILD_XCCONFIG_FILE_NAME);
|
|
115
|
-
// Only include explicit properties from build.xcconfig
|
|
116
|
-
// Note: we could include entire file via -xcconfig flag
|
|
117
|
-
// however doing so introduces unwanted side effects
|
|
118
|
-
// like cocoapods issues related to ASSETCATALOG_COMPILER_APPICON_NAME
|
|
119
|
-
// references: https://medium.com/@iostechset/why-cocoapods-eats-app-icons-79fe729808d4
|
|
120
|
-
// https://github.com/CocoaPods/CocoaPods/issues/7003
|
|
121
113
|
const deployTargetProperty = "IPHONEOS_DEPLOYMENT_TARGET";
|
|
122
114
|
const deployTargetVersion = this.$xcconfigService.readPropertyValue(BUILD_SETTINGS_FILE_PATH, deployTargetProperty);
|
|
123
115
|
if (deployTargetVersion) {
|
|
@@ -169,4 +161,3 @@ class XcodebuildArgsService {
|
|
|
169
161
|
}
|
|
170
162
|
exports.XcodebuildArgsService = XcodebuildArgsService;
|
|
171
163
|
yok_1.injector.register("xcodebuildArgsService", XcodebuildArgsService);
|
|
172
|
-
//# sourceMappingURL=xcodebuild-args-service.js.map
|
|
@@ -73,6 +73,7 @@ class XcodebuildService {
|
|
|
73
73
|
return __awaiter(this, void 0, void 0, function* () {
|
|
74
74
|
const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
|
|
75
75
|
const output = yield this.$exportOptionsPlistService.createDistributionExportOptionsPlist(archivePath, projectData, buildConfig);
|
|
76
|
+
const provision = buildConfig.provision || buildConfig.mobileProvisionIdentifier;
|
|
76
77
|
const args = [
|
|
77
78
|
"-exportArchive",
|
|
78
79
|
"-archivePath",
|
|
@@ -81,6 +82,7 @@ class XcodebuildService {
|
|
|
81
82
|
output.exportFileDir,
|
|
82
83
|
"-exportOptionsPlist",
|
|
83
84
|
output.exportOptionsPlistFilePath,
|
|
85
|
+
provision ? "" : "-allowProvisioningUpdates",
|
|
84
86
|
];
|
|
85
87
|
yield this.$xcodebuildCommandService.executeCommand(args, {
|
|
86
88
|
cwd: platformData.projectRoot,
|
|
@@ -91,4 +93,3 @@ class XcodebuildService {
|
|
|
91
93
|
}
|
|
92
94
|
exports.XcodebuildService = XcodebuildService;
|
|
93
95
|
yok_1.injector.register("xcodebuildService", XcodebuildService);
|
|
94
|
-
//# sourceMappingURL=xcodebuild-service.js.map
|
|
@@ -138,4 +138,3 @@ __decorate([
|
|
|
138
138
|
], IOSDebuggerPortService.prototype, "attachToAttachRequestEvent", null);
|
|
139
139
|
exports.IOSDebuggerPortService = IOSDebuggerPortService;
|
|
140
140
|
yok_1.injector.register("iOSDebuggerPortService", IOSDebuggerPortService);
|
|
141
|
-
//# sourceMappingURL=ios-debugger-port-service.js.map
|
|
@@ -165,4 +165,3 @@ __decorate([
|
|
|
165
165
|
], IOSDeviceDebugService.prototype, "openAppInspector", null);
|
|
166
166
|
exports.IOSDeviceDebugService = IOSDeviceDebugService;
|
|
167
167
|
yok_1.injector.register("iOSDeviceDebugService", IOSDeviceDebugService, false);
|
|
168
|
-
//# sourceMappingURL=ios-device-debug-service.js.map
|
|
@@ -76,4 +76,3 @@ class IOSEntitlementsService {
|
|
|
76
76
|
IOSEntitlementsService.DefaultEntitlementsName = "app.entitlements";
|
|
77
77
|
exports.IOSEntitlementsService = IOSEntitlementsService;
|
|
78
78
|
yok_1.injector.register("iOSEntitlementsService", IOSEntitlementsService);
|
|
79
|
-
//# sourceMappingURL=ios-entitlements-service.js.map
|