From 6d5f34b8ba6ad85714eb867722d3a4b033e93f25 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Tue, 2 May 2017 16:33:38 +0300 Subject: [PATCH 1/2] fix(ns-bundle): respect platform version from app package.json --- bin/ns-bundle | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/bin/ns-bundle b/bin/ns-bundle index 61f867e9..5349e4d2 100644 --- a/bin/ns-bundle +++ b/bin/ns-bundle @@ -1,9 +1,17 @@ #!/usr/bin/env node const spawn = require("child_process").spawn; -const path = require("path"); +const resolve = require("path").resolve; -const PROJECT_DIR = path.resolve(__dirname, "../../../"); +const getPackageJson = require("../projectHelpers").getPackageJson; + +const PROJECT_DIR = resolve(__dirname, "../../../"); +const packageJson = getPackageJson(PROJECT_DIR); + +let platformVersion; +try { + platformVersion = packageJson.nativescript["tns-android"].version; +} catch(e) {} if (!process.env.npm_config_argv) { throwError({message: "No flags provided."}); @@ -82,9 +90,10 @@ function removePlatform(platform) { function addPlatform(platform) { return new Promise(function (resolve, reject) { - console.log(`Adding platform ${platform}...`); + const platformToAdd = platformVersion ? `${platform}@${platformVersion}` : platform; + console.log(`Adding platform ${platformToAdd}...`); - spawnChildProcess(false, "tns", "platform", "add", platform) + spawnChildProcess(false, "tns", "platform", "add", platformToAdd) .then(resolve) .catch(resolve); }); From 28eadc788c470ea16ee4ce488160c1699eb74193 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Wed, 3 May 2017 13:47:23 +0300 Subject: [PATCH 2/2] fix: typo in bundle script --- bin/ns-bundle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/ns-bundle b/bin/ns-bundle index 5349e4d2..e3e468f8 100644 --- a/bin/ns-bundle +++ b/bin/ns-bundle @@ -8,11 +8,6 @@ const getPackageJson = require("../projectHelpers").getPackageJson; const PROJECT_DIR = resolve(__dirname, "../../../"); const packageJson = getPackageJson(PROJECT_DIR); -let platformVersion; -try { - platformVersion = packageJson.nativescript["tns-android"].version; -} catch(e) {} - if (!process.env.npm_config_argv) { throwError({message: "No flags provided."}); } @@ -22,6 +17,11 @@ const tnsArgs = getTnsArgs(npmArgs).map(escape); const flags = npmArgs.filter(a => a.startsWith("--")).map(a => a.substring(2)); const options = getOptions(flags); +let platformVersion; +try { + platformVersion = packageJson.nativescript[`tns-${options.platform}`].version; +} catch(e) {} + function getTnsArgs(args) { const other = [ "run",