Version of angular has been upgraged from 6 to 7

This commit is contained in:
Byung Jun Park 2018-11-24 01:40:26 +09:00
parent ed32131f2a
commit fffc8a82f2
20 changed files with 1754 additions and 1712 deletions

View File

@ -1,6 +1,6 @@
# ElectronApp
# OverflowScanner
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.1.0.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.0.6.
## Development server

View File

@ -39,12 +39,10 @@
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"fileReplacements": [{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
@ -53,15 +51,18 @@
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true
"buildOptimizer": true,
"budgets": [{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
}]
},
"hmr": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.hmr.ts"
}
]
"fileReplacements": [{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.hmr.ts"
}]
}
}
},
@ -121,6 +122,7 @@
"scanner-app-e2e": {
"root": "e2e/",
"projectType": "application",
"prefix": "",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
@ -146,8 +148,5 @@
}
}
},
"defaultProject": "scanner-app",
"cli": {
"defaultCollection": "@ngrx/schematics"
}
"defaultProject": "scanner-app"
}

View File

@ -9,6 +9,6 @@ describe('workspace-project App', () => {
it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to scanner-app!');
expect(page.getTitleText()).toEqual('Welcome to overflow-scanner!');
});
});

View File

@ -5,7 +5,7 @@ export class AppPage {
return browser.get('/');
}
getParagraphText() {
getTitleText() {
return element(by.css('app-root h1')).getText();
}
}

View File

