Skip to content

Commit

Permalink
v7.0.0 - upgraded to angular 7
Browse files Browse the repository at this point in the history
  • Loading branch information
zurfyx committed Mar 13, 2019
1 parent 9acacb5 commit 739045c
Show file tree
Hide file tree
Showing 11 changed files with 7,088 additions and 7,123 deletions.
57 changes: 0 additions & 57 deletions .angular-cli.json

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017-2018 Gerard Rovira Sánchez
Copyright (c) 2017-2019 Gerard Rovira Sánchez

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
141 changes: 141 additions & 0 deletions angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"angular-contents": {
"root": "",
"sourceRoot": "example",
"projectType": "application",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist",
"index": "example/index.html",
"main": "example/main.ts",
"tsConfig": "example/tsconfig.app.json",
"polyfills": "example/polyfills.ts",
"assets": [
"example/assets",
"example/favicon.ico"
],
"styles": [],
"scripts": []
},
"configurations": {
"prod": {
"fileReplacements": [
{
"replace": "example/config/environment.ts",
"with": "example/config/environment.prod.ts"
}
]
},
"production": {
"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": "angular-contents:build"
},
"configurations": {
"prod": {
"browserTarget": "angular-contents:build:prod"
},
"production": {
"browserTarget": "angular-contents:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "angular-contents:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "example/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "example/polyfills.ts",
"tsConfig": "example/tsconfig.spec.json",
"scripts": [],
"styles": [],
"assets": [
"example/assets",
"example/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"example/tsconfig.app.json",
"example/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**",
"./example/test.ts",
"./example/polyfills.ts"
]
}
}
}
},
"angular-contents-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "angular-contents:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"example/tsconfig.app.json",
"example/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**",
"./example/test.ts",
"./example/polyfills.ts"
]
}
}
}
}
},
"defaultProject": "angular-contents",
"schematics": {
"@schematics/angular:class": {
"spec": false
},
"@schematics/angular:component": {
"prefix": "app",
"styleext": "scss"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
}
45 changes: 0 additions & 45 deletions example/polyfills.ts
Original file line number Diff line number Diff line change
@@ -1,49 +1,4 @@
/**
* This file includes polyfills needed by Angular and is loaded before the app.
* You can add your own extra polyfills to this file.
*
* This file is divided into 2 sections:
* 1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
* 2. Application imports. Files imported after ZoneJS that should be loaded before your main
* file.
*
* The current setup is for so-called "evergreen" browsers; the last versions of browsers that
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
*
* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
*/

/***************************************************************************************************
* BROWSER POLYFILLS
*/

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
// import 'core-js/es6/symbol';
// import 'core-js/es6/object';
// import 'core-js/es6/function';
// import 'core-js/es6/parse-int';
// import 'core-js/es6/parse-float';
// import 'core-js/es6/number';
// import 'core-js/es6/math';
// import 'core-js/es6/string';
// import 'core-js/es6/date';
// import 'core-js/es6/array';
// import 'core-js/es6/regexp';
// import 'core-js/es6/map';
// import 'core-js/es6/weak-map';
// import 'core-js/es6/set';

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

/** IE10 and IE11 requires the following for the Reflect API. */
// import 'core-js/es6/reflect';


/** Evergreen browsers require these. **/
// Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
import 'core-js/es7/reflect';


/**
Expand Down
3 changes: 2 additions & 1 deletion example/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
]
},
"files": [
"test.ts"
"test.ts",
"polyfills.ts"
],
"include": [
"**/*.spec.ts",
Expand Down
15 changes: 7 additions & 8 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,29 @@
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/foo'),
dir: require('path').join(__dirname, 'coverage'), reports: ['html', 'lcovonly', 'text-summary'],
fixWebpackSourcePaths: true
},
angularCli: {
environment: 'dev'
},
reporters: ['progress', 'kjhtml'],
port: 9876,
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
singleRun: false
singleRun: false,
restartOnFileChange: true
});
};
Loading

0 comments on commit 739045c

Please sign in to comment.