Upgrade Angular (6.1.2) deps

This commit is contained in:
Maxime GRIS
2018-08-19 15:06:09 +02:00
parent 1adad4a6ab
commit d8818c18c0
5 changed files with 26 additions and 23 deletions

2
.gitignore vendored
View File

@@ -7,6 +7,8 @@
/app-builds /app-builds
/release /release
main.js main.js
src/**/*.js
*.js.map
# dependencies # dependencies
/node_modules /node_modules

View File

@@ -15,9 +15,9 @@ Bootstrap and package your project with Angular 6(+) and Electron (Typescript +
Currently runs with: Currently runs with:
- Angular v6.0.5 - Angular v6.1.2
- Electron v2.0.3 - Electron v2.0.7
- Electron Builder v20.13.4 - Electron Builder v20.28.1
With this sample, you can : With this sample, you can :

View File

@@ -2,7 +2,8 @@ import { app, BrowserWindow, screen } from 'electron';
import * as path from 'path'; import * as path from 'path';
import * as url from 'url'; import * as url from 'url';
import {interval} from 'rxjs'; import { of } from 'rxjs';
import { timeout } from 'rxjs/operators';
let win, serve; let win, serve;
const args = process.argv.slice(1); const args = process.argv.slice(1);
@@ -23,7 +24,8 @@ function createWindow() {
if (serve) { if (serve) {
require('electron-reload')(__dirname, { require('electron-reload')(__dirname, {
electron: require(`${__dirname}/node_modules/electron`)}); electron: require(`${__dirname}/node_modules/electron`)
});
win.loadURL('http://localhost:4200'); win.loadURL('http://localhost:4200');
} else { } else {
win.loadURL(url.format({ win.loadURL(url.format({
@@ -43,7 +45,8 @@ function createWindow() {
win = null; win = null;
}); });
interval(1000).subscribe(val => console.log(`ES5 works fine : @${val}s`)); of(2000).pipe(timeout(1000))
.subscribe(val => console.log(`ES5 works fine : @${val}`));
} }
try { try {

View File

@@ -40,17 +40,17 @@
"dependencies": {}, "dependencies": {},
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "0.6.3", "@angular-devkit/build-angular": "0.6.3",
"@angular/cli": "6.0.5", "@angular/cli": "6.1.2",
"@angular/common": "6.0.5", "@angular/common": "6.1.2",
"@angular/compiler": "6.0.5", "@angular/compiler": "6.1.2",
"@angular/compiler-cli": "6.0.5", "@angular/compiler-cli": "6.1.2",
"@angular/core": "6.0.5", "@angular/core": "6.1.2",
"@angular/forms": "6.0.5", "@angular/forms": "6.1.2",
"@angular/http": "6.0.5", "@angular/http": "6.1.2",
"@angular/language-service": "6.0.5", "@angular/language-service": "6.1.2",
"@angular/platform-browser": "6.0.5", "@angular/platform-browser": "6.1.2",
"@angular/platform-browser-dynamic": "6.0.5", "@angular/platform-browser-dynamic": "6.1.2",
"@angular/router": "6.0.5", "@angular/router": "6.1.2",
"@ngx-translate/core": "10.0.1", "@ngx-translate/core": "10.0.1",
"@ngx-translate/http-loader": "3.0.1", "@ngx-translate/http-loader": "3.0.1",
"@types/jasmine": "2.8.7", "@types/jasmine": "2.8.7",
@@ -58,8 +58,8 @@
"@types/node": "8.9.4", "@types/node": "8.9.4",
"codelyzer": "4.2.1", "codelyzer": "4.2.1",
"core-js": "2.5.6", "core-js": "2.5.6",
"electron": "2.0.3", "electron": "2.0.7",
"electron-builder": "20.14.7", "electron-builder": "20.28.1",
"electron-reload": "1.2.2", "electron-reload": "1.2.2",
"jasmine-core": "3.1.0", "jasmine-core": "3.1.0",
"jasmine-spec-reporter": "4.2.1", "jasmine-spec-reporter": "4.2.1",
@@ -71,7 +71,7 @@
"npm-run-all": "4.1.3", "npm-run-all": "4.1.3",
"npx": "10.2.0", "npx": "10.2.0",
"protractor": "5.3.2", "protractor": "5.3.2",
"rxjs": "6.1.0", "rxjs": "6.2.2",
"ts-node": "6.0.3", "ts-node": "6.0.3",
"tslint": "5.10.0", "tslint": "5.10.0",
"typescript": "2.7.2", "typescript": "2.7.2",

View File

@@ -17,9 +17,7 @@
] ]
}, },
"include": [ "include": [
"main.ts", "main.ts"
"src/**/*",
"e2e/**/*"
], ],
"exclude": [ "exclude": [
"node_modules", "node_modules",