[ADF-3299] and [ADF-3300] upgrade to Angular and Material 6 (#3579)

* upgrade to HttpClient

* upgrade to Renderer2

* upgrade Document reference

* remove useless test with deprecated ReflectiveInjector

* upgrade to latest typescript

* upgrade libs

* upgrade package scripts

* remove rxjs blacklists and duplicate rules

* add rxjs compat to help with migration

* fix breaking changes

* fix breaking changes in material

* fix breaking changes (material 6)

* upgrade rxjs, ngx-translate and flex layout

* update unit tests

* restore providers

* upgrade deprecated Observable.error

* rebase
fix first configuration problems

* fix style issues commented

* fix core build

* fix lib template errors

* move lib test execution in angular.json

* ignore

* karma conf files

* fix import statement test

* single run option

* update packages reporter

* restore report

* increase timeout

* improve karma conf test configuration

* fix test issues about lint

* fix test analytics

* fix process service test

* content service fix test

* fix logout directive test

* fix core test

* fix build

* update node-sass to latest

* update angular cli dependencies

* improve build script

create directorites and move files only if previous command succeded

* upgrade individual libs to 6.0

* remove old webpack files

* revert sass change

* fix type issues
fix style issues

* fix tslint demo shell issue

* fix peerdependencies

* fix test e2e BC

* package upate

* fix style import issue

* extract-text-webpack-plugin beta

* fix test dist build command

* remove alpha js-api

* fix tslint issue
add banner tslint rule

* upload service fix

* change BC script

* fix test dist script

* increase demo shell timeout test

* verbose copy

* path absolute

* fix script bc

* fix copy part

* fix path warning
fix monaco editor

* remove duplicate header

* remove unused import

* fix align and check ago tests

* add missing import

* fix notification button selector

* [ANGULAR6] fixed core tests

* fix CS test

* fix cs test step 2

* increase travis_wait for dist

* fix attachment PS

* fix checklist test

* use pdf min
This commit is contained in:
Denys Vuika
2018-08-07 11:58:16 +01:00
committed by Eugenio Romano
parent c510ec864d
commit 6b24bfb1d4
371 changed files with 16287 additions and 24504 deletions

View File

@@ -13,20 +13,20 @@ rm -rf node_modules/@alfresco
echo "====== Build lib ====="
npm run ng-packagr -- -p ./lib/core/package.json
mkdir -p ./node_modules/@alfresco/adf-core/
npm run ng-packagr -- -p ./lib/core/ && \
mkdir -p ./node_modules/@alfresco/adf-core/ && \
cp -R ./lib/dist/core/* ./node_modules/@alfresco/adf-core/
npm run ng-packagr -- -p ./lib/content-services/package.json
mkdir -p ./node_modules/@alfresco/adf-content-services/
npm run ng-packagr -- -p ./lib/content-services/ && \
mkdir -p ./node_modules/@alfresco/adf-content-services/ && \
cp -R ./lib/dist/content-services/* ./node_modules/@alfresco/adf-content-services/
npm run ng-packagr -- -p ./lib/process-services/package.json
mkdir -p ./node_modules/@alfresco/adf-process-services/
npm run ng-packagr -- -p ./lib/process-services/ && \
mkdir -p ./node_modules/@alfresco/adf-process-services/ && \
cp -R ./lib/dist/process-services/* ./node_modules/@alfresco/adf-process-services/
npm run ng-packagr -- -p ./lib/insights/package.json
mkdir -p ./node_modules/@alfresco/adf-insights/
npm run ng-packagr -- -p ./lib/insights/ && \
mkdir -p ./node_modules/@alfresco/adf-insights/ && \
cp -R ./lib/dist/insights/* ./node_modules/@alfresco/adf-insights/
echo "====== Build style ====="

View File

@@ -4,7 +4,6 @@ set -f
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
eval RUN_TEST=false
eval RUN_TESTBROWSER=false
eval EXEC_FAST_TEST=false
eval EXEC_CLEAN=false
eval EXEC_BUILD=true
eval EXEC_INSTALL=true
@@ -28,7 +27,6 @@ show_help() {
echo "-c or --clean Clean the node_modules before starting the build."
echo "-si or --skipinstall Skip the install of node_modules before starting the build."
echo "-sb or --skipbuild Skip the build of ng-components."
echo "-ft or --fasttest Build all your local component and run also the test in one single karma-test-shim (high memory consuming and less details)"
echo "-gitjsapi <commit-ish> Build all the components against a commit-ish version of the JS-API"
echo "-vjsapi <commit-ish> Install different version from npm of JS-API defined in the package.json"
}
@@ -55,16 +53,14 @@ enable_testbrowser(){
test_project() {
echo "====== test project: $1 ====="
npm run test-lib -- --component $1 --mode coverage || exit 1
ng lint $1 || exit 1
ng test $1 --watch=false || exit 1
}
debug_project() {
echo "====== debug project: $1 ====="
npm run test-lib-browser -- --component $1 || exit 1
}
enable_fast_test() {
EXEC_FAST_TEST=true
ng lint $1 || exit 1
ng test $1 || exit 1
}
enable_js_api_git_link() {
@@ -106,7 +102,6 @@ while [[ $1 == -* ]]; do
fi
;;
-d|--debug) enable_testbrowser $2; shift; if $EXEC_SINGLE_TEST == true; then shift; fi ;;
-ft|--fasttest) enable_fast_test; shift;;
-gitjsapi) enable_js_api_git_link $2; shift 2;;
-vjsapi) version_js_api $2; shift 2;;
-c|--clean) clean; shift;;
@@ -147,14 +142,8 @@ if $EXEC_BUILD == true; then
npm run build-lib || exit 1
fi
if $EXEC_FAST_TEST == true; then
echo "====== Test all components (fast option) ====="
npm run test-lib || exit 1
fi
if $RUN_TEST == true; then
if $EXEC_SINGLE_TEST == true; then
cp -n "$DIR/../lib/config/karma-test-shim.js" "$DIR/../lib/$SINGLE_TEST/"
test_project $SINGLE_TEST
else
for PACKAGE in ${projects[@]}
@@ -166,7 +155,6 @@ fi
if $RUN_TESTBROWSER == true; then
if $EXEC_SINGLE_TEST == true; then
cp -n "$DIR/../lib/config/karma-test-shim.js" "$DIR/../lib/$SINGLE_TEST/"
debug_project $SINGLE_TEST
else
for PACKAGE in ${projects[@]}

View File

@@ -12,7 +12,7 @@ npm install -g verdaccio-auth-memory
echo "====== Update version ===== "
$DIR/update-version.sh -nextalpha
$DIR/update-version.sh -nextbeta -components
echo "====== Change registry ===== "
@@ -20,4 +20,4 @@ npm set registry http://localhost:4873/
echo "====== Run verdaccio ===== "
concurrently "verdaccio --listen 4873 --config $DIR/config/config-verdaccio.yaml" "$DIR/npm-publish.sh"
concurrently "verdaccio --listen 4873 --config $DIR/config/config-verdaccio.yaml" "$DIR/npm-publish.sh --sleep 20 -f"

View File

@@ -174,7 +174,7 @@ fi
if $EXEC_TEST == true; then
echo "====== Demo shell Test ====="
npm run test
npm run test || exit 1
fi
if $EXEC_E2E == true; then

View File

@@ -44,7 +44,7 @@ mkdir -p $DIR/../node_modules/@alfresco/adf-content-services
mkdir -p $DIR/../node_modules/@alfresco/adf-process-services
mkdir -p $DIR/../node_modules/@alfresco/adf-insights
cp -R $DIR/../lib/dist/core/* $DIR/..//node_modules/@alfresco/adf-core
cp -R $DIR/../lib/dist/core/* $DIR/../node_modules/@alfresco/adf-core
cp -R $DIR/../lib/dist/content-services/* $DIR/../node_modules/@alfresco/adf-content-services
cp -R $DIR/../lib/dist/process-services/* $DIR/../node_modules/@alfresco/adf-process-services
cp -R $DIR/../lib/dist/insights/* $DIR/../node_modules/@alfresco/adf-insights
@@ -52,7 +52,7 @@ cp -R $DIR/../lib/dist/insights/* $DIR/../node_modules/@alfresco/adf-insights
echo "====== Build dist demo shell ===== "
npm run server-versions
ng build --prod --app dist --base-href=$NAME/ -op demo-shell/dist/$NAME || exit 1
ng build dist --prod --base-href=$NAME/ --output-path demo-shell/dist/$NAME || exit 1
echo "====== e2e test ===== "

View File

@@ -1,27 +1,54 @@
#!/usr/bin/env bash
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
rm -rf "$DIR/../node_modules/@angular"
cd "$DIR/../integration/base_ver_2_app"
#echo "====== Build ADF ===== "
npm run build-lib || exit 1
cd $DIR/../integration/base_ver_2_app
ADF_VERSION=$(npm view @alfresco/adf-core version)
ANGULAR_VERSION="5.1.1"
MATERIAL_VERSION="5.0.1"
NGX_TRANSLATE_VERSION="9.1.1"
ANGULAR_CLI_VERSION="1.7.4"
MATERIAL_VERSION="5.1.1"
NGX_TRANSLATE_VERSION="10.0.2"
MOMENT_VERSION="2.20.1"
RXJS_VERSION="6.0.0"
TYPESCRIPT_VERSION=2.6.2
npm install
#Use last js-api
npm install --save alfresco-js-api@alpha
echo "====== Install New documented dependency ===== "
#New documented dependency
npm install --save-exact --save @alfresco/adf-content-services@${ADF_VERSION} @alfresco/adf-core@${ADF_VERSION} @alfresco/adf-insights@${ADF_VERSION} @alfresco/adf-process-services@${ADF_VERSION}
npm install --save-exact --save-dev @angular-devkit/core@0.0.28 @angular/compiler-cli@${ANGULAR_VERSION} typescript@2.6.2
npm install --save-exact --save-dev @angular-devkit/core@0.0.28 @angular/compiler-cli@${ANGULAR_VERSION} @angular/cli@${ANGULAR_CLI_VERSION} typescript@${TYPESCRIPT_VERSION}
npm install --save @mat-datetimepicker/core @mat-datetimepicker/moment
npm install --save-exact --save @angular/animations@${ANGULAR_VERSION} @angular/common@${ANGULAR_VERSION} @angular/compiler@${ANGULAR_VERSION} @angular/core@${ANGULAR_VERSION} @angular/platform-browser@${ANGULAR_VERSION} @angular/router@${ANGULAR_VERSION} @angular/flex-layout@2.0.0-beta.12 @angular/forms@${ANGULAR_VERSION} @angular/forms@${ANGULAR_VERSION} @angular/http@${ANGULAR_VERSION} @angular/platform-browser-dynamic@${ANGULAR_VERSION}
npm install --save-exact --save @angular/cdk@${MATERIAL_VERSION} @angular/material@${MATERIAL_VERSION}
npm install --save-exact --save @ngx-translate/core@${NGX_TRANSLATE_VERSION}
npm install --save-exact --save moment@${MOMENT_VERSION}
npm install --save-exact --save rxjs@${RXJS_VERSION}
npm install --save-exact --save @angular/material-moment-adapter@${MATERIAL_VERSION}
npm install --save-exact --save rxjs-compat@6.1.0
echo "====== Install JS-API alpha ===== "
npm install --save alfresco-js-api@alpha
echo "====== COPY new build in node_modules ===== "
rm -rf $DIR/../integration/base_ver_2_app/node_modules/@alfresco
mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-core/ && \
cp -R $DIR/../lib/dist/core/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-core/
mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-content-services/ && \
cp -R $DIR/../lib/dist/content-services/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-content-services/
mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-process-services/ && \
cp -R $DIR/../lib/dist/process-services/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-process-services/
mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-insights/ && \
cp -R $DIR/../lib/dist/insights/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-insights/
rm -rf $DIR/../node_modules/@angular
rm -rf $DIR/../node_modules/@alfresco
npm run e2e

View File

@@ -100,19 +100,19 @@ if [[ $DEVELOPMENT == "true" ]]; then
echo "====== Run against local development ====="
if [[ $SINGLE_TEST == "true" ]]; then
echo "====== Single test run $NAME_TEST ====="
npm run e2e-lib -- --specs ./e2e/$NAME_TEST
npm run e2e-lib -- --specs ./e2e/$NAME_TEST || exit 1
else
npm run e2e-lib
npm run e2e-lib || exit 1
fi
else
if [[ $SINGLE_TEST == "true" ]]; then
npm install --save-dev jasmine2-protractor-utils -g
echo "====== Single test run $NAME_TEST ====="
webdriver-manager update --gecko=false --versions.chrome=2.38
./node_modules/protractor/bin/protractor protractor.conf.js --specs ./e2e/$NAME_TEST
./node_modules/protractor/bin/protractor protractor.conf.js --specs ./e2e/$NAME_TEST || exit 1
else
webdriver-manager update --gecko=false --versions.chrome=2.38
./node_modules/protractor/bin/protractor protractor.conf.js
./node_modules/protractor/bin/protractor protractor.conf.js || exit 1
fi
fi