From 44146fdca94a5dc47d3c078de30580c14e483803 Mon Sep 17 00:00:00 2001 From: Dmitry Danilov Date: Thu, 2 Jul 2020 16:17:45 +0300 Subject: [PATCH] fix(ci): remove ivy-related configs & checks, because, ivy is enabled by default --- .travis.yml | 16 +--------------- angular.json | 32 -------------------------------- package.json | 6 ------ 3 files changed, 1 insertion(+), 53 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4298f21fa9..c630c9256f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,9 +103,6 @@ jobs: - script: npm run test-coverage name: "Test with current Angular version" after_success: ./node_modules/.bin/codecov - - script: ng test --configuration ivy && tsc -p schematics/tsconfig.json && npm run test:schematics - name: "Test with current Angular version Ivy:enabled" - env: NGV=ivy - script: ng test && tsc -p schematics/tsconfig.json && npm run test:schematics name: "Test with latest Angular version" env: NGV=latest @@ -120,9 +117,6 @@ jobs: <<: *testSmokeCy - script: npm run demo.ng-build name: "Check prod build with current Angular version" - - script: npm run demo.ng-build:ivy - name: "Check prod build with current version Ivy:enabled" - env: NGV=ivy - script: npm run demo.ng-build name: "Check prod build with latest Angular version" env: NGV=latest @@ -146,21 +140,13 @@ jobs: - &surge stage: deploy script: - - if [[ "$NGV" == "ivy" ]]; then npm run demo.build:ivy; fi - if [[ "$NGV" == "latest" || "$NGV" == "next" ]]; then npm run demo.build:latest; fi - - if [[ "$NGV" != "latest" && "$NGV" != "ivy" && "$NGV" != "next" ]]; then npm run demo.build; fi + - if [[ "$NGV" != "latest" && "$NGV" != "next" ]]; then npm run demo.build; fi deploy: provider: surge project: ./gh-pages/ domain: ngx-bootstrap.surge.sh on: development - - <<: *surge - env: NGV=ivy - deploy: - provider: surge - project: ./gh-pages/ - domain: ngx-bootstrap-ivy.surge.sh - on: development - <<: *surge env: NGV=latest deploy: diff --git a/angular.json b/angular.json index b9935827b0..d64344976d 100644 --- a/angular.json +++ b/angular.json @@ -46,25 +46,6 @@ } ] }, - "ivy": { - "preserveSymlinks": true, - "optimization": true, - "outputHashing": "all", - "tsConfig": "demo/src/tsconfig-ivy.json", - "sourceMap": false, - "extractCss": true, - "namedChunks": true, - "aot": true, - "extractLicenses": true, - "vendorChunk": true, - "buildOptimizer": true, - "fileReplacements": [ - { - "replace": "demo/src/environments/environment.ts", - "with": "demo/src/environments/environment.prod.ts" - } - ] - }, "server": { "preserveSymlinks": true, "optimization": true, @@ -96,9 +77,6 @@ }, "server": { "browserTarget": "ngx-bootstrap:build:server" - }, - "ivy": { - "browserTarget": "ngx-bootstrap:build:ivy" } } }, @@ -126,11 +104,6 @@ "assets": [ "demo/src/assets" ] - }, - "configurations": { - "ivy": { - "tsConfig": "src/tsconfig-ivy.spec.json" - } } }, "lint": { @@ -173,11 +146,6 @@ "demo/src/assets/css/prettify-angulario.css" ], "assets": [] - }, - "configurations": { - "ivy": { - "tsConfig": "src/tsconfig-ivy.spec.json" - } } }, "lint": { diff --git a/package.json b/package.json index b4a95c8022..ee2343e08d 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,9 @@ "demo.fetch": "node scripts/fetch-docs.js", "demo.archive": "node scripts/archive.js", "demo.ng-build": "ng build --prod", - "demo.ng-build:ivy": "ng build --configuration ivy", "demo.set-version": "run-s demo.fetch demo.archive", "demo.deploy-gh-pages": "gh-pages -d gh-pages", "demo.build": "run-s build demo.gen-docs demo.ng-build demo.set-version", - "demo.build:ivy": "run-s build demo.gen-docs demo.ng-build:ivy demo.set-version", "demo.build:latest": "run-s build.latest demo.gen-docs demo.ng-build demo.set-version", "demo.serve": "run-s demo.build lite-server", "demo.serve-universal": "run-s build:dynamic serve:dynamic", @@ -37,10 +35,8 @@ "ci:rename-pkg": "mv node_modules/ngx-bootstrap-ci node_modules/ngx-bootstrap", "build.sass": "node-sass --recursive src --output dist --source-map true --source-map-contents sass", "start": "ng serve --aot --host 0.0.0.0", - "start:ivy": "ng serve --configuration ivy --host 0.0.0.0", "pretest": "run-s lint build", "test": "ng test && npm run test:schematics", - "test:ivy": "ng test --configuration ivy && npm run test:schematics", "test:schematics": "jasmine schematics/src/**/*.spec.js", "test-cross": "SAUCE=true && ng test", "test-coverage": "ng test --code-coverage", @@ -56,10 +52,8 @@ "cy:run:snapshot": "APPLITOOLS_CONCURRENCY=100 cypress run --config integrationFolder=cypress/snapshot", "view-stats": "webpack-bundle-analyzer demo/dist/stats.json", "build:ssr": "run-s build build:client-and-server-bundles webpack:server configure-heroku", - "build:ssr:ivy": "run-s build build:client-and-server-bundles:ivy webpack:server configure-heroku", "serve:ssr": "node demo/dist/server", "build:client-and-server-bundles": "ng build --prod && ng run ngx-bootstrap:server", - "build:client-and-server-bundles:ivy": "npm run demo.ng-build:ivy && ng run ngx-bootstrap:server", "webpack:server": "webpack --config ./scripts/universal/webpack.server.config.js --progress --colors", "configure-heroku": "node scripts/universal/configure-heroku.js" },