Skip to content

Commit

Permalink
feat(angular): ng v6 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
mhartington authored and imhoffd committed Apr 9, 2018
1 parent 0ffee6f commit 3b36d2a
Show file tree
Hide file tree
Showing 8 changed files with 169 additions and 93 deletions.
65 changes: 0 additions & 65 deletions angular/base/.angular-cli.json

This file was deleted.

134 changes: 134 additions & 0 deletions angular/base/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,
"projects": {
"app": {
"root": "",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"progress": false,
"outputPath": "www",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.app.json",
"assets": [
{
"glob": "**/*",
"input": "src/assets",
"output": "assets"
},
{
"glob": "**/*",
"input": "node_modules/@ionic/angular/dist/ionic",
"output": "./ionic"
}
],
"styles": [
{
"input": "src/theme/variables.scss"
},
{
"input": "src/global.scss"
}
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"src": "src/environments/environment.ts",
"replaceWith": "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": "app:build"
},
"configurations": {
"production": {
"browserTarget": "app:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "app: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.css"
}
],
"scripts": [],
"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/**"]
}
}
}
},
"app-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "app:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": ["**/node_modules/**"]
}
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter');
exports.config = {
allScriptsTimeout: 11000,
specs: [
'./e2e/**/*.e2e-spec.ts'
'./src/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
Expand Down
49 changes: 27 additions & 22 deletions angular/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,36 +13,41 @@
},
"private": true,
"dependencies": {
"@angular/common": "5.2.9",
"@angular/core": "5.2.9",
"@angular/forms": "5.2.9",
"@angular/http": "5.2.9",
"@angular/platform-browser": "5.2.9",
"@angular/platform-browser-dynamic": "5.2.9",
"@angular/router": "5.2.9",
"@ionic/angular": "0.2.1",
"@angular/common": "6.0.0-rc.2",
"@angular/core": "6.0.0-rc.2",
"@angular/forms": "6.0.0-rc.2",
"@angular/http": "6.0.0-rc.2",
"@angular/platform-browser": "6.0.0-rc.2",
"@angular/platform-browser-dynamic": "6.0.0-rc.2",
"@angular/router": "6.0.0-rc.2",
"@ionic/angular": "4.0.0-alpha.1",
"@ionic/schematics-angular": "latest",
"core-js": "^2.5.3",
"rxjs": "^5.5.8",
"rxjs": "6.0.0-beta.4",
"rxjs-compat": "6.0.0-beta.4",
"zone.js": "^0.8.25"
},
"devDependencies": {
"@angular/cli": "1.7.3",
"@angular/compiler": "5.2.9",
"@angular/compiler-cli": "5.2.9",
"@angular-devkit/core": "0.3.2",
"@angular-devkit/schematics": "0.3.2",
"@types/jasmine": "2.8.6",
"codelyzer": "^4.0.1",
"jasmine-core": "~2.8.0",
"@angular/cli": "^6.0.0-rc.1",
"@angular/compiler": "^6.0.0-rc.2",
"@angular/compiler-cli": "^6.0.0-rc.2",
"@angular/language-service": "6.0.0-rc.2",
"@angular-devkit/build-angular": "~0.5.0",
"@angular-devkit/core": "0.5.1",
"@angular-devkit/schematics": "0.5.1",
"@types/jasmine": "~2.8.6",
"@types/jasminewd2": "~2.0.3",
"@types/node": "~8.9.4",
"codelyzer": "~4.2.1",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~2.0.0",
"karma": "~1.7.1",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "^1.2.1",
"karma-jasmine": "~1.1.0",
"karma-coverage-istanbul-reporter": "~1.4.2",
"karma-jasmine": "~1.1.1",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.1.2",
"ts-node": "~4.1.0",
"protractor": "~5.3.0",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2"
}
Expand Down
11 changes: 6 additions & 5 deletions angular/base/karma.conf.js → angular/base/src/karma.conf.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
// Karma configuration file, see link for more information
// https://karma-runner.github.io/2.0/config/configuration-file.html
// https://karma-runner.github.io/1.0/config/configuration-file.html

module.exports = function (config) {
config.set({
basePath: '',
frameworks: ['jasmine', '@angular/cli'],
frameworks: ['jasmine', '@angular-devkit/build-angular'],
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
require('@angular/cli/plugins/karma')
require('@angular-devkit/build-angular/plugins/karma')
],
client:{
client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter: {
reports: [ 'html', 'lcovonly' ],
dir: require('path').join(__dirname, 'coverage'),
reports: ['html', 'lcovonly'],
fixWebpackSourcePaths: true
},
angularCli: {
Expand Down
1 change: 1 addition & 0 deletions angular/base/src/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"test.ts"
],
"include": [
"polyfills.ts",
"**/*.spec.ts",
"**/*.d.ts"
]
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 3b36d2a

Please sign in to comment.