From f9424dc7e7bb38fd9335d9cf008b45d32b878b92 Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Thu, 9 May 2019 17:37:49 +0300 Subject: [PATCH 1/6] chore: set version to 5.4.1 --- npm-shrinkwrap.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 46a9da7799..d97b5c17ad 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "nativescript", - "version": "5.4.0", + "version": "5.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4ea1444a73..f4d61d2b64 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nativescript", "preferGlobal": true, - "version": "5.4.0", + "version": "5.4.1", "author": "Telerik ", "description": "Command-line interface for building NativeScript projects", "bin": { From 6ddcc2f7d4289d6276b640a12fc21a8125de3bf9 Mon Sep 17 00:00:00 2001 From: Todor Petrov Date: Fri, 10 May 2019 11:19:23 +0300 Subject: [PATCH 2/6] style: misleading warning message --- lib/services/plugins-service.ts | 8 ++++---- test/plugins-service.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts index 64dc3c38cf..857e05dbbc 100644 --- a/lib/services/plugins-service.ts +++ b/lib/services/plugins-service.ts @@ -318,12 +318,12 @@ export class PluginsService implements IPluginsService { const installedFrameworkVersion = this.getInstalledFrameworkVersion(platform, projectData); const pluginPlatformsData = pluginData.platformsData; if (pluginPlatformsData) { - const pluginVersion = (pluginPlatformsData)[platform]; - if (!pluginVersion) { + const versionRequiredByPlugin = (pluginPlatformsData)[platform]; + if (!versionRequiredByPlugin) { this.$logger.warn(`${pluginData.name} is not supported for ${platform}.`); isValid = false; - } else if (semver.gt(pluginVersion, installedFrameworkVersion)) { - this.$logger.warn(`${pluginData.name} ${pluginVersion} for ${platform} is not compatible with the currently installed framework version ${installedFrameworkVersion}.`); + } else if (semver.gt(versionRequiredByPlugin, installedFrameworkVersion)) { + this.$logger.warn(`${pluginData.name} requires at least version ${versionRequiredByPlugin} of platform ${platform}. Currently installed version is ${installedFrameworkVersion}.`); isValid = false; } } diff --git a/test/plugins-service.ts b/test/plugins-service.ts index 630a577b5f..e36966e1aa 100644 --- a/test/plugins-service.ts +++ b/test/plugins-service.ts @@ -272,7 +272,7 @@ describe("Plugins service", () => { }); it("fails when the plugin does not support the installed framework", async () => { let isWarningMessageShown = false; - const expectedWarningMessage = "mySamplePlugin 1.5.0 for android is not compatible with the currently installed framework version 1.4.0."; + const expectedWarningMessage = "mySamplePlugin requires at least version 1.5.0 of platform android. Currently installed version is 1.4.0."; // Creates plugin in temp folder const pluginName = "mySamplePlugin"; From beb69e9c6ff867c3f3720c74afe103e4ec571ace Mon Sep 17 00:00:00 2001 From: "Kristian D. Dimitrov" Date: Mon, 13 May 2019 17:01:18 +0300 Subject: [PATCH 3/6] chore: update nativescript-dev-xcode to 0.2.0 --- npm-shrinkwrap.json | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 46a9da7799..9f31adf20c 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -5316,8 +5316,9 @@ } }, "nativescript-dev-xcode": { - "version": "https://github.com/NativeScript/nativescript-dev-xcode/tarball/ec70f5d6032a72b65298ad56fa6ec0c4b2ef03a3", - "integrity": "sha512-CIZGo20Mulu/0u5Im6MYfh/gt2jldK3zt/HtWjUBogV/0QVQNKry2ewC6BudpjetUw4otjmqTRlUhY6wXpZ9Bg==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/nativescript-dev-xcode/-/nativescript-dev-xcode-0.2.0.tgz", + "integrity": "sha512-UKX+AS3rF/HNQ7777GunT9SaVQJXmcYnol9yKxVXWM1uRNXiQUgLaUmhjYUkHw7voqNN+FCqqRZQlB8mHUPA9g==", "requires": { "simple-plist": "^1.0.0", "uuid": "^3.3.2" diff --git a/package.json b/package.json index 4ea1444a73..b203321248 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "minimatch": "3.0.2", "mkdirp": "0.5.1", "mute-stream": "0.0.5", - "nativescript-dev-xcode": "https://github.com/NativeScript/nativescript-dev-xcode/tarball/ec70f5d6032a72b65298ad56fa6ec0c4b2ef03a3", + "nativescript-dev-xcode": "0.2.0", "nativescript-doctor": "1.9.2", "nativescript-preview-sdk": "0.3.4", "open": "0.0.5", From 3be9e815b96f7d142590565ab1bd02b99702f052 Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Mon, 13 May 2019 17:32:06 +0300 Subject: [PATCH 4/6] fix: set correct link for legacy workflow warning --- lib/services/workflow-service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services/workflow-service.ts b/lib/services/workflow-service.ts index 3cbba6a5e8..c9d36308a4 100644 --- a/lib/services/workflow-service.ts +++ b/lib/services/workflow-service.ts @@ -7,7 +7,7 @@ import { LoggerConfigData } from "../constants"; export class WorkflowService implements IWorkflowService { private legacyWorkflowDeprecationMessage = `With the upcoming NativeScript 6.0 the Webpack workflow will become the only way of building apps. More info about the reasons for this change and how to migrate your project can be found in the link below: -`; +https://www.nativescript.org/blog/the-future-of-building-nativescript-apps`; private webpackWorkflowConfirmMessage = `Do you want to switch your app to the Webpack workflow?`; constructor(private $bundleValidatorHelper: IBundleValidatorHelper, From 936cdff0813c4e6074ef1b2f3e5ec144c1070fcf Mon Sep 17 00:00:00 2001 From: rosen-vladimirov Date: Mon, 13 May 2019 16:37:46 +0300 Subject: [PATCH 5/6] fix: plugin create command needs more args for plugin seed There are two new prompts in the plugin seed which require new command line options to be passed from CLI. Handle the new prompts and pass the new options. They can be used in automation scripts. In order to prevent such issue in the future, ensure the spawned process's stdout and stdin are inherited, so if there's a prompt in the plugin seed, CLI will show it to the user. --- .../man_pages/lib-management/plugin-create.md | 2 + lib/commands/plugin/create-plugin.ts | 33 +++++++-- lib/declarations.d.ts | 2 + lib/options.ts | 2 + test/plugin-create.ts | 67 +++++++++++++++++-- test/stubs.ts | 12 +++- 6 files changed, 103 insertions(+), 15 deletions(-) diff --git a/docs/man_pages/lib-management/plugin-create.md b/docs/man_pages/lib-management/plugin-create.md index bfa6d6f7ad..b267887ade 100644 --- a/docs/man_pages/lib-management/plugin-create.md +++ b/docs/man_pages/lib-management/plugin-create.md @@ -28,6 +28,8 @@ Create from a custom plugin seed | `$ tns plugin create * `--path` - Specifies the directory where you want to create the project, if different from the current directory. * `--username` - Specifies the Github username, which will be used to build the URLs in the plugin's package.json file. * `--pluginName` - Used to set the default file and class names in the plugin source. +* `--includeTypeScriptDemo` - Specifies if TypeScript demo should be created. Default value is `y` (i.e. `demo` will be created), in case you do not want to create this demo, pass `--includeTypeScriptDemo=n` +* `--includeAngularDemo` - Specifies if Angular demo should be created. Default value is `y` (i.e. `demo-angular` will be created), in case you do not want to create this demo, pass `--includeAngularDemo=n` * `--template` - Specifies the custom seed archive, which you want to use to create your plugin. If `--template` is not set, the NativeScript CLI creates the plugin from the default NativeScript Plugin Seed. `