nativescript 8.9.0-alpha.3 → 8.9.0-dev.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/config/test-deps-versions-generated.json +1 -1
- package/lib/android-tools-info.js +9 -20
- package/lib/base-package-manager.js +47 -64
- package/lib/bun-package-manager.js +65 -88
- package/lib/color.js +2 -2
- package/lib/commands/add-platform.js +14 -30
- package/lib/commands/apple-login.js +18 -29
- package/lib/commands/appstore-list.js +34 -45
- package/lib/commands/appstore-upload.js +52 -65
- package/lib/commands/build.js +55 -87
- package/lib/commands/clean.js +161 -176
- package/lib/commands/command-base.js +14 -27
- package/lib/commands/config.js +48 -67
- package/lib/commands/create-project.js +210 -229
- package/lib/commands/debug.js +66 -88
- package/lib/commands/deploy.js +28 -44
- package/lib/commands/embedding/embed.js +33 -52
- package/lib/commands/extensibility/install-extension.js +5 -16
- package/lib/commands/extensibility/list-extensions.js +13 -24
- package/lib/commands/extensibility/uninstall-extension.js +4 -15
- package/lib/commands/fonts.js +30 -41
- package/lib/commands/generate-assets.js +13 -28
- package/lib/commands/generate-help.js +2 -13
- package/lib/commands/generate.js +12 -60
- package/lib/commands/info.js +2 -13
- package/lib/commands/install.js +34 -49
- package/lib/commands/list-platforms.js +14 -25
- package/lib/commands/migrate.js +15 -26
- package/lib/commands/native-add.js +23 -46
- package/lib/commands/platform-clean.js +19 -32
- package/lib/commands/plugin/add-plugin.js +12 -25
- package/lib/commands/plugin/build-plugin.js +31 -44
- package/lib/commands/plugin/create-plugin.js +110 -133
- package/lib/commands/plugin/list-plugins.js +22 -33
- package/lib/commands/plugin/remove-plugin.js +20 -33
- package/lib/commands/plugin/update-plugin.js +20 -33
- package/lib/commands/post-install.js +20 -33
- package/lib/commands/prepare.js +19 -35
- package/lib/commands/preview.js +49 -62
- package/lib/commands/remove-platform.js +7 -18
- package/lib/commands/resources/resources-update.js +13 -26
- package/lib/commands/run.js +55 -76
- package/lib/commands/start.js +6 -19
- package/lib/commands/test-init.js +123 -134
- package/lib/commands/test.js +66 -89
- package/lib/commands/typings.js +126 -142
- package/lib/commands/update-platform.js +22 -35
- package/lib/commands/update.js +30 -43
- package/lib/common/child-process.js +53 -72
- package/lib/common/codeGeneration/code-entity.js +1 -1
- package/lib/common/codeGeneration/code-printer.js +1 -1
- package/lib/common/command-params.js +7 -18
- package/lib/common/commands/analytics.js +27 -40
- package/lib/common/commands/autocompletion.js +39 -56
- package/lib/common/commands/device/device-log-stream.js +12 -23
- package/lib/common/commands/device/get-file.js +22 -33
- package/lib/common/commands/device/list-applications.js +12 -23
- package/lib/common/commands/device/list-devices.js +72 -87
- package/lib/common/commands/device/list-files.js +23 -34
- package/lib/common/commands/device/put-file.js +22 -33
- package/lib/common/commands/device/run-application.js +12 -25
- package/lib/common/commands/device/stop-application.js +11 -22
- package/lib/common/commands/device/uninstall-application.js +6 -17
- package/lib/common/commands/generate-messages.js +17 -28
- package/lib/common/commands/help.js +20 -33
- package/lib/common/commands/package-manager-get.js +6 -17
- package/lib/common/commands/package-manager-set.js +9 -20
- package/lib/common/commands/post-install.js +2 -13
- package/lib/common/commands/preuninstall.js +23 -38
- package/lib/common/commands/proxy/proxy-base.js +8 -19
- package/lib/common/commands/proxy/proxy-clear.js +4 -15
- package/lib/common/commands/proxy/proxy-get.js +3 -14
- package/lib/common/commands/proxy/proxy-set.js +87 -100
- package/lib/common/constants.js +11 -11
- package/lib/common/decorators.js +10 -22
- package/lib/common/dispatchers.js +79 -96
- package/lib/common/errors.js +89 -104
- package/lib/common/file-system.js +108 -130
- package/lib/common/header.js +1 -2
- package/lib/common/helpers.js +149 -178
- package/lib/common/host-info.js +37 -50
- package/lib/common/http-client.js +93 -108
- package/lib/common/logger/appenders/cli-appender.js +1 -2
- package/lib/common/logger/appenders/emit-appender.js +1 -2
- package/lib/common/logger/layouts/cli-layout.js +1 -2
- package/lib/common/logger/logger.js +4 -4
- package/lib/common/mobile/android/android-application-manager.js +121 -142
- package/lib/common/mobile/android/android-debug-bridge-result-handler.js +1 -1
- package/lib/common/mobile/android/android-debug-bridge.js +87 -112
- package/lib/common/mobile/android/android-device-file-system.js +98 -131
- package/lib/common/mobile/android/android-device-hash-service.js +50 -75
- package/lib/common/mobile/android/android-device.js +68 -85
- package/lib/common/mobile/android/android-emulator-services.js +105 -130
- package/lib/common/mobile/android/android-ini-file-parser.js +8 -6
- package/lib/common/mobile/android/android-log-filter.js +1 -1
- package/lib/common/mobile/android/android-virtual-device-service.js +76 -97
- package/lib/common/mobile/android/device-android-debug-bridge.js +13 -29
- package/lib/common/mobile/android/genymotion/genymotion-service.js +91 -118
- package/lib/common/mobile/android/genymotion/virtualbox-service.js +64 -81
- package/lib/common/mobile/android/logcat-helper.js +108 -127
- package/lib/common/mobile/application-manager-base.js +84 -107
- package/lib/common/mobile/device-log-provider-base.js +7 -18
- package/lib/common/mobile/ios/device/ios-application-manager.js +79 -108
- package/lib/common/mobile/ios/device/ios-device-file-system.js +78 -105
- package/lib/common/mobile/ios/device/ios-device-operations.js +105 -142
- package/lib/common/mobile/ios/device/ios-device.js +20 -36
- package/lib/common/mobile/ios/ios-device-base.js +58 -81
- package/lib/common/mobile/ios/simulator/ios-emulator-services.js +63 -92
- package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +1 -1
- package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +60 -89
- package/lib/common/mobile/ios/simulator/ios-simulator-device.js +27 -43
- package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +37 -62
- package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +24 -35
- package/lib/common/mobile/mobile-core/android-device-discovery.js +43 -62
- package/lib/common/mobile/mobile-core/android-emulator-discovery.js +21 -32
- package/lib/common/mobile/mobile-core/android-process-service.js +143 -182
- package/lib/common/mobile/mobile-core/device-discovery.js +2 -13
- package/lib/common/mobile/mobile-core/devices-service.js +386 -436
- package/lib/common/mobile/mobile-core/ios-device-discovery.js +24 -35
- package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +47 -62
- package/lib/common/mobile/mobile-helper.js +15 -26
- package/lib/common/mobile/wp8/wp8-emulator-services.js +25 -52
- package/lib/common/opener.js +2 -2
- package/lib/common/prompter.js +90 -105
- package/lib/common/queue.js +9 -20
- package/lib/common/services/auto-completion-service.js +39 -52
- package/lib/common/services/cancellation.js +17 -28
- package/lib/common/services/commands-service.js +146 -169
- package/lib/common/services/help-service.js +132 -157
- package/lib/common/services/hooks-service.js +93 -108
- package/lib/common/services/ios-notification-service.js +21 -34
- package/lib/common/services/json-file-settings-service.js +52 -71
- package/lib/common/services/lock-service.js +35 -52
- package/lib/common/services/message-contract-generator.js +35 -46
- package/lib/common/services/micro-templating-service.js +4 -15
- package/lib/common/services/net-service.js +90 -107
- package/lib/common/services/project-files-manager.js +10 -23
- package/lib/common/services/proxy-service.js +13 -24
- package/lib/common/services/qr.js +13 -24
- package/lib/common/services/settings-service.js +1 -1
- package/lib/common/services/xcode-select-service.js +20 -35
- package/lib/common/utils.js +2 -2
- package/lib/common/validators/project-name-validator.js +1 -1
- package/lib/common/validators/validation-result.js +1 -1
- package/lib/common/verify-node-version.js +2 -3
- package/lib/common/yok.js +23 -36
- package/lib/config.js +36 -51
- package/lib/constants.js +24 -24
- package/lib/controllers/build-controller.js +82 -99
- package/lib/controllers/debug-controller.js +107 -128
- package/lib/controllers/deploy-controller.js +15 -23
- package/lib/controllers/migrate-controller.js +722 -795
- package/lib/controllers/platform-controller.js +70 -85
- package/lib/controllers/prepare-controller.js +232 -261
- package/lib/controllers/run-controller.js +397 -411
- package/lib/controllers/update-controller-base.js +16 -29
- package/lib/controllers/update-controller.js +94 -119
- package/lib/data/prepare-data.js +4 -1
- package/lib/definitions/ios.d.ts +11 -1
- package/lib/detached-processes/cleanup-js-subprocess.js +3 -12
- package/lib/detached-processes/cleanup-process.js +16 -25
- package/lib/device-path-provider.js +23 -34
- package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +149 -164
- package/lib/device-sockets/ios/notification.js +1 -1
- package/lib/device-sockets/ios/socket-request-executor.js +24 -39
- package/lib/helpers/android-bundle-validator-helper.js +1 -1
- package/lib/helpers/deploy-command-helper.js +44 -49
- package/lib/helpers/key-command-helper.js +4 -13
- package/lib/helpers/livesync-command-helper.js +137 -152
- package/lib/helpers/network-connectivity-validator.js +6 -17
- package/lib/helpers/options-track-helper.js +6 -17
- package/lib/helpers/platform-command-helper.js +99 -120
- package/lib/key-commands/index.js +150 -200
- package/lib/nativescript-cli.js +5 -14
- package/lib/node-package-manager.js +81 -104
- package/lib/options.js +3 -12
- package/lib/package-installation-manager.js +130 -165
- package/lib/package-manager.js +63 -86
- package/lib/platform-command-param.js +4 -15
- package/lib/pnpm-package-manager.js +59 -78
- package/lib/project-data.js +1 -1
- package/lib/providers/project-files-provider.js +1 -1
- package/lib/services/analytics/analytics-broker-process.js +13 -22
- package/lib/services/analytics/analytics-broker.js +17 -30
- package/lib/services/analytics/analytics-service.js +163 -199
- package/lib/services/analytics/google-analytics-provider.js +41 -56
- package/lib/services/analytics-settings-service.js +15 -32
- package/lib/services/android/android-bundle-tool-service.js +43 -60
- package/lib/services/android/gradle-build-args-service.js +9 -20
- package/lib/services/android/gradle-build-service.js +22 -35
- package/lib/services/android/gradle-command-service.js +22 -35
- package/lib/services/android-device-debug-service.js +90 -117
- package/lib/services/android-plugin-build-service.js +205 -231
- package/lib/services/android-project-service.js +126 -171
- package/lib/services/android-resources-migration-service.js +51 -64
- package/lib/services/apple-portal/apple-portal-application-service.js +46 -63
- package/lib/services/apple-portal/apple-portal-session-service.js +195 -214
- package/lib/services/apple-portal/srp/srp-wrapper.js +43 -58
- package/lib/services/assets-generation/assets-generation-service.js +103 -117
- package/lib/services/build-artifacts-service.js +9 -20
- package/lib/services/build-info-file-service.js +20 -35
- package/lib/services/cleanup-service.js +47 -76
- package/lib/services/cocoapods-service.js +111 -132
- package/lib/services/device/device-install-app-service.js +54 -71
- package/lib/services/doctor-service.js +99 -118
- package/lib/services/extensibility-service.js +81 -100
- package/lib/services/files-hash-service.js +26 -43
- package/lib/services/hmr-status-service.js +1 -1
- package/lib/services/initialize-service.js +37 -50
- package/lib/services/ios/export-options-plist-service.js +38 -51
- package/lib/services/ios/ios-signing-service.js +168 -187
- package/lib/services/ios/spm-service.js +47 -51
- package/lib/services/ios/xcodebuild-args-service.js +77 -94
- package/lib/services/ios/xcodebuild-command-service.js +14 -25
- package/lib/services/ios/xcodebuild-service.js +52 -71
- package/lib/services/ios-debugger-port-service.js +24 -37
- package/lib/services/ios-device-debug-service.js +75 -102
- package/lib/services/ios-entitlements-service.js +31 -42
- package/lib/services/ios-extensions-service.js +18 -29
- package/lib/services/ios-project-service.js +419 -460
- package/lib/services/ios-provision-service.js +108 -129
- package/lib/services/ios-watch-app-service.js +21 -32
- package/lib/services/ip-service.js +38 -53
- package/lib/services/itmstransporter-service.js +129 -152
- package/lib/services/livesync/android-device-livesync-service-base.js +31 -48
- package/lib/services/livesync/android-device-livesync-service.js +120 -149
- package/lib/services/livesync/android-device-livesync-sockets-service.js +121 -152
- package/lib/services/livesync/android-livesync-service.js +14 -35
- package/lib/services/livesync/android-livesync-tool.js +90 -113
- package/lib/services/livesync/device-livesync-service-base.js +15 -28
- package/lib/services/livesync/ios-device-livesync-service.js +114 -143
- package/lib/services/livesync/ios-livesync-service.js +42 -58
- package/lib/services/livesync/platform-livesync-service-base.js +94 -119
- package/lib/services/log-parser-service.js +1 -1
- package/lib/services/log-source-map-service.js +30 -41
- package/lib/services/marking-mode-service.js +15 -28
- package/lib/services/npm-config-service.js +1 -1
- package/lib/services/pacote-service.js +49 -64
- package/lib/services/performance-service.js +1 -1
- package/lib/services/platform/add-platform-service.js +50 -71
- package/lib/services/platform/platform-validation-service.js +22 -33
- package/lib/services/platform/prepare-native-platform-service.js +49 -62
- package/lib/services/platform-environment-requirements.js +26 -37
- package/lib/services/plugins-service.js +122 -147
- package/lib/services/project-backup-service.js +1 -1
- package/lib/services/project-changes-service.js +124 -141
- package/lib/services/project-cleanup-service.js +64 -77
- package/lib/services/project-config-service.js +71 -80
- package/lib/services/project-data-service.js +101 -118
- package/lib/services/project-name-service.js +28 -43
- package/lib/services/project-service.js +84 -103
- package/lib/services/project-templates-service.js +52 -67
- package/lib/services/start-service.js +41 -59
- package/lib/services/temp-service.js +8 -21
- package/lib/services/terminal-spinner-service.js +15 -26
- package/lib/services/test-execution-service.js +59 -72
- package/lib/services/test-initialization-service.js +2 -2
- package/lib/services/timeline-profiler-service.js +1 -1
- package/lib/services/versions-service.js +119 -138
- package/lib/services/webpack/webpack-compiler-service.js +214 -234
- package/lib/services/xcconfig-service.js +8 -19
- package/lib/sys-info.js +45 -62
- package/lib/tools/node-modules/node-modules-builder.js +16 -27
- package/lib/yarn-package-manager.js +59 -78
- package/lib/yarn2-package-manager.js +60 -79
- package/package.json +66 -81
- 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
package/lib/commands/debug.js
CHANGED
|
@@ -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.DebugAndroidCommand = exports.DebugIOSCommand = exports.DebugPlatformCommand = void 0;
|
|
19
10
|
const decorators_1 = require("../common/decorators");
|
|
@@ -36,56 +27,49 @@ class DebugPlatformCommand extends command_base_1.ValidatePlatformCommandBase {
|
|
|
36
27
|
this.allowedParameters = [];
|
|
37
28
|
$cleanupService.setShouldDispose(false);
|
|
38
29
|
}
|
|
39
|
-
execute(args) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
skipDeviceDetectionInterval: true,
|
|
46
|
-
});
|
|
47
|
-
const selectedDeviceForDebug = yield this.$devicesService.pickSingleDevice({
|
|
48
|
-
onlyEmulators: this.$options.emulator,
|
|
49
|
-
onlyDevices: this.$options.forDevice,
|
|
50
|
-
deviceId: this.$options.device,
|
|
51
|
-
});
|
|
52
|
-
if (this.$options.start) {
|
|
53
|
-
const debugOptions = _.cloneDeep(this.$options.argv);
|
|
54
|
-
const debugData = this.$debugDataService.getDebugData(selectedDeviceForDebug.deviceInfo.identifier, this.$projectData, debugOptions);
|
|
55
|
-
yield this.$debugController.printDebugInformation(yield this.$debugController.startDebug(debugData));
|
|
56
|
-
return;
|
|
57
|
-
}
|
|
58
|
-
yield this.$liveSyncCommandHelper.executeLiveSyncOperation([selectedDeviceForDebug], this.platform, {
|
|
59
|
-
deviceDebugMap: {
|
|
60
|
-
[selectedDeviceForDebug.deviceInfo.identifier]: true,
|
|
61
|
-
},
|
|
62
|
-
buildPlatform: undefined,
|
|
63
|
-
skipNativePrepare: false,
|
|
64
|
-
});
|
|
30
|
+
async execute(args) {
|
|
31
|
+
await this.$devicesService.initialize({
|
|
32
|
+
platform: this.platform,
|
|
33
|
+
deviceId: this.$options.device,
|
|
34
|
+
emulator: this.$options.emulator,
|
|
35
|
+
skipDeviceDetectionInterval: true,
|
|
65
36
|
});
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
37
|
+
const selectedDeviceForDebug = await this.$devicesService.pickSingleDevice({
|
|
38
|
+
onlyEmulators: this.$options.emulator,
|
|
39
|
+
onlyDevices: this.$options.forDevice,
|
|
40
|
+
deviceId: this.$options.device,
|
|
70
41
|
});
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
42
|
+
if (this.$options.start) {
|
|
43
|
+
const debugOptions = _.cloneDeep(this.$options.argv);
|
|
44
|
+
const debugData = this.$debugDataService.getDebugData(selectedDeviceForDebug.deviceInfo.identifier, this.$projectData, debugOptions);
|
|
45
|
+
await this.$debugController.printDebugInformation(await this.$debugController.startDebug(debugData));
|
|
46
|
+
return;
|
|
47
|
+
}
|
|
48
|
+
await this.$liveSyncCommandHelper.executeLiveSyncOperation([selectedDeviceForDebug], this.platform, {
|
|
49
|
+
deviceDebugMap: {
|
|
50
|
+
[selectedDeviceForDebug.deviceInfo.identifier]: true,
|
|
51
|
+
},
|
|
52
|
+
buildPlatform: undefined,
|
|
53
|
+
skipNativePrepare: false,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
async canExecute(args) {
|
|
57
|
+
if (!this.$options.force) {
|
|
58
|
+
await this.$migrateController.validate({
|
|
59
|
+
projectDir: this.$projectData.projectDir,
|
|
60
|
+
platforms: [this.platform],
|
|
86
61
|
});
|
|
87
|
-
|
|
62
|
+
}
|
|
63
|
+
if (!this.$platformValidationService.isPlatformSupportedForOS(this.platform, this.$projectData)) {
|
|
64
|
+
this.$errors.fail(`Applications for platform ${this.platform} can not be built on this OS`);
|
|
65
|
+
}
|
|
66
|
+
if (this.$options.release) {
|
|
67
|
+
this.$errors.failWithHelp("--release flag is not applicable to this command.");
|
|
68
|
+
}
|
|
69
|
+
const result = await super.canExecuteCommandBase(this.platform, {
|
|
70
|
+
validateOptions: true,
|
|
88
71
|
});
|
|
72
|
+
return result;
|
|
89
73
|
}
|
|
90
74
|
}
|
|
91
75
|
exports.DebugPlatformCommand = DebugPlatformCommand;
|
|
@@ -112,25 +96,23 @@ class DebugIOSCommand {
|
|
|
112
96
|
execute(args) {
|
|
113
97
|
return this.debugPlatformCommand.execute(args);
|
|
114
98
|
}
|
|
115
|
-
canExecute(args) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
this.$errors.fail(`You cannot use NativeScript Inspector on this OS. To use it, please update your OS.`);
|
|
129
|
-
}
|
|
99
|
+
async canExecute(args) {
|
|
100
|
+
if (!this.$platformValidationService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
|
|
101
|
+
this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
|
|
102
|
+
}
|
|
103
|
+
const isValidTimeoutOption = this.isValidTimeoutOption();
|
|
104
|
+
if (!isValidTimeoutOption) {
|
|
105
|
+
this.$errors.fail(`Timeout option specifies the seconds NativeScript CLI will wait to find the inspector socket port from device's logs. Must be a number.`);
|
|
106
|
+
}
|
|
107
|
+
if (this.$options.inspector) {
|
|
108
|
+
const macOSWarning = await this.$sysInfo.getMacOSWarningMessage();
|
|
109
|
+
if (macOSWarning &&
|
|
110
|
+
macOSWarning.severity === "high") {
|
|
111
|
+
this.$errors.fail(`You cannot use NativeScript Inspector on this OS. To use it, please update your OS.`);
|
|
130
112
|
}
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
113
|
+
}
|
|
114
|
+
const result = await this.debugPlatformCommand.canExecute(args);
|
|
115
|
+
return result;
|
|
134
116
|
}
|
|
135
117
|
isValidTimeoutOption() {
|
|
136
118
|
if (!this.$options.timeout) {
|
|
@@ -146,10 +128,10 @@ class DebugIOSCommand {
|
|
|
146
128
|
return true;
|
|
147
129
|
}
|
|
148
130
|
}
|
|
131
|
+
exports.DebugIOSCommand = DebugIOSCommand;
|
|
149
132
|
__decorate([
|
|
150
133
|
(0, decorators_1.cache)()
|
|
151
134
|
], DebugIOSCommand.prototype, "debugPlatformCommand", null);
|
|
152
|
-
exports.DebugIOSCommand = DebugIOSCommand;
|
|
153
135
|
yok_1.injector.registerCommand("debug|ios", DebugIOSCommand);
|
|
154
136
|
class DebugAndroidCommand {
|
|
155
137
|
get debugPlatformCommand() {
|
|
@@ -167,25 +149,21 @@ class DebugAndroidCommand {
|
|
|
167
149
|
this.platform = this.$devicePlatformsConstants.Android;
|
|
168
150
|
this.$projectData.initializeProjectData();
|
|
169
151
|
}
|
|
170
|
-
execute(args) {
|
|
171
|
-
return
|
|
172
|
-
return this.debugPlatformCommand.execute(args);
|
|
173
|
-
});
|
|
152
|
+
async execute(args) {
|
|
153
|
+
return this.debugPlatformCommand.execute(args);
|
|
174
154
|
}
|
|
175
|
-
canExecute(args) {
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
if (
|
|
179
|
-
|
|
180
|
-
this.$errors.failWithHelp(constants_1.ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE);
|
|
181
|
-
}
|
|
155
|
+
async canExecute(args) {
|
|
156
|
+
const canExecuteBase = await this.debugPlatformCommand.canExecute(args);
|
|
157
|
+
if (canExecuteBase) {
|
|
158
|
+
if (this.$options.aab && !(0, helpers_1.hasValidAndroidSigning)(this.$options)) {
|
|
159
|
+
this.$errors.failWithHelp(constants_1.ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE);
|
|
182
160
|
}
|
|
183
|
-
|
|
184
|
-
|
|
161
|
+
}
|
|
162
|
+
return canExecuteBase;
|
|
185
163
|
}
|
|
186
164
|
}
|
|
165
|
+
exports.DebugAndroidCommand = DebugAndroidCommand;
|
|
187
166
|
__decorate([
|
|
188
167
|
(0, decorators_1.cache)()
|
|
189
168
|
], DebugAndroidCommand.prototype, "debugPlatformCommand", null);
|
|
190
|
-
exports.DebugAndroidCommand = DebugAndroidCommand;
|
|
191
169
|
yok_1.injector.registerCommand("debug|android", DebugAndroidCommand);
|
package/lib/commands/deploy.js
CHANGED
|
@@ -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.DeployOnDeviceCommand = void 0;
|
|
13
4
|
const constants_1 = require("../constants");
|
|
@@ -33,45 +24,38 @@ class DeployOnDeviceCommand extends command_base_1.ValidatePlatformCommandBase {
|
|
|
33
24
|
};
|
|
34
25
|
this.$projectData.initializeProjectData();
|
|
35
26
|
}
|
|
36
|
-
execute(args) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
yield this.$deployCommandHelper.deploy(platform);
|
|
40
|
-
});
|
|
27
|
+
async execute(args) {
|
|
28
|
+
const platform = args[0];
|
|
29
|
+
await this.$deployCommandHelper.deploy(platform);
|
|
41
30
|
}
|
|
42
|
-
canExecute(args) {
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
31
|
+
async canExecute(args) {
|
|
32
|
+
const platform = args[0];
|
|
33
|
+
if (!this.$options.force) {
|
|
34
|
+
await this.$migrateController.validate({
|
|
35
|
+
projectDir: this.$projectData.projectDir,
|
|
36
|
+
platforms: [platform],
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
if (!args || !args.length || args.length > 1) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
if (!(await this.$platformCommandParameter.validate(platform))) {
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
if (this.$mobileHelper.isAndroidPlatform(platform) &&
|
|
46
|
+
(this.$options.release || this.$options.aab) &&
|
|
47
|
+
!(0, helpers_1.hasValidAndroidSigning)(this.$options)) {
|
|
48
|
+
if (this.$options.release) {
|
|
49
|
+
this.$errors.failWithHelp(constants_1.ANDROID_RELEASE_BUILD_ERROR_MESSAGE);
|
|
59
50
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
!(0, helpers_1.hasValidAndroidSigning)(this.$options)) {
|
|
63
|
-
if (this.$options.release) {
|
|
64
|
-
this.$errors.failWithHelp(constants_1.ANDROID_RELEASE_BUILD_ERROR_MESSAGE);
|
|
65
|
-
}
|
|
66
|
-
else {
|
|
67
|
-
this.$errors.failWithHelp(constants_1.ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE);
|
|
68
|
-
}
|
|
51
|
+
else {
|
|
52
|
+
this.$errors.failWithHelp(constants_1.ANDROID_APP_BUNDLE_SIGNING_ERROR_MESSAGE);
|
|
69
53
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
return result;
|
|
54
|
+
}
|
|
55
|
+
const result = await super.canExecuteCommandBase(platform, {
|
|
56
|
+
validateOptions: true,
|
|
74
57
|
});
|
|
58
|
+
return result;
|
|
75
59
|
}
|
|
76
60
|
}
|
|
77
61
|
exports.DeployOnDeviceCommand = DeployOnDeviceCommand;
|
|
@@ -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.EmbedCommand = void 0;
|
|
13
4
|
const yok_1 = require("../../common/yok");
|
|
@@ -36,52 +27,42 @@ class EmbedCommand extends prepare_1.PrepareCommand {
|
|
|
36
27
|
}
|
|
37
28
|
return (0, path_1.resolve)(hostProjectPath);
|
|
38
29
|
}
|
|
39
|
-
execute(args) {
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
if (args.length > 2) {
|
|
52
|
-
this.$options["hostProjectModuleName"] = args[2];
|
|
53
|
-
}
|
|
54
|
-
return _super.execute.call(this, args);
|
|
55
|
-
});
|
|
30
|
+
async execute(args) {
|
|
31
|
+
const hostProjectPath = args[1];
|
|
32
|
+
const resolvedHostProjectPath = this.resolveHostProjectPath(hostProjectPath);
|
|
33
|
+
if (!this.$fs.exists(resolvedHostProjectPath)) {
|
|
34
|
+
this.$logger.error(`The host project path ${color_1.color.yellow(hostProjectPath)} (resolved to: ${color_1.color.yellow.dim(resolvedHostProjectPath)}) does not exist.`);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
this.$options["hostProjectPath"] = resolvedHostProjectPath;
|
|
38
|
+
if (args.length > 2) {
|
|
39
|
+
this.$options["hostProjectModuleName"] = args[2];
|
|
40
|
+
}
|
|
41
|
+
return super.execute(args);
|
|
56
42
|
}
|
|
57
|
-
canExecute(args) {
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
if (!args[1]) {
|
|
68
|
-
const hostProjectPath = this.getEmbedConfigForKey("hostProjectPath", platform);
|
|
69
|
-
if (hostProjectPath) {
|
|
70
|
-
args[1] = hostProjectPath;
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
if (!args[2]) {
|
|
74
|
-
const hostProjectModuleName = this.getEmbedConfigForKey("hostProjectModuleName", platform);
|
|
75
|
-
if (hostProjectModuleName) {
|
|
76
|
-
args[2] = hostProjectModuleName;
|
|
77
|
-
}
|
|
43
|
+
async canExecute(args) {
|
|
44
|
+
const canSuperExecute = await super.canExecute(args);
|
|
45
|
+
if (!canSuperExecute) {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
const platform = args[0].toLowerCase();
|
|
49
|
+
if (!args[1]) {
|
|
50
|
+
const hostProjectPath = this.getEmbedConfigForKey("hostProjectPath", platform);
|
|
51
|
+
if (hostProjectPath) {
|
|
52
|
+
args[1] = hostProjectPath;
|
|
78
53
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
54
|
+
}
|
|
55
|
+
if (!args[2]) {
|
|
56
|
+
const hostProjectModuleName = this.getEmbedConfigForKey("hostProjectModuleName", platform);
|
|
57
|
+
if (hostProjectModuleName) {
|
|
58
|
+
args[2] = hostProjectModuleName;
|
|
82
59
|
}
|
|
83
|
-
|
|
84
|
-
|
|
60
|
+
}
|
|
61
|
+
console.log(args);
|
|
62
|
+
if (args.length < 2) {
|
|
63
|
+
return false;
|
|
64
|
+
}
|
|
65
|
+
return true;
|
|
85
66
|
}
|
|
86
67
|
getEmbedConfigForKey(key, platform) {
|
|
87
68
|
return this.$projectConfigService.getValue(`embed.${platform}.${key}`, this.$projectConfigService.getValue(`embed.${key}`));
|
|
@@ -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.InstallExtensionCommand = void 0;
|
|
13
4
|
const yok_1 = require("../../common/yok");
|
|
@@ -20,13 +11,11 @@ class InstallExtensionCommand {
|
|
|
20
11
|
this.$stringParameterBuilder.createMandatoryParameter("You have to provide a valid name for extension that you want to install."),
|
|
21
12
|
];
|
|
22
13
|
}
|
|
23
|
-
execute(args) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
this.$logger.info(`Successfully loaded extension ${extensionData.extensionName}.`);
|
|
29
|
-
});
|
|
14
|
+
async execute(args) {
|
|
15
|
+
const extensionData = await this.$extensibilityService.installExtension(args[0]);
|
|
16
|
+
this.$logger.info(`Successfully installed extension ${extensionData.extensionName}.`);
|
|
17
|
+
await this.$extensibilityService.loadExtension(extensionData.extensionName);
|
|
18
|
+
this.$logger.info(`Successfully loaded extension ${extensionData.extensionName}.`);
|
|
30
19
|
}
|
|
31
20
|
}
|
|
32
21
|
exports.InstallExtensionCommand = InstallExtensionCommand;
|
|
@@ -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.ListExtensionsCommand = void 0;
|
|
13
4
|
const _ = require("lodash");
|
|
@@ -19,21 +10,19 @@ class ListExtensionsCommand {
|
|
|
19
10
|
this.$logger = $logger;
|
|
20
11
|
this.allowedParameters = [];
|
|
21
12
|
}
|
|
22
|
-
execute(args) {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
}
|
|
36
|
-
});
|
|
13
|
+
async execute(args) {
|
|
14
|
+
const installedExtensions = this.$extensibilityService.getInstalledExtensions();
|
|
15
|
+
if (_.keys(installedExtensions).length) {
|
|
16
|
+
this.$logger.info("Installed extensions:");
|
|
17
|
+
const data = _.map(installedExtensions, (version, name) => {
|
|
18
|
+
return [name, version];
|
|
19
|
+
});
|
|
20
|
+
const table = helpers.createTable(["Name", "Version"], data);
|
|
21
|
+
this.$logger.info(table.toString());
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
this.$logger.info("No extensions installed.");
|
|
25
|
+
}
|
|
37
26
|
}
|
|
38
27
|
}
|
|
39
28
|
exports.ListExtensionsCommand = ListExtensionsCommand;
|
|
@@ -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.UninstallExtensionCommand = void 0;
|
|
13
4
|
const yok_1 = require("../../common/yok");
|
|
@@ -20,12 +11,10 @@ class UninstallExtensionCommand {
|
|
|
20
11
|
this.$stringParameterBuilder.createMandatoryParameter("You have to provide a valid name for extension that you want to uninstall."),
|
|
21
12
|
];
|
|
22
13
|
}
|
|
23
|
-
execute(args) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
this.$logger.info(`Successfully uninstalled extension ${extensionName}`);
|
|
28
|
-
});
|
|
14
|
+
async execute(args) {
|
|
15
|
+
const extensionName = args[0];
|
|
16
|
+
await this.$extensibilityService.uninstallExtension(extensionName);
|
|
17
|
+
this.$logger.info(`Successfully uninstalled extension ${extensionName}`);
|
|
29
18
|
}
|
|
30
19
|
}
|
|
31
20
|
exports.UninstallExtensionCommand = UninstallExtensionCommand;
|
package/lib/commands/fonts.js
CHANGED
|
@@ -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.FontsCommand = void 0;
|
|
13
4
|
const yok_1 = require("../common/yok");
|
|
@@ -24,40 +15,38 @@ class FontsCommand {
|
|
|
24
15
|
this.allowedParameters = [];
|
|
25
16
|
this.$projectData.initializeProjectData();
|
|
26
17
|
}
|
|
27
|
-
execute(args) {
|
|
18
|
+
async execute(args) {
|
|
28
19
|
var _a;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return supportedExtensions.includes(entry.ext);
|
|
46
|
-
});
|
|
47
|
-
if (!files.length) {
|
|
48
|
-
this.$logger.warn("No custom fonts found.");
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
const table = (0, helpers_1.createTable)(["Font", "CSS Properties"], []);
|
|
52
|
-
for (const file of files) {
|
|
53
|
-
const font = yield fontFinder.get(fontsFolderPath + "/" + file.base);
|
|
54
|
-
table.push([
|
|
55
|
-
file.base,
|
|
56
|
-
`font-family: "${font.name}", "${file.name}"; font-weight: ${font.weight};`,
|
|
57
|
-
]);
|
|
58
|
-
}
|
|
59
|
-
this.$logger.info(table.toString());
|
|
20
|
+
const supportedExtensions = [".ttf", ".otf"];
|
|
21
|
+
const defaultFontsFolderPaths = [
|
|
22
|
+
path.join((_a = this.$projectConfigService.getValue("appPath")) !== null && _a !== void 0 ? _a : "", constants.FONTS_DIR),
|
|
23
|
+
path.join(constants.APP_FOLDER_NAME, constants.FONTS_DIR),
|
|
24
|
+
path.join(constants.SRC_DIR, constants.FONTS_DIR),
|
|
25
|
+
].map((entry) => path.resolve(this.$projectData.projectDir, entry));
|
|
26
|
+
const fontsFolderPath = defaultFontsFolderPaths.find((entry) => this.$fs.exists(entry));
|
|
27
|
+
if (!fontsFolderPath) {
|
|
28
|
+
this.$logger.warn("No fonts folder found.");
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
31
|
+
const files = this.$fs
|
|
32
|
+
.readDirectory(fontsFolderPath)
|
|
33
|
+
.map((entry) => path.parse(entry))
|
|
34
|
+
.filter((entry) => {
|
|
35
|
+
return supportedExtensions.includes(entry.ext);
|
|
60
36
|
});
|
|
37
|
+
if (!files.length) {
|
|
38
|
+
this.$logger.warn("No custom fonts found.");
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const table = (0, helpers_1.createTable)(["Font", "CSS Properties"], []);
|
|
42
|
+
for (const file of files) {
|
|
43
|
+
const font = await fontFinder.get(fontsFolderPath + "/" + file.base);
|
|
44
|
+
table.push([
|
|
45
|
+
file.base,
|
|
46
|
+
`font-family: "${font.name}", "${file.name}"; font-weight: ${font.weight};`,
|
|
47
|
+
]);
|
|
48
|
+
}
|
|
49
|
+
this.$logger.info(table.toString());
|
|
61
50
|
}
|
|
62
51
|
}
|
|
63
52
|
exports.FontsCommand = FontsCommand;
|