nativescript 9.0.3 → 9.0.4-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/lib/android-tools-info.js +0 -12
- package/lib/base-package-manager.js +0 -7
- package/lib/bootstrap.js +1 -5
- package/lib/bun-package-manager.js +1 -14
- package/lib/color.js +0 -4
- package/lib/commands/add-platform.js +0 -1
- package/lib/commands/apple-login.js +0 -1
- package/lib/commands/appstore-list.js +0 -1
- package/lib/commands/appstore-upload.js +0 -3
- package/lib/commands/build.js +2 -3
- package/lib/commands/clean.js +1 -22
- package/lib/commands/command-base.js +0 -1
- package/lib/commands/config.js +0 -5
- package/lib/commands/create-project.js +0 -6
- package/lib/commands/debug.js +1 -6
- package/lib/commands/deploy.js +2 -3
- package/lib/commands/embedding/embed.js +0 -7
- package/lib/commands/extensibility/install-extension.js +0 -1
- package/lib/commands/extensibility/list-extensions.js +0 -1
- package/lib/commands/extensibility/uninstall-extension.js +0 -1
- package/lib/commands/fonts.js +0 -1
- package/lib/commands/generate-assets.js +0 -1
- package/lib/commands/generate-help.js +0 -1
- package/lib/commands/generate.js +1 -48
- package/lib/commands/hooks/common.js +1 -2
- package/lib/commands/hooks/hooks-lock.js +0 -1
- package/lib/commands/hooks/hooks.js +0 -1
- package/lib/commands/info.js +0 -1
- package/lib/commands/install.js +0 -1
- package/lib/commands/list-platforms.js +0 -1
- package/lib/commands/migrate.js +0 -1
- package/lib/commands/native-add.js +0 -5
- package/lib/commands/platform-clean.js +0 -1
- package/lib/commands/plugin/add-plugin.js +0 -1
- package/lib/commands/plugin/build-plugin.js +0 -1
- package/lib/commands/plugin/create-plugin.js +0 -5
- package/lib/commands/plugin/list-plugins.js +0 -1
- package/lib/commands/plugin/remove-plugin.js +0 -2
- package/lib/commands/plugin/update-plugin.js +0 -1
- package/lib/commands/post-install.js +0 -6
- package/lib/commands/prepare.js +3 -4
- package/lib/commands/preview.js +0 -2
- package/lib/commands/remove-platform.js +0 -1
- package/lib/commands/resources/resources-update.js +0 -2
- package/lib/commands/run.js +0 -1
- package/lib/commands/setup.js +0 -1
- package/lib/commands/start.js +0 -1
- package/lib/commands/test-init.js +0 -4
- package/lib/commands/test.js +2 -9
- package/lib/commands/typings.js +1 -2
- package/lib/commands/update-platform.js +0 -5
- package/lib/commands/update.js +0 -2
- package/lib/commands/widget.js +1 -20
- package/lib/common/bootstrap.js +0 -1
- package/lib/common/child-process.js +0 -3
- package/lib/common/codeGeneration/code-entity.js +0 -1
- package/lib/common/codeGeneration/code-printer.js +0 -1
- package/lib/common/command-params.js +0 -1
- package/lib/common/commands/analytics.js +0 -3
- package/lib/common/commands/autocompletion.js +0 -3
- package/lib/common/commands/device/device-log-stream.js +0 -1
- package/lib/common/commands/device/get-file.js +0 -2
- package/lib/common/commands/device/list-applications.js +0 -1
- package/lib/common/commands/device/list-devices.js +0 -3
- package/lib/common/commands/device/list-files.js +0 -2
- package/lib/common/commands/device/put-file.js +0 -2
- package/lib/common/commands/device/run-application.js +0 -1
- package/lib/common/commands/device/stop-application.js +0 -1
- package/lib/common/commands/device/uninstall-application.js +0 -1
- package/lib/common/commands/doctor.js +2 -3
- package/lib/common/commands/generate-messages.js +0 -1
- package/lib/common/commands/help.js +0 -1
- package/lib/common/commands/package-manager-get.js +0 -1
- package/lib/common/commands/package-manager-set.js +0 -1
- package/lib/common/commands/post-install.js +0 -1
- package/lib/common/commands/preuninstall.js +2 -11
- package/lib/common/commands/proxy/proxy-base.js +0 -4
- package/lib/common/commands/proxy/proxy-clear.js +0 -1
- package/lib/common/commands/proxy/proxy-get.js +0 -1
- package/lib/common/commands/proxy/proxy-set.js +0 -1
- package/lib/common/common-lib.js +0 -1
- package/lib/common/constants.js +0 -11
- package/lib/common/decorators.js +0 -48
- package/lib/common/dispatchers.js +1 -10
- package/lib/common/errors.js +3 -13
- package/lib/common/file-system.js +2 -13
- package/lib/common/header.js +0 -3
- package/lib/common/helpers.js +3 -89
- package/lib/common/host-info.js +0 -4
- package/lib/common/http-client.js +0 -20
- package/lib/common/logger/appenders/cli-appender.js +0 -4
- package/lib/common/logger/appenders/emit-appender.js +0 -4
- package/lib/common/logger/layouts/cli-layout.js +0 -1
- package/lib/common/logger/logger.js +0 -5
- package/lib/common/messages/messages.js +0 -6
- package/lib/common/mobile/android/android-application-manager.js +1 -20
- package/lib/common/mobile/android/android-debug-bridge-result-handler.js +0 -1
- package/lib/common/mobile/android/android-debug-bridge.js +0 -6
- package/lib/common/mobile/android/android-device-file-system.js +0 -4
- package/lib/common/mobile/android/android-device-hash-service.js +0 -3
- package/lib/common/mobile/android/android-device.js +0 -8
- package/lib/common/mobile/android/android-emulator-services.js +1 -2
- package/lib/common/mobile/android/android-ini-file-parser.js +0 -9
- package/lib/common/mobile/android/android-log-filter.js +0 -4
- package/lib/common/mobile/android/android-virtual-device-service.js +0 -26
- package/lib/common/mobile/android/device-android-debug-bridge.js +0 -1
- package/lib/common/mobile/android/genymotion/genymotion-service.js +1 -6
- package/lib/common/mobile/android/genymotion/virtualbox-service.js +0 -11
- package/lib/common/mobile/android/logcat-helper.js +0 -13
- package/lib/common/mobile/application-manager-base.js +0 -6
- package/lib/common/mobile/device-emitter.js +0 -4
- package/lib/common/mobile/device-log-emitter.js +0 -1
- package/lib/common/mobile/device-log-provider-base.js +0 -1
- package/lib/common/mobile/device-log-provider.js +0 -23
- package/lib/common/mobile/device-platforms-constants.js +0 -1
- package/lib/common/mobile/emulator-helper.js +0 -3
- package/lib/common/mobile/ios/device/ios-application-manager.js +0 -3
- package/lib/common/mobile/ios/device/ios-device-file-system.js +0 -1
- package/lib/common/mobile/ios/device/ios-device-operations.js +0 -4
- package/lib/common/mobile/ios/device/ios-device.js +0 -4
- package/lib/common/mobile/ios/ios-device-base.js +0 -1
- package/lib/common/mobile/ios/ios-device-product-name-mapper.js +0 -2
- package/lib/common/mobile/ios/ios-log-filter.js +0 -1
- package/lib/common/mobile/ios/simulator/ios-emulator-services.js +0 -4
- package/lib/common/mobile/ios/simulator/ios-sim-resolver.js +0 -1
- package/lib/common/mobile/ios/simulator/ios-simulator-application-manager.js +0 -6
- package/lib/common/mobile/ios/simulator/ios-simulator-device.js +0 -5
- package/lib/common/mobile/ios/simulator/ios-simulator-file-system.js +0 -1
- package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.js +0 -1
- package/lib/common/mobile/local-to-device-path-data-factory.js +0 -1
- package/lib/common/mobile/log-filter.js +0 -2
- package/lib/common/mobile/logging-levels.js +0 -1
- package/lib/common/mobile/mobile-core/android-device-discovery.js +0 -2
- package/lib/common/mobile/mobile-core/android-emulator-discovery.js +0 -3
- package/lib/common/mobile/mobile-core/android-process-service.js +0 -32
- package/lib/common/mobile/mobile-core/device-discovery.js +0 -1
- package/lib/common/mobile/mobile-core/devices-service.js +0 -69
- package/lib/common/mobile/mobile-core/ios-device-discovery.js +0 -2
- package/lib/common/mobile/mobile-core/ios-simulator-discovery.js +0 -3
- package/lib/common/mobile/mobile-helper.js +0 -1
- package/lib/common/mobile/wp8/wp8-emulator-services.js +0 -1
- package/lib/common/opener.js +0 -1
- package/lib/common/os-info.js +0 -1
- package/lib/common/plist-parser.js +0 -1
- package/lib/common/project-helper.js +0 -1
- package/lib/common/prompter.js +1 -9
- package/lib/common/queue.js +0 -1
- package/lib/common/resource-loader.js +0 -1
- package/lib/common/services/auto-completion-service.js +1 -13
- package/lib/common/services/cancellation.js +1 -2
- package/lib/common/services/commands-service.js +6 -17
- package/lib/common/services/help-service.js +3 -11
- package/lib/common/services/hooks-service.js +0 -13
- package/lib/common/services/ios-notification-service.js +0 -1
- package/lib/common/services/json-file-settings-service.js +0 -6
- package/lib/common/services/lock-service.js +0 -6
- package/lib/common/services/message-contract-generator.js +0 -1
- package/lib/common/services/messages-service.js +0 -1
- package/lib/common/services/micro-templating-service.js +0 -6
- package/lib/common/services/net-service.js +0 -3
- package/lib/common/services/project-files-manager.js +0 -5
- package/lib/common/services/project-files-provider-base.js +0 -1
- package/lib/common/services/proxy-service.js +0 -1
- package/lib/common/services/qr.js +0 -1
- package/lib/common/services/settings-service.js +0 -1
- package/lib/common/services/xcode-select-service.js +0 -1
- package/lib/common/utils.js +0 -1
- package/lib/common/validators/project-name-validator.js +0 -1
- package/lib/common/validators/validation-result.js +0 -1
- package/lib/common/verify-node-version.js +1 -8
- package/lib/common/yok.js +11 -32
- package/lib/config.js +1 -22
- package/lib/constants-provider.js +0 -1
- package/lib/constants.js +0 -53
- package/lib/controllers/build-controller.js +3 -4
- package/lib/controllers/debug-controller.js +3 -8
- package/lib/controllers/deploy-controller.js +0 -1
- package/lib/controllers/migrate-controller.js +4 -90
- package/lib/controllers/platform-controller.js +1 -9
- package/lib/controllers/prepare-controller.js +4 -17
- package/lib/controllers/run-controller.js +1 -17
- package/lib/controllers/update-controller-base.js +0 -1
- package/lib/controllers/update-controller.js +0 -11
- package/lib/data/build-data.js +0 -1
- package/lib/data/controller-data-base.js +0 -1
- package/lib/data/debug-data.js +0 -1
- package/lib/data/platform-data.js +0 -1
- package/lib/data/prepare-data.js +0 -1
- package/lib/data/run-data.js +0 -1
- package/lib/detached-processes/cleanup-js-subprocess.js +2 -8
- package/lib/detached-processes/cleanup-process.js +14 -18
- package/lib/detached-processes/file-log-service.js +1 -2
- package/lib/device-path-provider.js +0 -1
- package/lib/device-sockets/ios/app-debug-socket-proxy-factory.js +0 -7
- package/lib/device-sockets/ios/notification.js +0 -3
- package/lib/device-sockets/ios/socket-request-executor.js +0 -3
- package/lib/helpers/android-bundle-validator-helper.js +1 -2
- package/lib/helpers/deploy-command-helper.js +0 -1
- package/lib/helpers/key-command-helper.js +2 -4
- package/lib/helpers/livesync-command-helper.js +1 -4
- package/lib/helpers/network-connectivity-validator.js +0 -1
- package/lib/helpers/options-track-helper.js +2 -3
- package/lib/helpers/package-path-helper.js +0 -1
- package/lib/helpers/platform-command-helper.js +2 -7
- package/lib/helpers/version-validator-helper.js +0 -1
- package/lib/key-commands/bootstrap.js +2 -3
- package/lib/key-commands/index.js +4 -5
- package/lib/nativescript-cli-lib-bootstrap.js +0 -4
- package/lib/nativescript-cli-lib.js +0 -1
- package/lib/nativescript-cli.js +1 -11
- package/lib/node/pbxproj-dom-xcode.js +0 -1
- package/lib/node/xcode.js +0 -1
- package/lib/node-package-manager.js +1 -11
- package/lib/options.js +119 -144
- package/lib/package-installation-manager.js +1 -8
- package/lib/package-manager.js +0 -2
- package/lib/platform-command-param.js +0 -1
- package/lib/pnpm-package-manager.js +1 -4
- package/lib/project-data.js +0 -12
- package/lib/providers/project-files-provider.js +0 -1
- package/lib/resolvers/livesync-service-resolver.js +0 -1
- package/lib/services/analytics/analytics-broker-process.js +6 -10
- package/lib/services/analytics/analytics-broker.js +1 -2
- package/lib/services/analytics/analytics-service.js +25 -29
- package/lib/services/analytics/google-analytics-provider.js +12 -13
- package/lib/services/analytics-settings-service.js +0 -5
- package/lib/services/android/android-bundle-tool-service.js +0 -1
- package/lib/services/android/gradle-build-args-service.js +0 -3
- package/lib/services/android/gradle-build-service.js +0 -1
- package/lib/services/android/gradle-command-service.js +0 -1
- package/lib/services/android-device-debug-service.js +0 -6
- package/lib/services/android-plugin-build-service.js +2 -31
- package/lib/services/android-project-service.js +4 -71
- package/lib/services/android-resources-migration-service.js +0 -7
- package/lib/services/apple-portal/apple-portal-application-service.js +0 -1
- package/lib/services/apple-portal/apple-portal-cookie-service.js +0 -1
- package/lib/services/apple-portal/apple-portal-session-service.js +4 -6
- package/lib/services/apple-portal/srp/srp-wrapper.js +1 -4
- package/lib/services/assets-generation/assets-generation-service.js +5 -10
- package/lib/services/build-artifacts-service.js +1 -2
- package/lib/services/build-data-service.js +0 -1
- package/lib/services/build-info-file-service.js +0 -1
- package/lib/services/bundler/bundler-compiler-service.js +1 -68
- package/lib/services/bundler/bundler.js +0 -1
- package/lib/services/cleanup-service.js +9 -13
- package/lib/services/cocoapods-platform-manager.js +0 -9
- package/lib/services/cocoapods-service.js +1 -21
- package/lib/services/debug-data-service.js +0 -1
- package/lib/services/debug-service-base.js +0 -7
- package/lib/services/device/device-install-app-service.js +1 -2
- package/lib/services/doctor-service.js +6 -21
- package/lib/services/extensibility-service.js +0 -8
- package/lib/services/files-hash-service.js +0 -1
- package/lib/services/hmr-status-service.js +0 -2
- package/lib/services/info-service.js +0 -1
- package/lib/services/initialize-service.js +1 -5
- package/lib/services/ios/export-options-plist-service.js +0 -4
- package/lib/services/ios/ios-signing-service.js +10 -7
- package/lib/services/ios/spm-service.js +0 -18
- package/lib/services/ios/xcodebuild-args-service.js +0 -11
- package/lib/services/ios/xcodebuild-command-service.js +0 -1
- package/lib/services/ios/xcodebuild-service.js +1 -2
- package/lib/services/ios-debugger-port-service.js +0 -1
- package/lib/services/ios-device-debug-service.js +0 -1
- package/lib/services/ios-entitlements-service.js +3 -2
- package/lib/services/ios-extensions-service.js +0 -1
- package/lib/services/ios-log-filter.js +0 -20
- package/lib/services/ios-native-target-service.js +4 -6
- package/lib/services/ios-project-service.js +11 -105
- package/lib/services/ios-provision-service.js +0 -3
- package/lib/services/ios-watch-app-service.js +0 -1
- package/lib/services/ip-service.js +0 -2
- package/lib/services/itmstransporter-service.js +0 -1
- package/lib/services/karma-execution.js +0 -2
- package/lib/services/livesync/android-device-livesync-service-base.js +0 -1
- package/lib/services/livesync/android-device-livesync-service.js +0 -2
- package/lib/services/livesync/android-device-livesync-sockets-service.js +0 -3
- package/lib/services/livesync/android-livesync-service.js +0 -1
- package/lib/services/livesync/android-livesync-tool.js +0 -4
- package/lib/services/livesync/device-livesync-service-base.js +0 -2
- package/lib/services/livesync/ios-device-livesync-service.js +0 -7
- package/lib/services/livesync/ios-livesync-service.js +0 -2
- package/lib/services/livesync/livesync-socket.js +0 -1
- package/lib/services/livesync/platform-livesync-service-base.js +0 -5
- package/lib/services/livesync-process-data-service.js +0 -1
- package/lib/services/log-parser-service.js +0 -1
- package/lib/services/log-source-map-service.js +0 -15
- package/lib/services/marking-mode-service.js +5 -8
- package/lib/services/metadata-filtering-service.js +0 -1
- package/lib/services/npm-config-service.js +0 -4
- package/lib/services/pacote-service.js +0 -7
- package/lib/services/performance-service.js +1 -3
- package/lib/services/platform/add-platform-service.js +2 -49
- package/lib/services/platform/platform-validation-service.js +0 -1
- package/lib/services/platform/prepare-native-platform-service.js +2 -5
- package/lib/services/platform-environment-requirements.js +3 -8
- package/lib/services/platform-project-service-base.js +0 -1
- package/lib/services/platforms-data-service.js +0 -1
- package/lib/services/plugins-service.js +2 -20
- package/lib/services/prepare-data-service.js +0 -1
- package/lib/services/project-backup-service.js +0 -4
- package/lib/services/project-changes-service.js +3 -14
- package/lib/services/project-cleanup-service.js +0 -2
- package/lib/services/project-config-service.js +2 -21
- package/lib/services/project-data-service.js +7 -36
- package/lib/services/project-name-service.js +0 -1
- package/lib/services/project-service.js +0 -10
- package/lib/services/project-templates-service.js +2 -3
- package/lib/services/qr-code-terminal-service.js +0 -1
- package/lib/services/require-service.js +0 -1
- package/lib/services/start-service.js +0 -1
- package/lib/services/temp-service.js +0 -3
- package/lib/services/terminal-spinner-service.js +0 -2
- package/lib/services/test-execution-service.js +2 -9
- package/lib/services/test-initialization-service.js +0 -4
- package/lib/services/timeline-profiler-service.js +0 -1
- package/lib/services/user-settings-service.js +0 -1
- package/lib/services/versions-service.js +4 -6
- package/lib/services/watch-ignore-list-service.js +0 -1
- package/lib/services/xcconfig-service.js +0 -2
- package/lib/services/xcproj-service.js +0 -1
- package/lib/shared-event-bus.js +0 -6
- package/lib/sys-info.js +1 -2
- package/lib/tools/config-manipulation/config-transformer.js +0 -12
- package/lib/tools/node-modules/node-modules-builder.js +0 -1
- package/lib/tools/node-modules/node-modules-dependencies-builder.js +0 -6
- package/lib/yarn-package-manager.js +0 -1
- package/lib/yarn2-package-manager.js +0 -3
- package/package.json +1 -1
|
@@ -27,14 +27,12 @@ class ProjectDataService {
|
|
|
27
27
|
this.$injector = $injector;
|
|
28
28
|
this.projectDataCache = {};
|
|
29
29
|
try {
|
|
30
|
-
// add the ProjectData of the default projectDir to the projectData cache
|
|
31
30
|
const projectData = this.$injector.resolve("projectData");
|
|
32
31
|
projectData.initializeProjectData();
|
|
33
32
|
this.defaultProjectDir = projectData.projectDir;
|
|
34
33
|
this.projectDataCache[this.defaultProjectDir] = projectData;
|
|
35
34
|
}
|
|
36
35
|
catch (e) {
|
|
37
|
-
// the CLI is required as a lib from a non-project folder
|
|
38
36
|
}
|
|
39
37
|
}
|
|
40
38
|
get $pluginsService() {
|
|
@@ -63,8 +61,6 @@ class ProjectDataService {
|
|
|
63
61
|
delete projectFileInfo.projectData[ProjectDataService.DEPENDENCIES_KEY_NAME][dependencyName];
|
|
64
62
|
this.$fs.writeJson(projectFileInfo.projectFilePath, projectFileInfo.projectData);
|
|
65
63
|
}
|
|
66
|
-
// TODO: Add tests
|
|
67
|
-
// TODO: Remove $projectData and replace it with $projectDataService.getProjectData
|
|
68
64
|
getProjectData(projectDir) {
|
|
69
65
|
projectDir = projectDir || this.defaultProjectDir;
|
|
70
66
|
this.projectDataCache[projectDir] =
|
|
@@ -116,10 +112,6 @@ class ProjectDataService {
|
|
|
116
112
|
this.$logger.trace(`"${propertyName}" property successfully removed.`);
|
|
117
113
|
}
|
|
118
114
|
async getAndroidAssetsStructure(opts) {
|
|
119
|
-
// TODO: Use image-size package to get the width and height of an image.
|
|
120
|
-
// TODO: Parse the splash_screen.xml in nodpi directory and get from it the names of the background and center image.
|
|
121
|
-
// TODO: Parse the AndroidManifest.xml to get the name of the icon.
|
|
122
|
-
// This way we'll not use the image-definitions.json and the method will return the real android structure.
|
|
123
115
|
const projectDir = opts.projectDir;
|
|
124
116
|
const projectData = this.getProjectData(projectDir);
|
|
125
117
|
const pathToAndroidDir = path.join(projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.Android);
|
|
@@ -133,7 +125,6 @@ class ProjectDataService {
|
|
|
133
125
|
useLegacy = !manifest.includes(`android:icon="@mipmap/ic_launcher"`);
|
|
134
126
|
}
|
|
135
127
|
catch (err) {
|
|
136
|
-
// ignore
|
|
137
128
|
}
|
|
138
129
|
const content = this.getImageDefinitions()[useLegacy ? "android_legacy" : "android"];
|
|
139
130
|
return {
|
|
@@ -157,8 +148,6 @@ class ProjectDataService {
|
|
|
157
148
|
}
|
|
158
149
|
if (fstat.isDirectory()) {
|
|
159
150
|
if (filePath === pathToProjectNodeModules) {
|
|
160
|
-
// we do not want to get the files from node_modules directory of the project.
|
|
161
|
-
// We'll get here only when you have nativescript.config with appDirectoryPath set to "."
|
|
162
151
|
return false;
|
|
163
152
|
}
|
|
164
153
|
return true;
|
|
@@ -173,9 +162,6 @@ class ProjectDataService {
|
|
|
173
162
|
}
|
|
174
163
|
}
|
|
175
164
|
updateNsConfigValue(projectDir, updateObject, propertiesToRemove) {
|
|
176
|
-
// todo: figure out a way to update js/ts configs
|
|
177
|
-
// most likely needs an ast parser/writer
|
|
178
|
-
// should be delegated to the config service
|
|
179
165
|
const nsConfigPath = path.join(projectDir, constants.CONFIG_FILE_NAME_JS);
|
|
180
166
|
const currentNsConfig = this.getNsConfig(nsConfigPath);
|
|
181
167
|
let newNsConfig = currentNsConfig;
|
|
@@ -216,14 +202,10 @@ class ProjectDataService {
|
|
|
216
202
|
const imageDefinitions = this.getImageDefinitions().ios;
|
|
217
203
|
_.each(content && content.images, (image) => {
|
|
218
204
|
let foundMatchingDefinition = false;
|
|
219
|
-
// In some cases the image may not be available, it will just be described.
|
|
220
|
-
// When this happens, the filename will be empty.
|
|
221
|
-
// So we'll keep the path empty as well.
|
|
222
205
|
if (image.filename) {
|
|
223
206
|
image.path = path.join(dirPath, image.filename);
|
|
224
207
|
}
|
|
225
208
|
if (image.size) {
|
|
226
|
-
// size is basically <width>x<height>
|
|
227
209
|
const [width, height] = image.size
|
|
228
210
|
.toString()
|
|
229
211
|
.split(constants_1.AssetConstants.sizeDelimiter);
|
|
@@ -232,7 +214,6 @@ class ProjectDataService {
|
|
|
232
214
|
image.height = +height;
|
|
233
215
|
}
|
|
234
216
|
}
|
|
235
|
-
// Find the image size based on the hardcoded values in the image-definitions.json
|
|
236
217
|
_.each(imageDefinitions, (assetSubGroup) => {
|
|
237
218
|
const assetItem = _.find(assetSubGroup, (assetElement) => assetElement.filename === image.filename &&
|
|
238
219
|
path.basename(assetElement.directory) === path.basename(dirPath));
|
|
@@ -252,7 +233,6 @@ class ProjectDataService {
|
|
|
252
233
|
image.scale = image.scale || assetItem.scale;
|
|
253
234
|
image.rgba = assetItem.rgba;
|
|
254
235
|
finalContent.images.push(image);
|
|
255
|
-
// break each
|
|
256
236
|
return false;
|
|
257
237
|
}
|
|
258
238
|
});
|
|
@@ -355,16 +335,13 @@ class ProjectDataService {
|
|
|
355
335
|
getRuntimePackage(projectDir, platform) {
|
|
356
336
|
platform = platform.toLowerCase();
|
|
357
337
|
const packageJson = this.$fs.readJson(path.join(projectDir, constants.PACKAGE_JSON_FILE_NAME));
|
|
358
|
-
const runtimeName = platform === "android"
|
|
338
|
+
const runtimeName = platform === "android"
|
|
359
339
|
? constants.TNS_ANDROID_RUNTIME_NAME
|
|
360
340
|
: constants.TNS_IOS_RUNTIME_NAME;
|
|
361
341
|
if (packageJson &&
|
|
362
342
|
packageJson.nativescript &&
|
|
363
343
|
packageJson.nativescript[runtimeName] &&
|
|
364
344
|
packageJson.nativescript[runtimeName].version) {
|
|
365
|
-
// if we have a nativescript key with a runtime version in package.json
|
|
366
|
-
// that means we are dealing with a legacy project, and should respect
|
|
367
|
-
// that information
|
|
368
345
|
return {
|
|
369
346
|
name: runtimeName,
|
|
370
347
|
version: packageJson.nativescript[runtimeName].version,
|
|
@@ -376,19 +353,19 @@ class ProjectDataService {
|
|
|
376
353
|
const runtimePackage = this.$pluginsService
|
|
377
354
|
.getDependenciesFromPackageJson(projectDir)
|
|
378
355
|
.devDependencies.find((d) => {
|
|
379
|
-
if (platform === "ios"
|
|
356
|
+
if (platform === "ios") {
|
|
380
357
|
return [
|
|
381
358
|
constants.SCOPED_IOS_RUNTIME_NAME,
|
|
382
359
|
constants.TNS_IOS_RUNTIME_NAME,
|
|
383
360
|
].includes(d.name);
|
|
384
361
|
}
|
|
385
|
-
else if (platform === "android"
|
|
362
|
+
else if (platform === "android") {
|
|
386
363
|
return [
|
|
387
364
|
constants.SCOPED_ANDROID_RUNTIME_NAME,
|
|
388
365
|
constants.TNS_ANDROID_RUNTIME_NAME,
|
|
389
366
|
].includes(d.name);
|
|
390
367
|
}
|
|
391
|
-
else if (platform === "visionos"
|
|
368
|
+
else if (platform === "visionos") {
|
|
392
369
|
return d.name === constants.SCOPED_VISIONOS_RUNTIME_NAME;
|
|
393
370
|
}
|
|
394
371
|
});
|
|
@@ -396,14 +373,12 @@ class ProjectDataService {
|
|
|
396
373
|
const coerced = semver.coerce(runtimePackage.version);
|
|
397
374
|
const isRange = !!coerced && coerced.version !== runtimePackage.version;
|
|
398
375
|
const isTag = !coerced;
|
|
399
|
-
// in case we are using a local tgz for the runtime or a range like ~8.0.0, ^8.0.0 etc. or a tag like JSC
|
|
400
376
|
if (runtimePackage.version.includes("tgz") || isRange || isTag) {
|
|
401
377
|
try {
|
|
402
378
|
const runtimePackageJsonPath = (0, package_path_helper_1.resolvePackageJSONPath)(runtimePackage.name, {
|
|
403
379
|
paths: [projectDir],
|
|
404
380
|
});
|
|
405
381
|
if (!runtimePackageJsonPath) {
|
|
406
|
-
// caught below
|
|
407
382
|
throw new Error("Runtime package.json not found.");
|
|
408
383
|
}
|
|
409
384
|
runtimePackage.version = this.$fs.readJson(runtimePackageJsonPath).version;
|
|
@@ -420,21 +395,20 @@ class ProjectDataService {
|
|
|
420
395
|
}
|
|
421
396
|
return runtimePackage;
|
|
422
397
|
}
|
|
423
|
-
// default to the scoped runtimes
|
|
424
398
|
this.$logger.trace("Could not find an installed runtime, falling back to default runtimes");
|
|
425
|
-
if (platform === "ios"
|
|
399
|
+
if (platform === "ios") {
|
|
426
400
|
return {
|
|
427
401
|
name: constants.SCOPED_IOS_RUNTIME_NAME,
|
|
428
402
|
version: null,
|
|
429
403
|
};
|
|
430
404
|
}
|
|
431
|
-
else if (platform === "android"
|
|
405
|
+
else if (platform === "android") {
|
|
432
406
|
return {
|
|
433
407
|
name: constants.SCOPED_ANDROID_RUNTIME_NAME,
|
|
434
408
|
version: null,
|
|
435
409
|
};
|
|
436
410
|
}
|
|
437
|
-
else if (platform === "visionos"
|
|
411
|
+
else if (platform === "visionos") {
|
|
438
412
|
return {
|
|
439
413
|
name: constants.SCOPED_VISIONOS_RUNTIME_NAME,
|
|
440
414
|
version: null,
|
|
@@ -469,11 +443,9 @@ __decorate([
|
|
|
469
443
|
return projectDir + ":" + platform;
|
|
470
444
|
},
|
|
471
445
|
shouldCache(result) {
|
|
472
|
-
// don't cache coerced versions
|
|
473
446
|
if (result._coerced) {
|
|
474
447
|
return false;
|
|
475
448
|
}
|
|
476
|
-
// only cache if version is defined
|
|
477
449
|
return !!result.version;
|
|
478
450
|
},
|
|
479
451
|
})
|
|
@@ -482,4 +454,3 @@ __decorate([
|
|
|
482
454
|
(0, decorators_1.exported)("projectDataService")
|
|
483
455
|
], ProjectDataService.prototype, "getNsConfigDefaultContent", null);
|
|
484
456
|
yok_1.injector.register("projectDataService", ProjectDataService);
|
|
485
|
-
//# sourceMappingURL=project-data-service.js.map
|
|
@@ -64,15 +64,11 @@ class ProjectService {
|
|
|
64
64
|
appId: appId,
|
|
65
65
|
projectName,
|
|
66
66
|
});
|
|
67
|
-
// can pass --no-git to skip creating a git repo
|
|
68
|
-
// useful in monorepos where we're creating
|
|
69
|
-
// sub projects in an existing git repo.
|
|
70
67
|
if (this.$options.git) {
|
|
71
68
|
try {
|
|
72
69
|
if (!this.$options.force) {
|
|
73
70
|
const git = (0, simple_git_1.default)(projectDir);
|
|
74
71
|
if (await git.checkIsRepo()) {
|
|
75
|
-
// throwing here since we're catching below.
|
|
76
72
|
throw new Error("Already part of a git repository.");
|
|
77
73
|
}
|
|
78
74
|
}
|
|
@@ -112,7 +108,6 @@ class ProjectService {
|
|
|
112
108
|
this.alterPackageJsonData(projectCreationSettings);
|
|
113
109
|
this.$projectConfigService.writeDefaultConfig(projectDir, appId);
|
|
114
110
|
await this.ensureAppResourcesExist(projectDir);
|
|
115
|
-
// Install devDependencies and execute all scripts:
|
|
116
111
|
await this.$packageManager.install(projectDir, projectDir, {
|
|
117
112
|
disableNpmInstall: false,
|
|
118
113
|
frameworkPath: null,
|
|
@@ -142,7 +137,6 @@ class ProjectService {
|
|
|
142
137
|
this.$logger.trace("Project does not have App_Resources - fetching from default template.");
|
|
143
138
|
this.$fs.createDirectory(appResourcesDestinationPath);
|
|
144
139
|
const tempDir = await this.$tempService.mkdirSync("ns-default-template");
|
|
145
|
-
// the template installed doesn't have App_Resources -> get from a default template
|
|
146
140
|
await this.$pacoteService.extractPackage(constants.RESERVED_TEMPLATE_NAMES["default"], tempDir);
|
|
147
141
|
const templateProjectData = this.$projectDataService.getProjectData(tempDir);
|
|
148
142
|
const templateAppResourcesDir = templateProjectData.getAppResourcesDirectoryPath(tempDir);
|
|
@@ -153,14 +147,12 @@ class ProjectService {
|
|
|
153
147
|
const { projectDir, projectName } = projectCreationSettings;
|
|
154
148
|
const projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
|
|
155
149
|
let packageJsonData = this.$fs.readJson(projectFilePath);
|
|
156
|
-
// clean up keys from the template package.json that we don't care about.
|
|
157
150
|
Object.keys(packageJsonData).forEach((key) => {
|
|
158
151
|
if (key.startsWith("_") ||
|
|
159
152
|
constants.TemplatesV2PackageJsonKeysToRemove.includes(key)) {
|
|
160
153
|
delete packageJsonData[key];
|
|
161
154
|
}
|
|
162
155
|
});
|
|
163
|
-
// this is used to ensure the order of keys is consistent, the blanks are filled in from the template
|
|
164
156
|
const packageJsonSchema = {
|
|
165
157
|
name: projectName,
|
|
166
158
|
main: "",
|
|
@@ -168,7 +160,6 @@ class ProjectService {
|
|
|
168
160
|
private: true,
|
|
169
161
|
dependencies: {},
|
|
170
162
|
devDependencies: {},
|
|
171
|
-
// anythign else would go below
|
|
172
163
|
};
|
|
173
164
|
packageJsonData = Object.assign(packageJsonSchema, packageJsonData);
|
|
174
165
|
this.$fs.writeJson(projectFilePath, packageJsonData);
|
|
@@ -192,4 +183,3 @@ __decorate([
|
|
|
192
183
|
(0, decorators_2.performanceLog)()
|
|
193
184
|
], ProjectService.prototype, "alterPackageJsonData", null);
|
|
194
185
|
yok_1.injector.register("projectService", ProjectService);
|
|
195
|
-
//# sourceMappingURL=project-service.js.map
|
|
@@ -40,12 +40,12 @@ class ProjectTemplatesService {
|
|
|
40
40
|
const templateNameToBeTracked = this.getTemplateNameToBeTracked(templateValue, templatePackageJsonContent);
|
|
41
41
|
if (templateNameToBeTracked) {
|
|
42
42
|
await this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
43
|
-
action: "Create project"
|
|
43
|
+
action: "Create project",
|
|
44
44
|
isForDevice: null,
|
|
45
45
|
additionalData: templateNameToBeTracked,
|
|
46
46
|
});
|
|
47
47
|
await this.$analyticsService.trackEventActionInGoogleAnalytics({
|
|
48
|
-
action: "Using Template"
|
|
48
|
+
action: "Using Template",
|
|
49
49
|
additionalData: templateNameToBeTracked,
|
|
50
50
|
});
|
|
51
51
|
}
|
|
@@ -97,4 +97,3 @@ __decorate([
|
|
|
97
97
|
(0, decorators_1.performanceLog)()
|
|
98
98
|
], ProjectTemplatesService.prototype, "prepareTemplate", null);
|
|
99
99
|
yok_1.injector.register("projectTemplatesService", ProjectTemplatesService);
|
|
100
|
-
//# sourceMappingURL=project-templates-service.js.map
|
|
@@ -8,14 +8,12 @@ const yok_1 = require("../common/yok");
|
|
|
8
8
|
class TempService {
|
|
9
9
|
constructor($cleanupService) {
|
|
10
10
|
this.$cleanupService = $cleanupService;
|
|
11
|
-
// no-op
|
|
12
11
|
}
|
|
13
12
|
async mkdirSync(affixes) {
|
|
14
13
|
var _a;
|
|
15
14
|
const opts = typeof affixes === "string" ? { prefix: affixes } : affixes;
|
|
16
15
|
const baseDir = (opts === null || opts === void 0 ? void 0 : opts.dir) ? opts.dir : (0, os_1.tmpdir)();
|
|
17
16
|
const prefix = ((_a = opts === null || opts === void 0 ? void 0 : opts.prefix) !== null && _a !== void 0 ? _a : "ns-").replace(/\s+/g, "-");
|
|
18
|
-
// fs.mkdtempSync requires the full path prefix
|
|
19
17
|
const pathToDir = fs.mkdtempSync(path.join(baseDir, prefix));
|
|
20
18
|
await this.$cleanupService.addCleanupDeleteAction(pathToDir);
|
|
21
19
|
return pathToDir;
|
|
@@ -35,4 +33,3 @@ class TempService {
|
|
|
35
33
|
}
|
|
36
34
|
exports.TempService = TempService;
|
|
37
35
|
yok_1.injector.register("tempService", TempService);
|
|
38
|
-
//# sourceMappingURL=temp-service.js.map
|
|
@@ -5,7 +5,6 @@ const ora = require("ora");
|
|
|
5
5
|
const yok_1 = require("../common/yok");
|
|
6
6
|
class TerminalSpinnerService {
|
|
7
7
|
createSpinner(spinnerOptions = {}) {
|
|
8
|
-
// @ts-expect-error - options are readonly, however we still want to override them before passing them on...
|
|
9
8
|
spinnerOptions.stream = spinnerOptions.stream || process.stdout;
|
|
10
9
|
return ora(spinnerOptions);
|
|
11
10
|
}
|
|
@@ -26,4 +25,3 @@ class TerminalSpinnerService {
|
|
|
26
25
|
}
|
|
27
26
|
exports.TerminalSpinnerService = TerminalSpinnerService;
|
|
28
27
|
yok_1.injector.register("terminalSpinnerService", TerminalSpinnerService);
|
|
29
|
-
//# sourceMappingURL=terminal-spinner-service.js.map
|
|
@@ -24,10 +24,8 @@ class TestExecutionService {
|
|
|
24
24
|
platform = platform.toLowerCase();
|
|
25
25
|
this.platform = platform;
|
|
26
26
|
const projectData = this.$projectDataService.getProjectData(liveSyncInfo.projectDir);
|
|
27
|
-
// We need the dependencies installed here, so we can start the Karma server.
|
|
28
27
|
await this.$pluginsService.ensureAllDependenciesAreInstalled(projectData);
|
|
29
28
|
const karmaConfig = this.getKarmaConfiguration(platform, projectData);
|
|
30
|
-
// In case you want to debug the unit test runner, add "--inspect-brk=<port>" as a first element in the array of args.
|
|
31
29
|
const karmaRunner = this.$childProcess.spawn(process.execPath, [path.join(__dirname, "karma-execution.js")], { stdio: ["inherit", "inherit", "inherit", "ipc"] });
|
|
32
30
|
const launchKarmaTests = async (karmaData) => {
|
|
33
31
|
this.$logger.trace("## Unit-testing: Parent process received message", karmaData);
|
|
@@ -44,8 +42,6 @@ class TestExecutionService {
|
|
|
44
42
|
const configJs = this.generateConfig(port, configOptions);
|
|
45
43
|
this.$fs.writeFile(path.join(liveSyncInfo.projectDir, TestExecutionService.CONFIG_FILE_NAME), configJs);
|
|
46
44
|
}
|
|
47
|
-
// Prepare the project AFTER the TestExecutionService.CONFIG_FILE_NAME file is created in node_modules
|
|
48
|
-
// so it will be sent to device.
|
|
49
45
|
await this.$runController.run({
|
|
50
46
|
liveSyncInfo,
|
|
51
47
|
deviceDescriptors,
|
|
@@ -58,13 +54,12 @@ class TestExecutionService {
|
|
|
58
54
|
}
|
|
59
55
|
launchKarmaTests(karmaData).catch((result) => {
|
|
60
56
|
this.$logger.error(result);
|
|
61
|
-
process.exit(130
|
|
57
|
+
process.exit(130);
|
|
62
58
|
});
|
|
63
59
|
});
|
|
64
60
|
return new Promise((resolve, reject) => {
|
|
65
61
|
karmaRunner.on("exit", (exitCode) => {
|
|
66
62
|
if (exitCode !== 0) {
|
|
67
|
-
//End our process with a non-zero exit code
|
|
68
63
|
const testError = new Error("Test run failed.");
|
|
69
64
|
reject(testError);
|
|
70
65
|
}
|
|
@@ -77,7 +72,7 @@ class TestExecutionService {
|
|
|
77
72
|
}
|
|
78
73
|
async canStartKarmaServer(projectData) {
|
|
79
74
|
let canStartKarmaServer = true;
|
|
80
|
-
const requiredDependencies = ["@nativescript/unit-test-runner"];
|
|
75
|
+
const requiredDependencies = ["@nativescript/unit-test-runner"];
|
|
81
76
|
_.each(requiredDependencies, (dep) => {
|
|
82
77
|
if (!projectData.dependencies[dep] && !projectData.devDependencies[dep]) {
|
|
83
78
|
canStartKarmaServer = false;
|
|
@@ -126,7 +121,6 @@ class TestExecutionService {
|
|
|
126
121
|
karmaConfig.logLevel = "DEBUG";
|
|
127
122
|
}
|
|
128
123
|
if (!this.$options.watch) {
|
|
129
|
-
// Setting singleRun to true will automatically start the tests when new browser (device in our case) is registered in karma.
|
|
130
124
|
karmaConfig.singleRun = true;
|
|
131
125
|
}
|
|
132
126
|
if (this.$options.debugBrk) {
|
|
@@ -145,4 +139,3 @@ exports.TestExecutionService = TestExecutionService;
|
|
|
145
139
|
TestExecutionService.CONFIG_FILE_NAME = `node_modules/${constants.TEST_RUNNER_NAME}/config.js`;
|
|
146
140
|
TestExecutionService.SOCKETIO_JS_FILE_NAME = `node_modules/${constants.TEST_RUNNER_NAME}/socket.io.js`;
|
|
147
141
|
yok_1.injector.register("testExecutionService", TestExecutionService);
|
|
148
|
-
//# sourceMappingURL=test-execution-service.js.map
|
|
@@ -34,9 +34,6 @@ class TestInitializationService {
|
|
|
34
34
|
});
|
|
35
35
|
return targetFrameworkDependencies;
|
|
36
36
|
}
|
|
37
|
-
/**
|
|
38
|
-
* This method is used from test-init.md file so it is not allowed to use "this" inside the method's body.
|
|
39
|
-
*/
|
|
40
37
|
getFrameworkNames() {
|
|
41
38
|
const configsPath = path.join(__dirname, "..", "..", "config");
|
|
42
39
|
const dependenciesPath = path.join(configsPath, "test-dependencies.json");
|
|
@@ -55,4 +52,3 @@ __decorate([
|
|
|
55
52
|
(0, decorators_1.cache)()
|
|
56
53
|
], TestInitializationService.prototype, "getFrameworkNames", null);
|
|
57
54
|
yok_1.injector.register("testInitializationService", TestInitializationService);
|
|
58
|
-
//# sourceMappingURL=test-initialization-service.js.map
|
|
@@ -47,7 +47,6 @@ class VersionsService {
|
|
|
47
47
|
const tnsCoreModulesPath = path.join(nodeModulesPath, constants.TNS_CORE_MODULES_NAME);
|
|
48
48
|
const dependsOnNonScopedPackage = !!this.projectData.dependencies[constants.TNS_CORE_MODULES_NAME];
|
|
49
49
|
const dependsOnScopedPackage = !!this.projectData.dependencies[constants.SCOPED_TNS_CORE_MODULES];
|
|
50
|
-
// ensure the dependencies are installed, so we can get their actual versions from node_modules
|
|
51
50
|
if (!this.$fs.exists(nodeModulesPath) ||
|
|
52
51
|
(dependsOnNonScopedPackage && !this.$fs.exists(tnsCoreModulesPath)) ||
|
|
53
52
|
(dependsOnScopedPackage && !this.$fs.exists(scopedPackagePath))) {
|
|
@@ -74,16 +73,16 @@ class VersionsService {
|
|
|
74
73
|
return versionInformations;
|
|
75
74
|
}
|
|
76
75
|
async getRuntimesVersions(platform) {
|
|
77
|
-
const iosRuntime = this.$projectDataService.getRuntimePackage(this.projectData.projectDir, "ios"
|
|
78
|
-
const androidRuntime = this.$projectDataService.getRuntimePackage(this.projectData.projectDir, "android"
|
|
76
|
+
const iosRuntime = this.$projectDataService.getRuntimePackage(this.projectData.projectDir, "ios");
|
|
77
|
+
const androidRuntime = this.$projectDataService.getRuntimePackage(this.projectData.projectDir, "android");
|
|
79
78
|
let runtimes = [];
|
|
80
79
|
if (!platform) {
|
|
81
80
|
runtimes = [iosRuntime, androidRuntime];
|
|
82
81
|
}
|
|
83
|
-
else if (platform === "ios"
|
|
82
|
+
else if (platform === "ios") {
|
|
84
83
|
runtimes.push(iosRuntime);
|
|
85
84
|
}
|
|
86
|
-
else if (platform === "android"
|
|
85
|
+
else if (platform === "android") {
|
|
87
86
|
runtimes.push(androidRuntime);
|
|
88
87
|
}
|
|
89
88
|
const runtimesVersions = await Promise.all(runtimes.map(async (runtime) => {
|
|
@@ -176,4 +175,3 @@ VersionsService.UP_TO_DATE_MESSAGE = "up to date";
|
|
|
176
175
|
VersionsService.UPDATE_AVAILABLE_MESSAGE = "Update available";
|
|
177
176
|
VersionsService.NOT_INSTALLED_MESSAGE = "not installed";
|
|
178
177
|
yok_1.injector.register("versionsService", VersionsService);
|
|
179
|
-
//# sourceMappingURL=versions-service.js.map
|
|
@@ -55,7 +55,6 @@ class XcconfigService {
|
|
|
55
55
|
}
|
|
56
56
|
});
|
|
57
57
|
if (isPropertyParsed) {
|
|
58
|
-
// property can be an empty string, so we don't check for that.
|
|
59
58
|
return property;
|
|
60
59
|
}
|
|
61
60
|
}
|
|
@@ -64,4 +63,3 @@ class XcconfigService {
|
|
|
64
63
|
}
|
|
65
64
|
exports.XcconfigService = XcconfigService;
|
|
66
65
|
yok_1.injector.register("xcconfigService", XcconfigService);
|
|
67
|
-
//# sourceMappingURL=xcconfig-service.js.map
|
package/lib/shared-event-bus.js
CHANGED
|
@@ -2,12 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const events_1 = require("events");
|
|
4
4
|
const yok_1 = require("./common/yok");
|
|
5
|
-
/**
|
|
6
|
-
* Event Bus used by different services to emit state changes and
|
|
7
|
-
* allow listening for these state changes without needing a reference
|
|
8
|
-
* to the emitting service.
|
|
9
|
-
*/
|
|
10
5
|
class SharedEventBus extends events_1.EventEmitter {
|
|
11
6
|
}
|
|
12
7
|
yok_1.injector.register("sharedEventBus", SharedEventBus);
|
|
13
|
-
//# sourceMappingURL=shared-event-bus.js.map
|
package/lib/sys-info.js
CHANGED
|
@@ -79,7 +79,7 @@ class SysInfo {
|
|
|
79
79
|
if (macOSVersion && macOSVersion < constants_1.MacOSVersions.HighSierra) {
|
|
80
80
|
return {
|
|
81
81
|
message: (0, util_1.format)(constants_1.MacOSDeprecationStringFormat, macOSVersion),
|
|
82
|
-
severity: "high"
|
|
82
|
+
severity: "high",
|
|
83
83
|
};
|
|
84
84
|
}
|
|
85
85
|
return null;
|
|
@@ -101,4 +101,3 @@ __decorate([
|
|
|
101
101
|
(0, decorators_1.exported)("sysInfo")
|
|
102
102
|
], SysInfo.prototype, "getSupportedNodeVersionRange", null);
|
|
103
103
|
yok_1.injector.register("sysInfo", SysInfo);
|
|
104
|
-
//# sourceMappingURL=sys-info.js.map
|
|
@@ -55,7 +55,6 @@ class ConfigTransformer {
|
|
|
55
55
|
const parts = key.split(".");
|
|
56
56
|
const name = parts.shift();
|
|
57
57
|
const property = this.getProperty(name, parent);
|
|
58
|
-
// no android key, add it to parent to root
|
|
59
58
|
if (!property) {
|
|
60
59
|
return undefined;
|
|
61
60
|
}
|
|
@@ -65,14 +64,11 @@ class ConfigTransformer {
|
|
|
65
64
|
if (!_parent) {
|
|
66
65
|
return undefined;
|
|
67
66
|
}
|
|
68
|
-
// add nonExistent.deep to android: {}
|
|
69
67
|
return this.getProperty(parts.join("."), _parent);
|
|
70
68
|
}
|
|
71
|
-
// if we have a parent, we are reading the property from it
|
|
72
69
|
if (parent) {
|
|
73
70
|
return parent.getProperty(key);
|
|
74
71
|
}
|
|
75
|
-
// otherwise we just read it from the root exports object
|
|
76
72
|
return this.getProperty(key, this.getDefaultExportValue());
|
|
77
73
|
}
|
|
78
74
|
addProperty(key, value, parent = null) {
|
|
@@ -194,22 +190,15 @@ class ConfigTransformer {
|
|
|
194
190
|
}
|
|
195
191
|
this.setInitializerValue(initializer, newValue);
|
|
196
192
|
}
|
|
197
|
-
/**
|
|
198
|
-
* @internal
|
|
199
|
-
*/
|
|
200
193
|
getFullText() {
|
|
201
194
|
return this.config.getFullText();
|
|
202
195
|
}
|
|
203
|
-
/**
|
|
204
|
-
* @internal
|
|
205
|
-
*/
|
|
206
196
|
getValue(key) {
|
|
207
197
|
return this.getPropertyValue(this.getProperty(key));
|
|
208
198
|
}
|
|
209
199
|
setValue(key, value) {
|
|
210
200
|
const property = this.getProperty(key);
|
|
211
201
|
if (!property) {
|
|
212
|
-
// add new property
|
|
213
202
|
this.addProperty(key, value);
|
|
214
203
|
}
|
|
215
204
|
else {
|
|
@@ -219,4 +208,3 @@ class ConfigTransformer {
|
|
|
219
208
|
}
|
|
220
209
|
}
|
|
221
210
|
exports.ConfigTransformer = ConfigTransformer;
|
|
222
|
-
//# sourceMappingURL=config-transformer.js.map
|
|
@@ -56,18 +56,14 @@ class NodeModulesDependenciesBuilder {
|
|
|
56
56
|
let modulePath = (0, resolve_package_path_1.resolvePackagePath)(depDescription.name, {
|
|
57
57
|
paths: [parentModulesPath],
|
|
58
58
|
});
|
|
59
|
-
// perhaps traverse up the tree here?
|
|
60
59
|
if (!modulePath) {
|
|
61
|
-
// fallback to searching in the root path
|
|
62
60
|
modulePath = (0, resolve_package_path_1.resolvePackagePath)(depDescription.name, {
|
|
63
61
|
paths: [rootPath],
|
|
64
62
|
});
|
|
65
63
|
}
|
|
66
|
-
// if we failed to find the module...
|
|
67
64
|
if (!modulePath) {
|
|
68
65
|
return null;
|
|
69
66
|
}
|
|
70
|
-
// if we already resolved this dependency, we return null to avoid a duplicate resolution
|
|
71
67
|
if (resolvedDependencies.some((r) => {
|
|
72
68
|
return r.name === depDescription.name && r.directory === modulePath;
|
|
73
69
|
})) {
|
|
@@ -92,7 +88,6 @@ class NodeModulesDependenciesBuilder {
|
|
|
92
88
|
const packageJsonContents = this.$fs.readJson(packageJsonPath);
|
|
93
89
|
dependency.version = packageJsonContents.version;
|
|
94
90
|
if (!!packageJsonContents.nativescript) {
|
|
95
|
-
// add `nativescript` property, necessary for resolving plugins
|
|
96
91
|
dependency.nativescript = packageJsonContents.nativescript;
|
|
97
92
|
}
|
|
98
93
|
dependency.dependencies = _.keys(packageJsonContents.dependencies);
|
|
@@ -103,4 +98,3 @@ class NodeModulesDependenciesBuilder {
|
|
|
103
98
|
}
|
|
104
99
|
exports.NodeModulesDependenciesBuilder = NodeModulesDependenciesBuilder;
|
|
105
100
|
yok_1.injector.register("nodeModulesDependenciesBuilder", NodeModulesDependenciesBuilder);
|
|
106
|
-
//# sourceMappingURL=node-modules-dependencies-builder.js.map
|
|
@@ -36,8 +36,6 @@ class Yarn2PackageManager extends base_package_manager_1.BasePackageManager {
|
|
|
36
36
|
}
|
|
37
37
|
const packageJsonPath = path.join(pathToSave, "package.json");
|
|
38
38
|
const jsonContentBefore = this.$fs.readJson(packageJsonPath);
|
|
39
|
-
// remove unsupported flags
|
|
40
|
-
// todo: refactor all package managers to map typed flags to the actual flags
|
|
41
39
|
const cleanedConfig = _.omit(config, ["save-dev", "save-exact"]);
|
|
42
40
|
const flags = this.getFlagsString(cleanedConfig, true);
|
|
43
41
|
let params = [];
|
|
@@ -124,4 +122,3 @@ __decorate([
|
|
|
124
122
|
(0, decorators_1.exported)("yarn2")
|
|
125
123
|
], Yarn2PackageManager.prototype, "getCachePath", null);
|
|
126
124
|
yok_1.injector.register("yarn2", Yarn2PackageManager);
|
|
127
|
-
//# sourceMappingURL=yarn2-package-manager.js.map
|
package/package.json
CHANGED