nativescript 8.9.0-dev.2 → 8.9.0-dev.3
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/config/test-deps-versions-generated.json +1 -1
- package/lib/android-tools-info.js +9 -32
- package/lib/base-package-manager.js +47 -71
- package/lib/bootstrap.js +1 -5
- package/lib/bun-package-manager.js +65 -104
- package/lib/color.js +2 -5
- package/lib/commands/add-platform.js +14 -31
- package/lib/commands/apple-login.js +18 -30
- package/lib/commands/appstore-list.js +34 -46
- package/lib/commands/appstore-upload.js +52 -68
- package/lib/commands/build.js +57 -90
- package/lib/commands/clean.js +161 -197
- package/lib/commands/command-base.js +14 -28
- package/lib/commands/config.js +48 -71
- package/lib/commands/create-project.js +210 -235
- package/lib/commands/debug.js +66 -93
- package/lib/commands/deploy.js +30 -47
- package/lib/commands/embedding/embed.js +33 -59
- package/lib/commands/extensibility/install-extension.js +5 -17
- package/lib/commands/extensibility/list-extensions.js +13 -25
- package/lib/commands/extensibility/uninstall-extension.js +4 -16
- package/lib/commands/fonts.js +30 -42
- package/lib/commands/generate-assets.js +13 -29
- package/lib/commands/generate-help.js +2 -14
- package/lib/commands/generate.js +12 -70
- package/lib/commands/info.js +2 -14
- package/lib/commands/install.js +34 -50
- package/lib/commands/list-platforms.js +14 -26
- package/lib/commands/migrate.js +15 -27
- package/lib/commands/native-add.js +23 -51
- package/lib/commands/platform-clean.js +19 -33
- package/lib/commands/plugin/add-plugin.js +12 -26
- package/lib/commands/plugin/build-plugin.js +31 -45
- package/lib/commands/plugin/create-plugin.js +110 -138
- package/lib/commands/plugin/list-plugins.js +22 -34
- package/lib/commands/plugin/remove-plugin.js +20 -35
- package/lib/commands/plugin/update-plugin.js +20 -34
- package/lib/commands/post-install.js +20 -39
- package/lib/commands/prepare.js +22 -39
- package/lib/commands/preview.js +49 -64
- package/lib/commands/remove-platform.js +7 -19
- package/lib/commands/resources/resources-update.js +13 -28
- package/lib/commands/run.js +55 -77
- package/lib/commands/setup.js +0 -1
- package/lib/commands/start.js +6 -20
- package/lib/commands/test-init.js +123 -138
- package/lib/commands/test.js +67 -97
- package/lib/commands/typings.js +126 -143
- package/lib/commands/update-platform.js +22 -40
- package/lib/commands/update.js +30 -45
- package/lib/commands/widget.js +390 -352
- package/lib/common/bootstrap.js +0 -1
- package/lib/common/child-process.js +53 -75
- package/lib/common/codeGeneration/code-entity.js +1 -2
- package/lib/common/codeGeneration/code-printer.js +1 -2
- package/lib/common/command-params.js +7 -19
- package/lib/common/commands/analytics.js +27 -43
- package/lib/common/commands/autocompletion.js +39 -59
- package/lib/common/commands/device/device-log-stream.js +12 -24
- package/lib/common/commands/device/get-file.js +22 -35
- package/lib/common/commands/device/list-applications.js +12 -24
- package/lib/common/commands/device/list-devices.js +72 -90
- package/lib/common/commands/device/list-files.js +23 -36
- package/lib/common/commands/device/put-file.js +22 -35
- package/lib/common/commands/device/run-application.js +12 -26
- package/lib/common/commands/device/stop-application.js +11 -23
- package/lib/common/commands/device/uninstall-application.js +6 -18
- package/lib/common/commands/doctor.js +2 -3
- package/lib/common/commands/generate-messages.js +17 -29
- package/lib/common/commands/help.js +20 -34
- package/lib/common/commands/package-manager-get.js +6 -18
- package/lib/common/commands/package-manager-set.js +9 -21
- package/lib/common/commands/post-install.js +2 -14
- package/lib/common/commands/preuninstall.js +24 -48
- package/lib/common/commands/proxy/proxy-base.js +8 -23
- package/lib/common/commands/proxy/proxy-clear.js +4 -16
- package/lib/common/commands/proxy/proxy-get.js +3 -15
- package/lib/common/commands/proxy/proxy-set.js +87 -101
- package/lib/common/common-lib.js +0 -1
- package/lib/common/constants.js +11 -22
- package/lib/common/decorators.js +10 -70
- package/lib/common/dispatchers.js +80 -106
- package/lib/common/errors.js +91 -116
- package/lib/common/file-system.js +108 -141
- package/lib/common/header.js +1 -5
- package/lib/common/helpers.js +152 -267
- package/lib/common/host-info.js +37 -54
- package/lib/common/http-client.js +93 -128
- package/lib/common/logger/appenders/cli-appender.js +1 -6
- package/lib/common/logger/appenders/emit-appender.js +1 -6
- package/lib/common/logger/layouts/cli-layout.js +1 -3
- package/lib/common/logger/logger.js +4 -9
- package/lib/common/messages/messages.js +0 -6
- package/lib/common/mobile/android/android-application-manager.js +122 -162
- package/lib/common/mobile/android/android-debug-bridge-result-handler.js +1 -2
- package/lib/common/mobile/android/android-debug-bridge.js +87 -118
- package/lib/common/mobile/android/android-device-file-system.js +98 -135
- package/lib/common/mobile/android/android-device-hash-service.js +50 -78
- package/lib/common/mobile/android/android-device.js +68 -93
- package/lib/common/mobile/android/android-emulator-services.js +105 -131
- package/lib/common/mobile/android/android-ini-file-parser.js +0 -9
- package/lib/common/mobile/android/android-log-filter.js +1 -5
- package/lib/common/mobile/android/android-virtual-device-service.js +76 -123
- package/lib/common/mobile/android/device-android-debug-bridge.js +13 -30
- package/lib/common/mobile/android/genymotion/genymotion-service.js +91 -123
- package/lib/common/mobile/android/genymotion/virtualbox-service.js +64 -92
- package/lib/common/mobile/android/logcat-helper.js +108 -140
- package/lib/common/mobile/application-manager-base.js +84 -113
- 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 +7 -19
- 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 +79 -111
- package/lib/common/mobile/ios/device/ios-device-file-system.js +78 -106
- package/lib/common/mobile/ios/device/ios-device-operations.js +105 -146
- package/lib/common/mobile/ios/device/ios-device.js +20 -40
- package/lib/common/mobile/ios/ios-device-base.js +58 -82
- 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 +63 -96
- package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +1 -2
- package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +60 -95
- package/lib/common/mobile/ios/simulator/ios-simulator-device.js +27 -48
- package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +37 -63
- package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +24 -36
- 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 +43 -64
- package/lib/common/mobile/mobile-core/android-emulator-discovery.js +21 -35
- package/lib/common/mobile/mobile-core/android-process-service.js +143 -214
- package/lib/common/mobile/mobile-core/device-discovery.js +2 -14
- package/lib/common/mobile/mobile-core/devices-service.js +386 -505
- package/lib/common/mobile/mobile-core/ios-device-discovery.js +24 -37
- package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +47 -65
- package/lib/common/mobile/mobile-helper.js +15 -27
- package/lib/common/mobile/wp8/wp8-emulator-services.js +25 -53
- package/lib/common/opener.js +2 -3
- 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 +91 -114
- package/lib/common/queue.js +9 -21
- package/lib/common/resource-loader.js +0 -1
- package/lib/common/services/auto-completion-service.js +40 -65
- package/lib/common/services/cancellation.js +17 -29
- package/lib/common/services/commands-service.js +146 -180
- package/lib/common/services/help-service.js +133 -166
- package/lib/common/services/hooks-service.js +93 -121
- package/lib/common/services/ios-notification-service.js +21 -35
- package/lib/common/services/json-file-settings-service.js +52 -77
- package/lib/common/services/lock-service.js +35 -58
- package/lib/common/services/message-contract-generator.js +35 -47
- package/lib/common/services/messages-service.js +0 -1
- package/lib/common/services/micro-templating-service.js +4 -21
- package/lib/common/services/net-service.js +90 -110
- package/lib/common/services/project-files-manager.js +10 -28
- package/lib/common/services/project-files-provider-base.js +0 -1
- package/lib/common/services/proxy-service.js +13 -25
- package/lib/common/services/qr.js +13 -25
- package/lib/common/services/settings-service.js +1 -2
- package/lib/common/services/xcode-select-service.js +20 -36
- package/lib/common/utils.js +2 -3
- package/lib/common/validators/project-name-validator.js +1 -2
- package/lib/common/validators/validation-result.js +1 -2
- package/lib/common/verify-node-version.js +3 -11
- package/lib/common/yok.js +35 -69
- package/lib/config.js +36 -72
- package/lib/constants-provider.js +0 -1
- package/lib/constants.js +24 -77
- package/lib/controllers/build-controller.js +82 -100
- package/lib/controllers/debug-controller.js +107 -133
- package/lib/controllers/deploy-controller.js +15 -24
- package/lib/controllers/migrate-controller.js +723 -884
- package/lib/controllers/platform-controller.js +71 -94
- package/lib/controllers/prepare-controller.js +232 -274
- package/lib/controllers/run-controller.js +397 -427
- package/lib/controllers/update-controller-base.js +16 -30
- package/lib/controllers/update-controller.js +94 -130
- 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 +4 -2
- package/lib/data/run-data.js +0 -1
- package/lib/definitions/project.d.ts +24 -24
- package/lib/detached-processes/cleanup-js-subprocess.js +5 -20
- package/lib/detached-processes/cleanup-process.js +30 -43
- package/lib/detached-processes/file-log-service.js +1 -2
- package/lib/device-path-provider.js +23 -35
- package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +149 -171
- package/lib/device-sockets/ios/notification.js +1 -4
- package/lib/device-sockets/ios/socket-request-executor.js +24 -42
- package/lib/helpers/android-bundle-validator-helper.js +2 -3
- package/lib/helpers/deploy-command-helper.js +44 -50
- package/lib/helpers/key-command-helper.js +6 -17
- package/lib/helpers/livesync-command-helper.js +137 -155
- package/lib/helpers/network-connectivity-validator.js +6 -18
- package/lib/helpers/options-track-helper.js +7 -19
- package/lib/helpers/package-path-helper.js +0 -1
- package/lib/helpers/platform-command-helper.js +101 -127
- package/lib/helpers/version-validator-helper.js +0 -1
- package/lib/key-commands/bootstrap.js +2 -3
- package/lib/key-commands/index.js +154 -205
- package/lib/nativescript-cli-lib-bootstrap.js +0 -4
- package/lib/nativescript-cli-lib.js +0 -1
- package/lib/nativescript-cli.js +6 -24
- package/lib/node/pbxproj-dom-xcode.js +0 -1
- package/lib/node/xcode.js +0 -1
- package/lib/node-package-manager.js +81 -114
- package/lib/options.js +122 -156
- package/lib/package-installation-manager.js +130 -172
- package/lib/package-manager.js +63 -88
- package/lib/platform-command-param.js +4 -16
- package/lib/pnpm-package-manager.js +59 -81
- package/lib/project-data.js +1 -13
- package/lib/providers/project-files-provider.js +1 -2
- package/lib/resolvers/livesync-service-resolver.js +0 -1
- package/lib/services/analytics/analytics-broker-process.js +19 -32
- package/lib/services/analytics/analytics-broker.js +17 -31
- package/lib/services/analytics/analytics-service.js +170 -210
- package/lib/services/analytics/google-analytics-provider.js +43 -59
- package/lib/services/analytics-settings-service.js +15 -37
- package/lib/services/android/android-bundle-tool-service.js +43 -61
- package/lib/services/android/gradle-build-args-service.js +9 -23
- package/lib/services/android/gradle-build-service.js +22 -36
- package/lib/services/android/gradle-command-service.js +22 -36
- package/lib/services/android-device-debug-service.js +90 -123
- package/lib/services/android-plugin-build-service.js +205 -260
- package/lib/services/android-project-service.js +129 -241
- package/lib/services/android-resources-migration-service.js +51 -71
- package/lib/services/apple-portal/apple-portal-application-service.js +46 -64
- package/lib/services/apple-portal/apple-portal-cookie-service.js +0 -1
- package/lib/services/apple-portal/apple-portal-session-service.js +197 -218
- package/lib/services/apple-portal/srp/srp-wrapper.js +43 -61
- package/lib/services/assets-generation/assets-generation-service.js +103 -128
- package/lib/services/build-artifacts-service.js +10 -22
- package/lib/services/build-data-service.js +0 -1
- package/lib/services/build-info-file-service.js +20 -36
- package/lib/services/cleanup-service.js +48 -81
- package/lib/services/cocoapods-platform-manager.js +0 -9
- package/lib/services/cocoapods-service.js +112 -153
- 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 +54 -72
- package/lib/services/doctor-service.js +101 -135
- package/lib/services/extensibility-service.js +81 -108
- package/lib/services/files-hash-service.js +26 -44
- package/lib/services/hmr-status-service.js +1 -3
- package/lib/services/info-service.js +0 -1
- package/lib/services/initialize-service.js +37 -54
- package/lib/services/ios/export-options-plist-service.js +38 -55
- package/lib/services/ios/ios-signing-service.js +168 -191
- package/lib/services/ios/spm-service.js +46 -70
- package/lib/services/ios/xcodebuild-args-service.js +77 -103
- package/lib/services/ios/xcodebuild-command-service.js +14 -26
- package/lib/services/ios/xcodebuild-service.js +52 -72
- package/lib/services/ios-debugger-port-service.js +24 -38
- package/lib/services/ios-device-debug-service.js +75 -103
- package/lib/services/ios-entitlements-service.js +31 -43
- package/lib/services/ios-extensions-service.js +18 -30
- 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 +452 -603
- package/lib/services/ios-provision-service.js +108 -132
- package/lib/services/ios-watch-app-service.js +21 -33
- package/lib/services/ip-service.js +38 -55
- package/lib/services/itmstransporter-service.js +129 -153
- package/lib/services/karma-execution.js +0 -2
- package/lib/services/livesync/android-device-livesync-service-base.js +31 -49
- package/lib/services/livesync/android-device-livesync-service.js +120 -151
- package/lib/services/livesync/android-device-livesync-sockets-service.js +121 -155
- package/lib/services/livesync/android-livesync-service.js +14 -36
- package/lib/services/livesync/android-livesync-tool.js +90 -117
- package/lib/services/livesync/device-livesync-service-base.js +15 -30
- package/lib/services/livesync/ios-device-livesync-service.js +114 -150
- package/lib/services/livesync/ios-livesync-service.js +42 -60
- package/lib/services/livesync/livesync-socket.js +0 -1
- package/lib/services/livesync/platform-livesync-service-base.js +94 -124
- package/lib/services/livesync-process-data-service.js +0 -1
- package/lib/services/log-parser-service.js +1 -2
- package/lib/services/log-source-map-service.js +30 -56
- package/lib/services/marking-mode-service.js +17 -33
- package/lib/services/metadata-filtering-service.js +0 -1
- package/lib/services/npm-config-service.js +1 -5
- package/lib/services/pacote-service.js +49 -71
- package/lib/services/performance-service.js +2 -4
- package/lib/services/platform/add-platform-service.js +51 -119
- package/lib/services/platform/platform-validation-service.js +22 -34
- package/lib/services/platform/prepare-native-platform-service.js +49 -65
- package/lib/services/platform-environment-requirements.js +27 -43
- 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 +125 -168
- package/lib/services/prepare-data-service.js +0 -1
- package/lib/services/project-backup-service.js +1 -5
- package/lib/services/project-changes-service.js +124 -152
- package/lib/services/project-cleanup-service.js +64 -79
- package/lib/services/project-config-service.js +73 -102
- package/lib/services/project-data-service.js +108 -154
- package/lib/services/project-name-service.js +28 -44
- package/lib/services/project-service.js +84 -113
- package/lib/services/project-templates-service.js +52 -68
- package/lib/services/qr-code-terminal-service.js +0 -1
- package/lib/services/require-service.js +0 -1
- package/lib/services/start-service.js +41 -60
- package/lib/services/temp-service.js +8 -22
- package/lib/services/terminal-spinner-service.js +15 -28
- package/lib/services/test-execution-service.js +59 -79
- package/lib/services/test-initialization-service.js +2 -6
- package/lib/services/timeline-profiler-service.js +1 -2
- package/lib/services/user-settings-service.js +0 -1
- package/lib/services/versions-service.js +119 -140
- package/lib/services/watch-ignore-list-service.js +0 -1
- package/lib/services/webpack/webpack-compiler-service.js +215 -279
- package/lib/services/xcconfig-service.js +8 -21
- package/lib/services/xcproj-service.js +0 -1
- package/lib/shared-event-bus.js +0 -6
- package/lib/sys-info.js +45 -63
- package/lib/tools/config-manipulation/config-transformer.js +0 -12
- package/lib/tools/node-modules/node-modules-builder.js +16 -28
- package/lib/tools/node-modules/node-modules-dependencies-builder.js +0 -6
- package/lib/yarn-package-manager.js +59 -79
- package/lib/yarn2-package-manager.js +60 -82
- package/package.json +65 -80
- package/node_modules/@npmcli/move-file/LICENSE.md +0 -22
- package/node_modules/@npmcli/move-file/README.md +0 -69
- package/node_modules/@npmcli/move-file/lib/index.js +0 -185
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/LICENSE +0 -21
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/bin/cmd.js +0 -68
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/index.js +0 -31
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/find-made.js +0 -29
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/mkdirp-manual.js +0 -64
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/mkdirp-native.js +0 -39
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/opts-arg.js +0 -23
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/path-arg.js +0 -29
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/lib/use-native.js +0 -10
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/package.json +0 -44
- package/node_modules/@npmcli/move-file/node_modules/mkdirp/readme.markdown +0 -266
- package/node_modules/@npmcli/move-file/package.json +0 -47
- package/node_modules/balanced-match/.github/FUNDING.yml +0 -2
- package/node_modules/balanced-match/LICENSE.md +0 -21
- package/node_modules/balanced-match/README.md +0 -97
- package/node_modules/balanced-match/index.js +0 -62
- package/node_modules/balanced-match/package.json +0 -48
- package/node_modules/concat-map/.travis.yml +0 -4
- package/node_modules/concat-map/LICENSE +0 -18
- package/node_modules/concat-map/README.markdown +0 -62
- package/node_modules/concat-map/example/map.js +0 -6
- package/node_modules/concat-map/index.js +0 -13
- package/node_modules/concat-map/package.json +0 -43
- package/node_modules/concat-map/test/map.js +0 -39
- package/node_modules/fs.realpath/LICENSE +0 -43
- package/node_modules/fs.realpath/README.md +0 -33
- package/node_modules/fs.realpath/index.js +0 -66
- package/node_modules/fs.realpath/old.js +0 -303
- package/node_modules/fs.realpath/package.json +0 -26
- package/node_modules/inflight/LICENSE +0 -15
- package/node_modules/inflight/README.md +0 -37
- package/node_modules/inflight/inflight.js +0 -54
- package/node_modules/inflight/package.json +0 -29
- package/node_modules/inherits/LICENSE +0 -16
- package/node_modules/inherits/README.md +0 -42
- package/node_modules/inherits/inherits.js +0 -9
- package/node_modules/inherits/inherits_browser.js +0 -27
- package/node_modules/inherits/package.json +0 -29
- package/node_modules/once/LICENSE +0 -15
- package/node_modules/once/README.md +0 -79
- package/node_modules/once/once.js +0 -42
- package/node_modules/once/package.json +0 -33
- package/node_modules/path-is-absolute/index.js +0 -20
- package/node_modules/path-is-absolute/license +0 -21
- package/node_modules/path-is-absolute/package.json +0 -43
- package/node_modules/path-is-absolute/readme.md +0 -59
- package/node_modules/rimraf/LICENSE +0 -15
- package/node_modules/rimraf/README.md +0 -101
- package/node_modules/rimraf/bin.js +0 -68
- package/node_modules/rimraf/node_modules/brace-expansion/LICENSE +0 -21
- package/node_modules/rimraf/node_modules/brace-expansion/README.md +0 -129
- package/node_modules/rimraf/node_modules/brace-expansion/index.js +0 -201
- package/node_modules/rimraf/node_modules/brace-expansion/package.json +0 -47
- package/node_modules/rimraf/node_modules/glob/LICENSE +0 -21
- package/node_modules/rimraf/node_modules/glob/README.md +0 -378
- package/node_modules/rimraf/node_modules/glob/common.js +0 -238
- package/node_modules/rimraf/node_modules/glob/glob.js +0 -790
- package/node_modules/rimraf/node_modules/glob/package.json +0 -55
- package/node_modules/rimraf/node_modules/glob/sync.js +0 -486
- package/node_modules/rimraf/node_modules/minimatch/LICENSE +0 -15
- package/node_modules/rimraf/node_modules/minimatch/README.md +0 -230
- package/node_modules/rimraf/node_modules/minimatch/minimatch.js +0 -947
- package/node_modules/rimraf/node_modules/minimatch/package.json +0 -33
- package/node_modules/rimraf/package.json +0 -32
- package/node_modules/rimraf/rimraf.js +0 -360
- package/node_modules/stringify-package/LICENSE +0 -13
- package/node_modules/stringify-package/README.md +0 -55
- package/node_modules/stringify-package/index.js +0 -18
- package/node_modules/stringify-package/package.json +0 -38
- package/node_modules/wrappy/LICENSE +0 -15
- package/node_modules/wrappy/README.md +0 -36
- package/node_modules/wrappy/package.json +0 -29
- package/node_modules/wrappy/wrappy.js +0 -33
|
@@ -5,18 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
9
|
exports.AssetsGenerationService = void 0;
|
|
19
|
-
const
|
|
10
|
+
const jimp_1 = require("jimp");
|
|
20
11
|
const Color = require("color");
|
|
21
12
|
const decorators_1 = require("../../common/decorators");
|
|
22
13
|
const constants_1 = require("../../constants");
|
|
@@ -36,136 +27,121 @@ class AssetsGenerationService {
|
|
|
36
27
|
this.$fs = $fs;
|
|
37
28
|
this.$options = $options;
|
|
38
29
|
}
|
|
39
|
-
generateIcons(resourceGenerationData) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
this.$logger.info("Icons generation completed.");
|
|
47
|
-
});
|
|
30
|
+
async generateIcons(resourceGenerationData) {
|
|
31
|
+
if (this.$options.hostProjectPath) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
this.$logger.info("Generating icons ...");
|
|
35
|
+
await this.generateImagesForDefinitions(resourceGenerationData, this.propertiesToEnumerate.icon);
|
|
36
|
+
this.$logger.info("Icons generation completed.");
|
|
48
37
|
}
|
|
49
|
-
generateSplashScreens(splashesGenerationData) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
this.$logger.info("Splash screens generation completed.");
|
|
54
|
-
});
|
|
38
|
+
async generateSplashScreens(splashesGenerationData) {
|
|
39
|
+
this.$logger.info("Generating splash screens ...");
|
|
40
|
+
await this.generateImagesForDefinitions(splashesGenerationData, this.propertiesToEnumerate.splash);
|
|
41
|
+
this.$logger.info("Splash screens generation completed.");
|
|
55
42
|
}
|
|
56
|
-
generateImagesForDefinitions(generationData, propertiesToEnumerate) {
|
|
43
|
+
async generateImagesForDefinitions(generationData, propertiesToEnumerate) {
|
|
57
44
|
var _a, _b, _c, _d, _e, _f;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
if (assetItem.
|
|
72
|
-
|
|
73
|
-
this.$fs.deleteFile(assetItem.path);
|
|
74
|
-
}
|
|
75
|
-
continue;
|
|
45
|
+
const background = generationData.background || "white";
|
|
46
|
+
const assetsStructure = await this.$projectDataService.getAssetsStructure(generationData);
|
|
47
|
+
const assetItems = _(assetsStructure)
|
|
48
|
+
.filter((assetGroup, platform) => !generationData.platform ||
|
|
49
|
+
platform.toLowerCase() === generationData.platform.toLowerCase())
|
|
50
|
+
.map((assetGroup) => _.filter(assetGroup, (assetSubGroup, imageTypeKey) => assetSubGroup && propertiesToEnumerate.indexOf(imageTypeKey) !== -1))
|
|
51
|
+
.flatten()
|
|
52
|
+
.map((assetSubGroup) => assetSubGroup.images)
|
|
53
|
+
.flatten()
|
|
54
|
+
.filter((assetItem) => !!assetItem.filename)
|
|
55
|
+
.value();
|
|
56
|
+
for (const assetItem of assetItems) {
|
|
57
|
+
if (assetItem.operation === "delete") {
|
|
58
|
+
if (this.$fs.exists(assetItem.path)) {
|
|
59
|
+
this.$fs.deleteFile(assetItem.path);
|
|
76
60
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
try {
|
|
83
|
-
const color = (_e = (_c = generationData[(_b = assetItem.data) === null || _b === void 0 ? void 0 : _b.fromKey]) !== null && _c !== void 0 ? _c : (_d = assetItem.data) === null || _d === void 0 ? void 0 : _d.default) !== null && _e !== void 0 ? _e : "white";
|
|
84
|
-
const colorHEX = Jimp.cssColorToHex(color);
|
|
85
|
-
const hex = (_f = colorHEX === null || colorHEX === void 0 ? void 0 : colorHEX.toString(16).substring(0, 6)) !== null && _f !== void 0 ? _f : "FFFFFF";
|
|
86
|
-
this.$fs.writeFile(assetItem.path, [
|
|
87
|
-
`<?xml version="1.0" encoding="utf-8"?>`,
|
|
88
|
-
`<resources>`,
|
|
89
|
-
` <color name="${colorName}">#${hex.toUpperCase()}</color>`,
|
|
90
|
-
`</resources>`,
|
|
91
|
-
].join(os_1.EOL));
|
|
92
|
-
}
|
|
93
|
-
catch (err) {
|
|
94
|
-
this.$logger.info(`Failed to write provided color to ${assetItem.path} -> ${colorName}. See --log trace for more info.`);
|
|
95
|
-
this.$logger.trace(err);
|
|
96
|
-
}
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
if (assetItem.operation === "writeXMLColor") {
|
|
64
|
+
const colorName = (_a = assetItem.data) === null || _a === void 0 ? void 0 : _a.colorName;
|
|
65
|
+
if (!colorName) {
|
|
97
66
|
continue;
|
|
98
67
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
splittedElements.length &&
|
|
110
|
-
splittedElements[0] &&
|
|
111
|
-
+splittedElements[0];
|
|
112
|
-
}
|
|
68
|
+
try {
|
|
69
|
+
const color = (_e = (_c = generationData[(_b = assetItem.data) === null || _b === void 0 ? void 0 : _b.fromKey]) !== null && _c !== void 0 ? _c : (_d = assetItem.data) === null || _d === void 0 ? void 0 : _d.default) !== null && _e !== void 0 ? _e : "white";
|
|
70
|
+
const colorHEX = (0, jimp_1.cssColorToHex)(color);
|
|
71
|
+
const hex = (_f = colorHEX === null || colorHEX === void 0 ? void 0 : colorHEX.toString(16).substring(0, 6)) !== null && _f !== void 0 ? _f : "FFFFFF";
|
|
72
|
+
this.$fs.writeFile(assetItem.path, [
|
|
73
|
+
`<?xml version="1.0" encoding="utf-8"?>`,
|
|
74
|
+
`<resources>`,
|
|
75
|
+
` <color name="${colorName}">#${hex.toUpperCase()}</color>`,
|
|
76
|
+
`</resources>`,
|
|
77
|
+
].join(os_1.EOL));
|
|
113
78
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
const height = assetItem.height * scale;
|
|
118
|
-
if (!width || !height) {
|
|
119
|
-
this.$logger.warn(`Image ${assetItem.filename} is skipped as its width and height are invalid.`);
|
|
120
|
-
continue;
|
|
79
|
+
catch (err) {
|
|
80
|
+
this.$logger.info(`Failed to write provided color to ${assetItem.path} -> ${colorName}. See --log trace for more info.`);
|
|
81
|
+
this.$logger.trace(err);
|
|
121
82
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
image = this.generateImage(background, width, height, outputPath, image);
|
|
130
|
-
break;
|
|
131
|
-
case "blank" /* Operations.Blank */:
|
|
132
|
-
image = this.generateImage(background, width, height, outputPath);
|
|
133
|
-
break;
|
|
134
|
-
case "resize" /* Operations.Resize */:
|
|
135
|
-
image = yield this.resize(generationData.imagePath, width, height);
|
|
136
|
-
break;
|
|
137
|
-
case "outerScale" /* Operations.OuterScale */:
|
|
138
|
-
// Resize image without applying scale
|
|
139
|
-
image = yield this.resize(generationData.imagePath, assetItem.width, assetItem.height);
|
|
140
|
-
// The scale will apply to the underlying layer of the generated image
|
|
141
|
-
image = this.generateImage("#00000000", width, height, outputPath, image);
|
|
142
|
-
break;
|
|
143
|
-
default:
|
|
144
|
-
throw new Error(`Invalid image generation operation: ${operation}`);
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
const operation = assetItem.resizeOperation || "resize";
|
|
86
|
+
let tempScale = null;
|
|
87
|
+
if (assetItem.scale) {
|
|
88
|
+
if (_.isNumber(assetItem.scale)) {
|
|
89
|
+
tempScale = assetItem.scale;
|
|
145
90
|
}
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
// image = image.rgba(false);
|
|
154
|
-
image = image.colorType(2);
|
|
91
|
+
else {
|
|
92
|
+
const splittedElements = `${assetItem.scale}`.split(constants_1.AssetConstants.sizeDelimiter);
|
|
93
|
+
tempScale =
|
|
94
|
+
splittedElements &&
|
|
95
|
+
splittedElements.length &&
|
|
96
|
+
splittedElements[0] &&
|
|
97
|
+
+splittedElements[0];
|
|
155
98
|
}
|
|
156
|
-
image.write(outputPath);
|
|
157
99
|
}
|
|
158
|
-
|
|
100
|
+
const scale = tempScale || constants_1.AssetConstants.defaultScale;
|
|
101
|
+
const outputPath = assetItem.path;
|
|
102
|
+
const width = assetItem.width * scale;
|
|
103
|
+
const height = assetItem.height * scale;
|
|
104
|
+
if (!width || !height) {
|
|
105
|
+
this.$logger.warn(`Image ${assetItem.filename} is skipped as its width and height are invalid.`);
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
let image;
|
|
109
|
+
switch (operation) {
|
|
110
|
+
case "overlayWith":
|
|
111
|
+
const overlayImageScale = assetItem.overlayImageScale ||
|
|
112
|
+
constants_1.AssetConstants.defaultOverlayImageScale;
|
|
113
|
+
const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
|
|
114
|
+
image = await this.resize(generationData.imagePath, imageResize, imageResize);
|
|
115
|
+
image = this.generateImage(background, width, height, outputPath, image);
|
|
116
|
+
break;
|
|
117
|
+
case "blank":
|
|
118
|
+
image = this.generateImage(background, width, height, outputPath);
|
|
119
|
+
break;
|
|
120
|
+
case "resize":
|
|
121
|
+
image = await this.resize(generationData.imagePath, width, height);
|
|
122
|
+
break;
|
|
123
|
+
case "outerScale":
|
|
124
|
+
image = await this.resize(generationData.imagePath, assetItem.width, assetItem.height);
|
|
125
|
+
image = this.generateImage("#00000000", width, height, outputPath, image);
|
|
126
|
+
break;
|
|
127
|
+
default:
|
|
128
|
+
throw new Error(`Invalid image generation operation: ${operation}`);
|
|
129
|
+
}
|
|
130
|
+
if (assetItem.rgba === false) {
|
|
131
|
+
image = image.colorType(2);
|
|
132
|
+
}
|
|
133
|
+
image.write(outputPath);
|
|
134
|
+
}
|
|
159
135
|
}
|
|
160
|
-
resize(imagePath, width, height) {
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
136
|
+
async resize(imagePath, width, height) {
|
|
137
|
+
const image = await jimp_1.Jimp.read(imagePath);
|
|
138
|
+
return image.scaleToFit({
|
|
139
|
+
w: width,
|
|
140
|
+
h: height,
|
|
164
141
|
});
|
|
165
142
|
}
|
|
166
143
|
generateImage(background, width, height, outputPath, overlayImage) {
|
|
167
|
-
|
|
168
|
-
const J = Jimp;
|
|
144
|
+
const J = jimp_1.Jimp;
|
|
169
145
|
const backgroundColor = this.getRgbaNumber(background);
|
|
170
146
|
let image = new J(width, height, backgroundColor);
|
|
171
147
|
if (overlayImage) {
|
|
@@ -179,15 +155,14 @@ class AssetsGenerationService {
|
|
|
179
155
|
const color = new Color(colorString);
|
|
180
156
|
const colorRgb = color.rgb();
|
|
181
157
|
const alpha = Math.round(colorRgb.alpha() * 255);
|
|
182
|
-
return
|
|
158
|
+
return (0, jimp_1.rgbaToInt)(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
|
|
183
159
|
}
|
|
184
160
|
}
|
|
161
|
+
exports.AssetsGenerationService = AssetsGenerationService;
|
|
185
162
|
__decorate([
|
|
186
163
|
(0, decorators_1.exported)("assetsGenerationService")
|
|
187
164
|
], AssetsGenerationService.prototype, "generateIcons", null);
|
|
188
165
|
__decorate([
|
|
189
166
|
(0, decorators_1.exported)("assetsGenerationService")
|
|
190
167
|
], AssetsGenerationService.prototype, "generateSplashScreens", null);
|
|
191
|
-
exports.AssetsGenerationService = AssetsGenerationService;
|
|
192
168
|
yok_1.injector.register("assetsGenerationService", AssetsGenerationService);
|
|
193
|
-
//# sourceMappingURL=assets-generation-service.js.map
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.BuildArtifactsService = void 0;
|
|
13
4
|
const path = require("path");
|
|
@@ -19,17 +10,15 @@ class BuildArtifactsService {
|
|
|
19
10
|
this.$fs = $fs;
|
|
20
11
|
this.$logger = $logger;
|
|
21
12
|
}
|
|
22
|
-
getLatestAppPackagePath(platformData, buildOutputOptions) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
return packageFile;
|
|
32
|
-
});
|
|
13
|
+
async getLatestAppPackagePath(platformData, buildOutputOptions) {
|
|
14
|
+
const outputPath = buildOutputOptions.outputPath ||
|
|
15
|
+
platformData.getBuildOutputPath(buildOutputOptions);
|
|
16
|
+
const applicationPackage = this.getLatestApplicationPackage(outputPath, platformData.getValidBuildOutputData(buildOutputOptions));
|
|
17
|
+
const packageFile = applicationPackage.packageName;
|
|
18
|
+
if (!packageFile || !this.$fs.exists(packageFile)) {
|
|
19
|
+
this.$errors.fail(`Unable to find built application. Try 'ns build ${platformData.platformNameLowerCase}'.`);
|
|
20
|
+
}
|
|
21
|
+
return packageFile;
|
|
33
22
|
}
|
|
34
23
|
getAllAppPackages(buildOutputPath, validBuildOutputData) {
|
|
35
24
|
const rootFiles = this.$fs
|
|
@@ -75,7 +64,7 @@ class BuildArtifactsService {
|
|
|
75
64
|
if (packages.length > 1) {
|
|
76
65
|
this.$logger.warn(`More than one ${packageExtName} found in ${buildOutputPath} directory. Using the last one produced from build.`);
|
|
77
66
|
}
|
|
78
|
-
packages = _.sortBy(packages, (pkg) => pkg.time).reverse();
|
|
67
|
+
packages = _.sortBy(packages, (pkg) => pkg.time).reverse();
|
|
79
68
|
return packages[0];
|
|
80
69
|
}
|
|
81
70
|
getApplicationPackagesCore(candidates, validPackageNames) {
|
|
@@ -96,4 +85,3 @@ class BuildArtifactsService {
|
|
|
96
85
|
}
|
|
97
86
|
exports.BuildArtifactsService = BuildArtifactsService;
|
|
98
87
|
yok_1.injector.register("buildArtifactsService", BuildArtifactsService);
|
|
99
|
-
//# sourceMappingURL=build-artifacts-service.js.map
|
|
@@ -1,13 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
3
|
exports.BuildInfoFileService = void 0;
|
|
13
4
|
const path = require("path");
|
|
@@ -35,17 +26,15 @@ class BuildInfoFileService {
|
|
|
35
26
|
}
|
|
36
27
|
return null;
|
|
37
28
|
}
|
|
38
|
-
getDeviceBuildInfo(device, projectData) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
}
|
|
48
|
-
});
|
|
29
|
+
async getDeviceBuildInfo(device, projectData) {
|
|
30
|
+
const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
|
|
31
|
+
try {
|
|
32
|
+
const deviceFileContent = await this.$mobileHelper.getDeviceFileContent(device, deviceFilePath, projectData);
|
|
33
|
+
return JSON.parse(deviceFileContent);
|
|
34
|
+
}
|
|
35
|
+
catch (e) {
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
49
38
|
}
|
|
50
39
|
saveLocalBuildInfo(platformData, buildInfoFileDirname) {
|
|
51
40
|
const buildInfoFile = path.join(buildInfoFileDirname, buildInfoFileName);
|
|
@@ -56,25 +45,20 @@ class BuildInfoFileService {
|
|
|
56
45
|
};
|
|
57
46
|
this.$fs.writeJson(buildInfoFile, buildInfo);
|
|
58
47
|
}
|
|
59
|
-
saveDeviceBuildInfo(device, projectData, outputFilePath) {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
yield device.fileSystem.putFile(path.join(outputFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
|
|
64
|
-
});
|
|
48
|
+
async saveDeviceBuildInfo(device, projectData, outputFilePath) {
|
|
49
|
+
const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
|
|
50
|
+
const appIdentifier = projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
|
|
51
|
+
await device.fileSystem.putFile(path.join(outputFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
|
|
65
52
|
}
|
|
66
|
-
getDeviceBuildInfoFilePath(device, projectData) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
getDirname: true,
|
|
72
|
-
});
|
|
73
|
-
const result = helpers.fromWindowsRelativePathToUnix(path.join(deviceRootPath, buildInfoFileName));
|
|
74
|
-
return result;
|
|
53
|
+
async getDeviceBuildInfoFilePath(device, projectData) {
|
|
54
|
+
const platform = device.deviceInfo.platform.toLowerCase();
|
|
55
|
+
const deviceRootPath = await this.$devicePathProvider.getDeviceProjectRootPath(device, {
|
|
56
|
+
appIdentifier: projectData.projectIdentifiers[platform],
|
|
57
|
+
getDirname: true,
|
|
75
58
|
});
|
|
59
|
+
const result = helpers.fromWindowsRelativePathToUnix(path.join(deviceRootPath, buildInfoFileName));
|
|
60
|
+
return result;
|
|
76
61
|
}
|
|
77
62
|
}
|
|
78
63
|
exports.BuildInfoFileService = BuildInfoFileService;
|
|
79
64
|
yok_1.injector.register("buildInfoFileService", BuildInfoFileService);
|
|
80
|
-
//# sourceMappingURL=build-info-file-service.js.map
|
|
@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
9
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
10
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
11
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
12
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
13
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
14
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
15
|
-
});
|
|
16
|
-
};
|
|
17
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
9
|
exports.CleanupService = void 0;
|
|
19
10
|
const path = require("path");
|
|
@@ -26,89 +17,69 @@ class CleanupService {
|
|
|
26
17
|
this.shouldDispose = true;
|
|
27
18
|
this.pathToCleanupLogFile = $options.cleanupLogFile;
|
|
28
19
|
}
|
|
29
|
-
addCleanupCommand(commandInfo) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
commandInfo,
|
|
35
|
-
});
|
|
20
|
+
async addCleanupCommand(commandInfo) {
|
|
21
|
+
const cleanupProcess = await this.getCleanupProcess();
|
|
22
|
+
cleanupProcess.send({
|
|
23
|
+
messageType: "AddCleanCommand",
|
|
24
|
+
commandInfo,
|
|
36
25
|
});
|
|
37
26
|
}
|
|
38
|
-
removeCleanupCommand(commandInfo) {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
commandInfo,
|
|
44
|
-
});
|
|
27
|
+
async removeCleanupCommand(commandInfo) {
|
|
28
|
+
const cleanupProcess = await this.getCleanupProcess();
|
|
29
|
+
cleanupProcess.send({
|
|
30
|
+
messageType: "RemoveCleanCommand",
|
|
31
|
+
commandInfo,
|
|
45
32
|
});
|
|
46
33
|
}
|
|
47
|
-
addRequest(requestInfo) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
requestInfo,
|
|
53
|
-
});
|
|
34
|
+
async addRequest(requestInfo) {
|
|
35
|
+
const cleanupProcess = await this.getCleanupProcess();
|
|
36
|
+
cleanupProcess.send({
|
|
37
|
+
messageType: "AddRequest",
|
|
38
|
+
requestInfo,
|
|
54
39
|
});
|
|
55
40
|
}
|
|
56
|
-
removeRequest(requestInfo) {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
requestInfo,
|
|
62
|
-
});
|
|
41
|
+
async removeRequest(requestInfo) {
|
|
42
|
+
const cleanupProcess = await this.getCleanupProcess();
|
|
43
|
+
cleanupProcess.send({
|
|
44
|
+
messageType: "RemoveRequest",
|
|
45
|
+
requestInfo,
|
|
63
46
|
});
|
|
64
47
|
}
|
|
65
|
-
addCleanupDeleteAction(filePath) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
filePath,
|
|
71
|
-
});
|
|
48
|
+
async addCleanupDeleteAction(filePath) {
|
|
49
|
+
const cleanupProcess = await this.getCleanupProcess();
|
|
50
|
+
cleanupProcess.send({
|
|
51
|
+
messageType: "AddDeleteFileAction",
|
|
52
|
+
filePath,
|
|
72
53
|
});
|
|
73
54
|
}
|
|
74
|
-
removeCleanupDeleteAction(filePath) {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
filePath,
|
|
80
|
-
});
|
|
55
|
+
async removeCleanupDeleteAction(filePath) {
|
|
56
|
+
const cleanupProcess = await this.getCleanupProcess();
|
|
57
|
+
cleanupProcess.send({
|
|
58
|
+
messageType: "RemoveDeleteFileAction",
|
|
59
|
+
filePath,
|
|
81
60
|
});
|
|
82
61
|
}
|
|
83
|
-
addCleanupJS(jsCommand) {
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
jsCommand,
|
|
89
|
-
});
|
|
62
|
+
async addCleanupJS(jsCommand) {
|
|
63
|
+
const cleanupProcess = await this.getCleanupProcess();
|
|
64
|
+
cleanupProcess.send({
|
|
65
|
+
messageType: "AddJSFileToRequire",
|
|
66
|
+
jsCommand,
|
|
90
67
|
});
|
|
91
68
|
}
|
|
92
|
-
removeCleanupJS(jsCommand) {
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
jsCommand,
|
|
98
|
-
});
|
|
69
|
+
async removeCleanupJS(jsCommand) {
|
|
70
|
+
const cleanupProcess = await this.getCleanupProcess();
|
|
71
|
+
cleanupProcess.send({
|
|
72
|
+
messageType: "RemoveJSFileToRequire",
|
|
73
|
+
jsCommand,
|
|
99
74
|
});
|
|
100
75
|
}
|
|
101
|
-
addKillProcess(pid) {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
yield this.addCleanupCommand(killSpawnCommandInfo);
|
|
105
|
-
});
|
|
76
|
+
async addKillProcess(pid) {
|
|
77
|
+
const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
|
|
78
|
+
await this.addCleanupCommand(killSpawnCommandInfo);
|
|
106
79
|
}
|
|
107
|
-
removeKillProcess(pid) {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
yield this.removeCleanupCommand(killSpawnCommandInfo);
|
|
111
|
-
});
|
|
80
|
+
async removeKillProcess(pid) {
|
|
81
|
+
const killSpawnCommandInfo = this.getKillProcesSpawnInfo(pid);
|
|
82
|
+
await this.removeCleanupCommand(killSpawnCommandInfo);
|
|
112
83
|
}
|
|
113
84
|
setCleanupLogFile(filePath) {
|
|
114
85
|
this.pathToCleanupLogFile = filePath;
|
|
@@ -121,8 +92,6 @@ class CleanupService {
|
|
|
121
92
|
setShouldDispose(shouldDispose) {
|
|
122
93
|
this.shouldDispose = shouldDispose;
|
|
123
94
|
}
|
|
124
|
-
// TODO: Consider extracting this method to a separate service
|
|
125
|
-
// as it has the same logic as the one used in analytics-service
|
|
126
95
|
getCleanupProcess() {
|
|
127
96
|
return new Promise((resolve, reject) => {
|
|
128
97
|
const cleanupProcessArgs = this.getCleanupProcessArgs();
|
|
@@ -141,12 +110,11 @@ class CleanupService {
|
|
|
141
110
|
clearTimeout(timeoutId);
|
|
142
111
|
if (!isSettled) {
|
|
143
112
|
isSettled = true;
|
|
144
|
-
// In case we throw error here, CLI will break its execution.
|
|
145
113
|
reject(err);
|
|
146
114
|
}
|
|
147
115
|
});
|
|
148
116
|
cleanupProcess.on("message", (data) => {
|
|
149
|
-
if (data === "ProcessReadyToReceive"
|
|
117
|
+
if (data === "ProcessReadyToReceive") {
|
|
150
118
|
clearTimeout(timeoutId);
|
|
151
119
|
if (!isSettled) {
|
|
152
120
|
isSettled = true;
|
|
@@ -186,6 +154,7 @@ class CleanupService {
|
|
|
186
154
|
};
|
|
187
155
|
}
|
|
188
156
|
}
|
|
157
|
+
exports.CleanupService = CleanupService;
|
|
189
158
|
CleanupService.CLEANUP_PROCESS_START_TIMEOUT = 10 * 1000;
|
|
190
159
|
__decorate([
|
|
191
160
|
(0, decorators_1.exported)("cleanupService")
|
|
@@ -193,6 +162,4 @@ __decorate([
|
|
|
193
162
|
__decorate([
|
|
194
163
|
(0, decorators_1.cache)()
|
|
195
164
|
], CleanupService.prototype, "getCleanupProcess", null);
|
|
196
|
-
exports.CleanupService = CleanupService;
|
|
197
165
|
yok_1.injector.register("cleanupService", CleanupService);
|
|
198
|
-
//# sourceMappingURL=cleanup-service.js.map
|
|
@@ -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
|