@ -34,84 +34,84 @@
"dependencies": {
"electron-devtools-installer": "^2.2.4",
"electron-log": "^2.2.17",
"electron-window-state": "^5.0.1",
"electron-window-state": "^5.0.2",
"file-uri-to-path": "^1.0.0",
"file-url": "^2.0.2",
"fs-extra": "^7.0.0",
"rxjs": "^6.2.2",
"sqlite3": "^4.0.2"
"fs-extra": "^7.0.1",
"rxjs": "~6.3.3",
"sqlite3": "^4.0.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.7.0",
"@angular/animations": "^6.1.0",
"@angular/cli": "~6.1.0",
"@angular/common": "^6.1.0",
"@angular/compiler": "^6.1.0",
"@angular/compiler-cli": "^6.1.0",
"@angular/core": "^6.1.0",
"@angular/forms": "^6.1.0",
"@angular/http": "^6.1.0",
"@angular/language-service": "^6.1.0",
"@angular/platform-browser": "^6.1.0",
"@angular/platform-browser-dynamic": "^6.1.0",
"@angular/router": "^6.1.0",
"@angular-devkit/build-angular": "~0.10.0",
"@angular/animations": "~7.0.0",
"@angular/cli": "~7.0.6",
"@angular/common": "~7.0.0",
"@angular/compiler": "~7.0.0",
"@angular/compiler-cli": "~7.0.0",
"@angular/core": "~7.0.0",
"@angular/forms": "~7.0.0",
"@angular/http": "~7.0.0",
"@angular/language-service": "~7.0.0",
"@angular/platform-browser": "~7.0.0",
"@angular/platform-browser-dynamic": "~7.0.0",
"@angular/router": "~7.0.0",
"@angularclass/hmr": "^2.1.3",
"@loafer/angular-cli-webpack": "0.0.1",
"@ngrx/effects": "^6.1.0",
"@ngrx/router-store": "^6.1.0",
"@ngrx/schematics": "^6.1.0",
"@ngrx/store": "^6.1.0",
"@ngrx/store-devtools": "^6.1.0",
"@ngx-translate/core": "^10.0.2",
"@ngrx/effects": "^6.1.2",
"@ngrx/router-store": "^6.1.2",
"@ngrx/schematics": "^6.1.2",
"@ngrx/store": "^6.1.2",
"@ngrx/store-devtools": "^6.1.2",
"@ngx-translate/core": "^11.0.1",
"@overflow/core-js": "0.0.11",
"@overflow/rpc-js": "0.0.10",
"@types/d3": "^5.0.0",
"@types/d3": "^5.0.1",
"@types/fs-extra": "^5.0.4",
"@types/jasmine": "~2.8.6",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^8.10.4",
"@types/node": "~8.9.4",
"@types/source-map-support": "^0.4.1",
"@types/sqlite3": "^3.1.3",
"awesome-typescript-loader": "^5.2.0",
"codelyzer": "~4.2.1",
"copy-webpack-plugin": "^4.5.2",
"awesome-typescript-loader": "^5.2.1",
"codelyzer": "~4.5.0",
"copy-webpack-plugin": "^4.6.0",
"core-js": "^2.5.4",
"cpx": "^1.5.0",
"cross-env": "^5.2.0",
"d3": "^5.7.0",
"devtron": "^1.4.0",
"dexie": "^2.0.4",
"electron": "^2.0.9",
"electron-builder": "^20.28.4",
"electron": "^3.0.10",
"electron-builder": "^20.36.2",
"electron-connect": "^0.6.3",
"electron-connect-webpack-plugin": "^0.1.1",
"electron-debug": "^2.0.0",
"electron-updater": "^3.1.2",
"electron-updater": "^4.0.4",
"hammerjs": "^2.0.8",
"ip-cidr": "^2.0.0",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~1.7.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.0",
"karma-jasmine": "~1.1.1",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"ngrx-store-freeze": "^0.2.4",
"ngx-perfect-scrollbar": "^6.3.1",
"ngx-perfect-scrollbar": "^7.1.0",
"npm-run-all": "^4.1.3",
"primeicons": "^1.0.0-beta.10",
"primeng": "^6.1.3",
"primer-support": "^4.0.0",
"protractor": "~5.3.0",
"primeicons": "^1.0.0",
"primeng": "^6.1.7",
"primer-support": "^4.7.0",
"protractor": "~5.4.0",
"rimraf": "^2.6.2",
"save-svg-as-png": "^1.4.6",
"source-map-support": "^0.5.8",
"ts-node": "~5.0.1",
"tslint": "~5.9.1",
"typescript": "~2.7.2",
"vis": "^4.21.0",
"wait-on": "^2.1.0",
"webpack-cli": "^3.1.0",
"source-map-support": "^0.5.9",
"ts-node": "~7.0.0",
"tslint": "~5.11.0",
"typescript": "~3.1.6",
"wait-on": "^3.2.0",
"webpack-cli": "^3.1.2",
"webpack-node-externals": "^1.7.2",
"zone.js": "^0.8.26"
"zone.js": "~0.8.26"
}
}

View File

@ -1,9 +1,9 @@
.ui-dialog-titlebar-svg{
div {
display: inline-block;
margin-right: 5px;
svg {
margin-bottom: -2px;
div {
display: inline-block;
margin-right: 5px;
svg {
margin-bottom: -2px;
}
}
}
}

View File

@ -1,6 +1,7 @@
import { TestBed, async } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
@ -12,20 +13,23 @@ describe('AppComponent', () => {
],
}).compileComponents();
}));
it('should create the app', async(() => {
it('should create the app', () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app).toBeTruthy();
}));
it(`should have as title 'scanner-app'`, async(() => {
});
it(`should have as title 'overflow-scanner'`, () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.debugElement.componentInstance;
expect(app.title).toEqual('scanner-app');
}));
it('should render title in a h1 tag', async(() => {
expect(app.title).toEqual('overflow-scanner');
});
it('should render title in a h1 tag', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('Welcome to scanner-app!');
}));
expect(compiled.querySelector('h1').textContent).toContain('Welcome to overflow-scanner!');
});
});

View File

@ -1,9 +1,11 @@
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
# For additional information regarding the format and rule options, please see:
# https://github.com/browserslist/browserslist#queries
# For IE 9-11 support, please uncomment the last line of the file and adjust as needed
#
# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
> 0.5%
last 2 versions
Firefox ESR
not dead
# IE 9-11
not IE 9-11

