diff --git a/.travis.yml b/.travis.yml index f7e9190d0..fc289f2cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ env: global: - NODE_VERSION=6.9.1 - - DATE=$(date +%Y-%m-%d) - - PACKAGE_VERSION=$DATE-$TRAVIS_BUILD_NUMBER - EMULATOR_API_LEVEL=19 - ANDROID_VERSION=23 - ANDROID_BUILD_TOOLS_VERSION=23.0.1 @@ -47,17 +45,3 @@ script: - tns build android - android-wait-for-emulator - npm run appium --runtype=android19 --appium=$APPIUM_VERSION -before_deploy: -- cd ../nativescript-angular -- npm install -g nativescript --ignore-scripts -- tns usage-reporting disable -- tns error-reporting disable -- node ../build/travis-scripts/add-publishConfig.js next $PACKAGE_VERSION -deploy: - provider: npm - email: nativescript@telerik.com - skip_cleanup: true - api_key: - secure: J88MqLAoZStZZ77AAf+wgaoZp+8zG3fOUHRneSe4x/yEzyUShS9SlGuq0TSkm9sJVX94iHJl1BQ4yjLshOPV9dkOg1+BB4PbsDTKPCAhPCZgpW7WKz6iImmuWHArchLIRtI1fp+UYi1+V6c7gLALQPY7qR2QJcDJdq1tdgORAyGySMis95ttVhnn6DWTBbs/ocu+IzgOyBSkIiZR0mGk7q/pmVQPy+XL5PQoyUOhD4MmvAAIeVr+XoZ5I8pAUwhi1/bZijXrzWe7LbXh8pTDlEWvYduzYYjJZqUrHiE/e1e8/DIPXGaBUQBj7LRxSqqO8AJXGeCg4DF1R9j4CSG5c0pAwQ/U6vOGu8duPEGaoKG5+HlrTav7gI/YbwFA5HKyh1uzQ5trZDJ4mMKUoB1+8/eL2cjLudtyBB2Kg28wH6f78A9mQC1EJcP7Jz3qJTSUyhczIvwSF8/EkD8xmeaoTi2e+4TNgf7pys1cp6c7m7zKZbvVy25lfyAfG1rCF5+rzKj+GnE9mtLaY6VvlKWjyxklh8hfRBC94TZ8K7PH0tmdgk2Jal+OCdm9FDdmNrBSC1G/gPS8PchtffIRprPhNAUfcVpdg0rlQ4dckbGRbB5UBgwHkpoKasaSTx/nO85AiK6USIYOIod19loXUBvN3QyHUX76w265UhmTnb8iojo= - on: - branch: master \ No newline at end of file diff --git a/build/generate-value-accessor-selector.js b/build/generate-value-accessor-selector.js deleted file mode 100644 index ffa189806..000000000 --- a/build/generate-value-accessor-selector.js +++ /dev/null @@ -1,23 +0,0 @@ -// Usage: -// node generate-value-accessor-selector TextField TextView - -function generateValueAccessorSelector(tagNames) { - const tags = []; - tagNames.forEach(tagName => { - tags.push(tagName); // regular tag - tags.push(tagName.charAt(0).toLowerCase() + tagName.slice(1)); // lowercase first char - tags.push(tagName.split(/(?=[A-Z])/).join("-").toLowerCase()); // kebab case - }); - - const selectors = []; - for (const tag of tags) { - for (const directive of ["ngModel", "formControlName"]) { - selectors.push(`${tag}[${directive}]`); - } - } - return selectors.join(", "); -} - -process.argv.shift(); -process.argv.shift(); -console.log(generateValueAccessorSelector(process.argv)); diff --git a/build/prepublish-next.js b/build/prepublish-next.js new file mode 100644 index 000000000..e320c99f8 --- /dev/null +++ b/build/prepublish-next.js @@ -0,0 +1,33 @@ +#!/usr/bin/env node +const fs = require("fs"); +const path = require("path"); + +const getPackageJson = projectDir => { + const packageJsonPath = getPackageJsonPath(projectDir); + return JSON.parse(fs.readFileSync(packageJsonPath, "utf8")); +}; + +const writePackageJson = (content, projectDir) => { + const packageJsonPath = getPackageJsonPath(projectDir); + fs.writeFileSync(packageJsonPath, JSON.stringify(content, null, 2)) +} + +const getPackageJsonPath = projectDir => path.resolve(projectDir, "package.json"); + +const tag = "next"; +const projectDir = "nativescript-angular"; +const packageJson = getPackageJson(projectDir); +const [, , packageVersion = new Date() ] = process.argv; + +packageJson.publishConfig = Object.assign( + packageJson.publishConfig || {}, + { tag } +); + +delete packageJson.private; + +const currentVersion = packageJson.version; +const nextVersion = `${currentVersion}-${packageVersion}`; +const newPackageJson = Object.assign(packageJson, { version: nextVersion }); + +writePackageJson(newPackageJson, projectDir); diff --git a/build/travis-scripts/add-publishConfig.js b/build/travis-scripts/add-publishConfig.js deleted file mode 100644 index 224c66165..000000000 --- a/build/travis-scripts/add-publishConfig.js +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env node - -var fsModule = require('fs'); - -//Adds a publishConfig section to the package.json file -// and sets a tag to it - -var path = './package.json'; -var fileOptions = {encoding: "utf-8"}; -var content = fsModule.readFileSync(path, fileOptions); - -var tag = process.argv[2]; -if (!tag) { - console.log('Please pass the tag name as an argument!'); - process.exit(1); -} - -var packageDef = JSON.parse(content); -if (!packageDef.publishConfig) { - packageDef.publishConfig = {}; -} -packageDef.publishConfig.tag = tag; - -if (packageDef.private) { - delete packageDef.private; -} - -// adding date and travis build number (2016-07-18-765) to version in order to get unique version for @next build -var package_version = process.argv[3]; -packageDef.version += '-' + package_version; - -var newContent = JSON.stringify(packageDef, null, ' '); -fsModule.writeFileSync(path, newContent, fileOptions);