From d739526517c6b973429bc57b3ad542dcbf5e71c4 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Thu, 23 Mar 2017 10:54:49 +0000 Subject: [PATCH] make the local link build fast and run the test only if asked #1588 (#1671) * make the local link build fast and run the test only if asked #1588 * demo core doesn't exist * link after install * move in after success matrix build and install scripts --- .travis.yml | 28 ++++++++----------- .../ng2-activiti-analytics/package.json | 6 ++-- .../ng2-activiti-diagrams/package.json | 6 ++-- ng2-components/ng2-activiti-form/package.json | 6 ++-- .../ng2-activiti-processlist/package.json | 6 ++-- .../ng2-activiti-tasklist/package.json | 6 ++-- ng2-components/ng2-alfresco-core/package.json | 6 ++-- .../ng2-alfresco-datatable/package.json | 6 ++-- .../ng2-alfresco-documentlist/package.json | 6 ++-- .../ng2-alfresco-login/package.json | 6 ++-- .../ng2-alfresco-search/package.json | 6 ++-- ng2-components/ng2-alfresco-tag/package.json | 6 ++-- .../ng2-alfresco-upload/package.json | 6 ++-- .../ng2-alfresco-userinfo/package.json | 6 ++-- .../ng2-alfresco-viewer/package.json | 6 ++-- .../ng2-alfresco-webscript/package.json | 6 ++-- scripts/README.md | 8 +++++- scripts/npm-build-all.sh | 23 +++++++++++++++ scripts/npm-link-all-components-demo.sh | 2 -- scripts/npm-publish.sh | 2 +- scripts/start.sh | 9 +++--- 21 files changed, 92 insertions(+), 70 deletions(-) diff --git a/.travis.yml b/.travis.yml index e15bf35b9c..3aca566204 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,9 @@ language: node_js dist: trusty sudo: false - node_js: - "5" -addons: - - before_install: - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" @@ -32,31 +28,29 @@ env: before_script: - if ([ "$MODULE" != "ng2-alfresco-core" ]); then - (cd ng2-components/ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); + (cd ng2-components/ng2-alfresco-core; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); fi - if ([ "$MODULE" == "ng2-alfresco-documentlist" ] || [ "$MODULE" == "ng2-alfresco-webscript" ] || [ "$MODULE" == "ng2-activiti-processlist" ] || [ "$MODULE" == "ng2-activiti-tasklist" ]); then - (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); + (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-tasklist" ] || [ "$MODULE" == "ng2-activiti-processlist" ]); then - (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); - (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); + (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); + (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-processlist" ]); then - (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); - (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); - (cd ng2-components/ng2-activiti-tasklist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; npm link ng2-activiti-form; if [ ! -d "bundles" ]; then npm link; fi); + (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); + (cd ng2-components/ng2-activiti-form; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); + (cd ng2-components/ng2-activiti-tasklist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; npm link ng2-activiti-form; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); fi - if ([ "$MODULE" == "ng2-activiti-analytics" ]); then - (cd ng2-components/ng2-activiti-diagrams; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); + (cd ng2-components/ng2-activiti-diagrams; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); fi - if ([ "$MODULE" == "ng2-alfresco-search" ]); then - (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm link; fi); - (cd ng2-components/ng2-alfresco-documentlist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; if [ ! -d "bundles" ]; then npm link; fi); + (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); + (cd ng2-components/ng2-alfresco-documentlist; npm link ng2-alfresco-core; npm link ng2-alfresco-datatable; if [ ! -d "bundles" ]; then npm install && npm run build && npm link; fi); fi - cd ng2-components/$MODULE; - - npm run travis; -#npm insall run install, build and tests -script: npm install +script: npm install && npm run travis && npm run test # Send coverage data to Coveralls after_success: bash <(curl -s https://codecov.io/bash) -X gcov diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 16d907e842..75e1dc7063 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core ng2-activiti-diagrams", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index d5356e3e1d..15c890b18b 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index 3979b7cfb3..c705b8bf81 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index cb82b9571e..861fdda65b 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-activiti-form ng2-activiti-tasklist", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index de9d14e536..260faa2a88 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-activiti-form", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 6df748338d..a9c713be3f 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts 'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "echo 'placeholder'", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index 43febcfe9e..0f323188ef 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 1c765ff0de..7e524b0de4 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-login/package.json b/ng2-components/ng2-alfresco-login/package.json index d14a5197da..11b91706af 100644 --- a/ng2-components/ng2-alfresco-login/package.json +++ b/ng2-components/ng2-alfresco-login/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 0e32422a61..b18a94b5fc 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable ng2-alfresco-documentlist", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index 8adb39e064..f966cbc861 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index cbc96bc516..8cb64ce529 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-userinfo/package.json b/ng2-components/ng2-alfresco-userinfo/package.json index 21845e344e..6cb188fa69 100644 --- a/ng2-components/ng2-alfresco-userinfo/package.json +++ b/ng2-components/ng2-alfresco-userinfo/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index f4bc3ee06b..25a76e4c0e 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 875c58d072..809a52a016 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -6,8 +6,8 @@ "scripts": { "clean": "npm install rimraf && npm run clean-build && rimraf dist node_modules typings", "clean-build": "rimraf index.js index.js.map index.d.ts'src/{,**/}**.js' 'src/{,**/}**.js.map' 'src/{,**/}**.d.ts' bundles", - "build": "npm run clean-build && npm run tslint && rimraf dist && tsc && license-check && npm run build.umd", - "build:w": "npm run clean-build && npm run tslint && rimraf dist && npm run tsc:w && license-check && npm run build.umd", + "build": "npm run clean-build && npm run tslint && tsc && license-check && npm run build.umd", + "build:w": "npm run clean-build && npm run tslint && npm run tsc:w && license-check && npm run build.umd", "tslint": "tslint -c tslint.json 'src/{,**/}**.ts' 'index.ts' -e '{,**/}**.d.ts' -e './gulpfile.ts'", "tsc": "tsc", "tsc:w": "tsc -w", @@ -16,7 +16,7 @@ "test-browser": "npm run build && concurrently \"karma start karma.conf.js --reporters kjhtml\" \"npm run watch-task\"", "posttest": "remap-istanbul -i coverage/report/coverage-final.json -o coverage/report -t html && remap-istanbul -i coverage/report/coverage-final.json -o coverage/report/coverage-final.json", "coverage": "npm run test && wsrv -o -p 9875 ./coverage/report", - "prepublish": "npm run test", + "publish:prod": "npm run test && npm publish", "travis": "npm link ng2-alfresco-core ng2-alfresco-datatable", "gulp": "gulp", "build.umd": "gulp build.prod --color --env-config prod --build-type prod", diff --git a/scripts/README.md b/scripts/README.md index 64bd8c4ab4..3e7ac8763f 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -44,7 +44,13 @@ in the demo shell: * If you want to build all your local component: ```sh -./npm-buid-alll.sh +./npm-buid-all.sh +``` + +* If you want to build all your local component and run the test: + +```sh +./npm-buid-alll.sh -test ``` * If you want clean all your local component and the demo shell: diff --git a/scripts/npm-build-all.sh b/scripts/npm-build-all.sh index 0a3f369f09..9235afbebd 100755 --- a/scripts/npm-build-all.sh +++ b/scripts/npm-build-all.sh @@ -1,13 +1,36 @@ #!/usr/bin/env bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +eval RUN_TEST=false + +show_help() { + echo "Usage: npm-build-all.sh" + echo "" + echo "-t or -test build all your local component and run also the test on them" +} + +enable_test(){ + RUN_TEST=true +} build_project() { cd $1 echo "====== build project: $2 =====" npm install + npm build + if $RUN_TEST == true; then + npm run test + fi } +while [[ $1 == -* ]]; do + case "$1" in + -h|--help|-\?) show_help; exit 0;; + -t|--test) enable_test; shift;; + -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; + esac +done + for PACKAGE in \ ng2-alfresco-core \ ng2-activiti-diagrams \ diff --git a/scripts/npm-link-all-components-demo.sh b/scripts/npm-link-all-components-demo.sh index f2cf77974f..6120c96caa 100755 --- a/scripts/npm-link-all-components-demo.sh +++ b/scripts/npm-link-all-components-demo.sh @@ -9,7 +9,6 @@ npm install #LINK ALL THE OTHERS COMPONENTS for PACKAGE in \ - ng2-alfresco-core \ ng2-alfresco-datatable \ ng2-activiti-diagrams \ ng2-activiti-analytics \ @@ -30,5 +29,4 @@ do cd "$DESTDIR/demo" npm link ${PACKAGE} npm travis - npm install done diff --git a/scripts/npm-publish.sh b/scripts/npm-publish.sh index d554957810..b78e2b7db4 100755 --- a/scripts/npm-publish.sh +++ b/scripts/npm-publish.sh @@ -25,6 +25,6 @@ do echo "====== PUBLISHING: ${DESTDIR} =====" cd ${DESTDIR} npm install - npm publish + npm run publish:prod cd ${DIR} done diff --git a/scripts/start.sh b/scripts/start.sh index fbffd9ac9d..86b2060853 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -37,18 +37,19 @@ eval OPTIONS=$1 while [[ $1 == -* ]]; do case "$1" in -l|--link) link; shift;; - -*) shift;; + -*) shift;; esac - done -while [[ $OPTIONS == -* ]]; do +shift $(expr $OPTIND - 1 ) + +while [[ $1 == -* ]]; do case "$OPTIONS" in -h|--help|-\?) show_help; exit 0;; -i|--install) install; shift;; -u|--update) update; shift;; -c|--cleanInstall) cleanInstall; shift;; - -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; + -*) shift;; esac done