Skip to content

Commit

Permalink
feat(cli): upgrade to @angular@cli@6 (#1145)
Browse files Browse the repository at this point in the history
* feat(cli): upgrade to @angular@cli@6

* chore(): generate coverage dir at root level

* chore(): update dependencies and yarn.lock with latest cli dependencies

* feat(): upgrade to angular stable

* fix(): update commands for serve and build

* chore(): update versions for build

* chore(): add --watch=false to test command
  • Loading branch information
emoralesb05 authored May 16, 2018
1 parent be99963 commit 1a91272
Show file tree
Hide file tree
Showing 47 changed files with 1,370 additions and 1,126 deletions.
61 changes: 0 additions & 61 deletions .angular-cli.json

This file was deleted.

134 changes: 134 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
{
"$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"covalent-docs": {
"root": "",
"projectType": "application",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/covalent-docs",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
{
"glob": "favicon.ico",
"input": "src",
"output": "/"
},
{
"glob": "**/*",
"input": "src/assets",
"output": "/assets"
},
{ "glob": "**/*", "input": "./docs", "output": "./docs" },
{ "glob": "**/*", "input": "node_modules/@covalent/code-editor/assets/monaco", "output": "/assets/monaco/" },
{ "glob": "**/*", "input": "src/platform", "output": "/platform" }
],
"styles": [
"src/styles.scss",
"src/theme.scss"
],
"scripts": [
"node_modules/hammerjs/hammer.min.js"
]
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "covalent-docs:build"
},
"configurations": {
"production": {
"browserTarget": "covalent-docs:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "covalent-docs:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
{
"input": "styles.scss"
}, {
"input": "theme.scss"
}, {
"input": "node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
}
],
"scripts": [
{
"input": "node_modules/hammerjs/hammer.min.js"
}
],
"assets": [
{
"glob": "favicon.ico",
"input": "src/",
"output": "/"
},
{
"glob": "**/*",
"input": "src/assets",
"output": "/assets"
}
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
}
},
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
}
}
}
4 changes: 2 additions & 2 deletions build.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

