From c12ec405c4031f71aee96fbcea31994a07c26d16 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 5 Sep 2018 18:16:08 +0100 Subject: [PATCH] run e2e in production mode (#607) * run e2e in production mode * update coverage settings * fix coverage reports * update e2e settings * prod build for docker image * restore dev build * revert e2e mode * update travis settings * production build workaround * update travis settings * update travis * build fixes --- .travis.yml | 10 ++++------ angular.json | 5 +++++ package.json | 4 ++-- projects/aca-dev-tools/ng-package.json | 12 ++++++++++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bbaaeb83..dbb57886b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,8 @@ jobs: - stage: test script: npm run lint && npm run spellcheck - stage: test - script: npm run test:ci + script: + - npm run test:ci + - bash <(curl -s https://codecov.io/bash) -X gcov - stage: e2e - script: npm run build:dev && npm run e2e:docker - -# Send coverage data to codecov -after_success: - bash <(curl -s https://codecov.io/bash) -X gcov + script: npm run build && npm run e2e:docker diff --git a/angular.json b/angular.json index ebf8e0118..42c0aba18 100644 --- a/angular.json +++ b/angular.json @@ -185,6 +185,11 @@ "options": { "protractorConfig": "./protractor.conf.js", "devServerTarget": "app:serve" + }, + "configurations": { + "production": { + "devServerTarget": "app:serve:production" + } } }, "lint": { diff --git a/package.json b/package.json index 5b1d15144..0aa407581 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,10 @@ "start:prod": "npm run server-versions && npm run build.libs.prod && ng serve --prod --open", "build.libs.dev": "ng build adf-extensions && ng build aca-dev-tools", "build.libs.prod": "ng build adf-extensions --prod && ng build aca-dev-tools --prod", - "build": "npm run server-versions && npm run build.libs.prod && ng build --prod", + "build": "npm run server-versions && npm run build.libs.prod && node --max-old-space-size=8192 node_modules/@angular/cli/bin/ng build app --prod", "build:dev": "npm run server-versions && npm run build.libs.dev && ng build", "test": "npm run build.libs.dev && ng test app --code-coverage", - "test:ci": "npm run build.libs.dev && ng test app --watch=false", + "test:ci": "npm run build.libs.dev && ng test app --code-coverage --watch=false", "lint": "ng lint", "server-versions": "rimraf ./src/versions.json && npm list --depth=0 --json=true --prod=true > ./src/versions.json || exit 0", "e2e": "ng e2e", diff --git a/projects/aca-dev-tools/ng-package.json b/projects/aca-dev-tools/ng-package.json index 1cfd30d9c..f0400e62e 100644 --- a/projects/aca-dev-tools/ng-package.json +++ b/projects/aca-dev-tools/ng-package.json @@ -3,6 +3,14 @@ "dest": "../../dist/aca-dev-tools", "deleteDestPath": false, "lib": { - "entryFile": "src/public_api.ts" + "entryFile": "src/public_api.ts", + "flatModuleFile": "aca-dev-tools", + "umdModuleIds": { + "showdown": "showdown", + "@alfresco/adf-core": "@alfresco/adf-core", + "@ngstack/code-editor": "@ngstack/code-editor", + "@alfresco/adf-content-services": "@alfresco/adf-content-services", + "@alfresco/adf-extensions": "@alfresco/adf-extensions" + } } -} \ No newline at end of file +}