View File

@ -1,16 +1,17 @@
// This file can be replaced during build by using the `fileReplacements` array.
// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
export const environment = {
production: false,
hmr: false
hmr: true
};
/*
* In development mode, to ignore zone related error stack frames such as
* `zone.run`, `zoneDelegate.invokeTask` for easier debugging, you can
* import the following file, but please comment it out in production mode
* because it will have performance impact when throw error
* For easier debugging in development mode, you can import the following file
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
*
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

2
src/globals.d.ts vendored
View File

@ -58,7 +58,7 @@ declare const __PROCESS_KIND__:
*
* See https://developer.mozilla.org/en-US/docs/Web/API/DOMHighResTimeStamp
*/
declare type DOMHighResTimeStamp = number
// declare type DOMHighResTimeStamp = number
/**
* The IdleDeadline interface is used as the data type of the input parameter to

View File

@ -1,17 +1,14 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>overFlow-Network Scanner</title>
<title>OverflowScanner</title>
<base href="./">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
</head>
<body class="platform-darwin theme-light">
<app-root></app-root>
</body>
</html>

View File

@ -1,10 +1,9 @@
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import * as Path from 'path';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
import 'hammerjs';
import { hmrBootstrap } from './hmr';
@ -13,7 +12,7 @@ if (environment.production) {
}
// platformBrowserDynamic().bootstrapModule(AppModule)
// .catch(err => console.log(err));
// .catch(err => console.error(err));
const bootstrap = () => platformBrowserDynamic().bootstrapModule(AppModule);

View File

@ -11,7 +11,7 @@
* 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
* Learn more in https://angular.io/guide/browser-support
*/
/***************************************************************************************************
@ -34,18 +34,19 @@
// import 'core-js/es6/weak-map';
// import 'core-js/es6/set';
/**
* If the application will be indexed by Google Search, the following is required.
* Googlebot uses a renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
**/
// import 'core-js/es6/array';
/** 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';
/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
@ -74,7 +75,6 @@ import 'core-js/es7/reflect';
import 'zone.js/dist/zone'; // Included with Angular CLI.
/***************************************************************************************************
* APPLICATION IMPORTS
*/

View File

@ -1,4 +1,3 @@
/* You can add global styles to this file, and also import other style files */
@import './assets/scss/themes/light/theme';
@import './assets/scss/styles/app';

View File

@ -1,10 +1,11 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app"
"outDir": "../out-tsc/app",
"types": []
},
"exclude": [
"src/test.ts",
"test.ts",
"**/*.spec.ts"
]
}

View File

@ -1,17 +1,17 @@
{
"extends": "../tslint.json",
"rules": {
"directive-selector": [
true,
"attribute",
"app",
"camelCase"
],
"component-selector": [
true,
"element",
"app",
"kebab-case"
]
}
"extends": "../tslint.json",
"rules": {
"directive-selector": [
true,
"attribute",
"app",
"camelCase"
],
"component-selector": [
true,
"element",
"app",
"kebab-case"
]
}
}

View File

@ -20,6 +20,7 @@
"lib": [
"es2015",
"es2017",
"es2018",
"dom"
]
}

View File

@ -46,7 +46,7 @@
"no-arg": true,
"no-bitwise": true,
"no-console": [
false,
true,
"debug",
"info",
"time",
@ -57,7 +57,7 @@
"no-debugger": true,
"no-duplicate-super": true,
"no-empty": false,
"no-empty-interface": false,
"no-empty-interface": true,
"no-eval": true,
"no-inferrable-types": [
true,
@ -65,6 +65,7 @@
],
"no-misused-new": true,
"no-non-null-assertion": true,
"no-redundant-jsdoc": true,
"no-shadowed-variable": true,
"no-string-literal": false,
"no-string-throw": true,

3194
yarn.lock

File diff suppressed because it is too large Load Diff