module.exports = {
deployed: 'deploy/platform/',
angularVersion: '6.0.0-rc.5',
materialVersion: '6.0.0-rc.5',
angularVersion: '6.0.0',
materialVersion: '6.0.0',
paths: {
PostNgPackngrBuildRequiredFiles: [
'!src/platform/core/**/*.component.scss',
Expand Down
58 changes: 0 additions & 58 deletions karma.conf.js

This file was deleted.

73 changes: 37 additions & 36 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
"scripts": {
"webdriver-update": "bash ./node_modules/.bin/webdriver-manager update",
"lint": "npm run tslint && npm run stylelint",
"tslint": "./node_modules/.bin/tslint --format codeFrame -c ./tslint.json \"./src/**/*.ts\" -e \"./src/**/typings.d.ts\" -e \"./src/environments/**\"",
"tslint": "./node_modules/.bin/tslint --format codeFrame -c ./tslint.json \"./src/**/*.ts\" -e \"./src/environments/**\"",
"stylelint": "./node_modules/.bin/stylelint 'src/**/*.scss' '!**/_layout.scss' '!**/markdown.component.scss' --config .stylelintrc.json --syntax scss",
"preinstall": "rm -rf node_modules tmp deploy dist",
"postinstall": "npm rebuild node-sass && webdriver-manager update",
"test": "ng test --code-coverage --single-run --sourcemap=false",
"test": "ng test --code-coverage --source-map=false --watch=false",
"coverage:win": "start chrome ./coverage/index.html",
"coverage:mac": "open -a \"Google Chrome\" coverage/index.html",
"coveralls": "cat ./coverage/lcov.info | node ./node_modules/coveralls/bin/coveralls.js",
"serve": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng serve",
"serve:prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng serve --aot --prod --sourcemap=false --build-optimizer",
"build:docs": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --aot --prod --sourcemap=false --build-optimizer",
"serve:prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng serve --aot --prod --source-map=false --optimization",
"build:docs": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --aot --prod --source-map=false --optimization",
"build:lib": "bash scripts/build-release && gulp version-placeholder",
"build:universal": "bash scripts/build-universal",
"publish:npm": "npm run build:lib && bash scripts/npm-publish",
Expand Down Expand Up @@ -62,45 +62,47 @@
"ie 11"
],
"dependencies": {
"@angular/animations": "6.0.0-rc.5",
"@angular/cdk": "6.0.0-rc.5",
"@angular/common": "6.0.0-rc.5",
"@angular/compiler": "6.0.0-rc.5",
"@angular/core": "6.0.0-rc.5",
"@angular/forms": "6.0.0-rc.5",
"@angular/http": "6.0.0-rc.5",
"@angular/material": "6.0.0-rc.5",
"@angular/platform-browser": "6.0.0-rc.5",
"@angular/platform-browser-dynamic": "6.0.0-rc.5",
"@angular/platform-server": "6.0.0-rc.5",
"@angular/router": "6.0.0-rc.5",
"@angular/animations": "6.0.2",
"@angular/cdk": "6.0.2",
"@angular/common": "6.0.2",
"@angular/compiler": "6.0.2",
"@angular/core": "6.0.2",
"@angular/forms": "6.0.2",
"@angular/http": "6.0.2",
"@angular/material": "6.0.1",
"@angular/platform-browser": "6.0.2",
"@angular/platform-browser-dynamic": "6.0.2",
"@angular/platform-server": "6.0.2",
"@angular/router": "6.0.2",
"@covalent/code-editor": "^2.0.0-beta.1",
"@covalent/text-editor": "^1.0.0",
"@ngx-translate/core": "10.0.1",
"@ngx-translate/http-loader": "3.0.1",
"@swimlane/ngx-charts": "7.0.1",
"classlist.js": "^1.1.20150312",
"core-js": "^2.4.1",
"core-js": "^2.5.4",
"d3": "^4.4.0",
"hammerjs": "^2.0.8",
"highlight.js": "9.11.0",
"rxjs": "6.0.0-rc.0",
"rxjs-compat": "6.0.0-rc.0",
"rxjs": "6.0.0",
"rxjs-compat": "6.0.0",
"showdown": "1.6.4",
"tslib": "^1.9.0",
"web-animations-js": "2.3.1",
"zone.js": "^0.8.17"
"zone.js": "^0.8.24"
},
"devDependencies": {
"@angular/cli": "1.7.3",
"@angular/compiler-cli": "6.0.0-rc.5",
"@angular/cli": "6.0.1",
"@angular-devkit/build-angular": "~0.6.1",
"@angular/compiler-cli": "6.0.2",
"@types/fs-extra": "^4.0.0",
"@types/hammerjs": "^2.0.30",
"@types/jasmine": "2.5.38",
"@types/node": "~6.0.60",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"@types/selenium-webdriver": "^2.52.0",
"autoprefixer": "7.1.2",
"codelyzer": "~4.0.0",
"codelyzer": "~4.2.1",
"conventional-changelog-cli": "^1.3.5",
"coveralls": "^2.12.0",
"fs-extra": "^4.0.0",
Expand All @@ -111,23 +113,22 @@
"gulp-postcss": "7.0.0",
"gulp-sass": "3.1.0",
"gulp-sourcemaps": "1.6.0",
"jasmine-core": "~2.5.2",
"karma": "~1.4.1",
"karma-chrome-launcher": "~2.0.0",
"karma-cli": "~1.0.1",
"karma-coverage-istanbul-reporter": "^0.3.0",
"karma-firefox-launcher": "^1.0.1",
"karma-jasmine": "^1.1.0",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~1.4.2",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"karma-phantomjs-launcher": "1.0.1",
"karma-cli": "~1.0.1",
"ng-packagr": "2.4.2",
"node-sass": "3.8.0",
"node-sass": "4.9.0",
"pa11y": "^5.0.0-beta.5",
"protractor": "~5.1.0",
"protractor": "~5.3.0",
"require-dir": "0.3.2",
"semver": "5.2.0",
"stylelint": "^8.4.0",
"ts-node": "^3.0.4",
"ts-node": "~5.0.1",
"tsickle": "^0.26.0",
"tslint": "5.9.1",
"typescript": "~2.7.2",
Expand Down
Loading

0 comments on commit 1a91272

Please sign in to comment.