Skip to content

Commit

Permalink
Upgrade Angular (6.1.2) deps
Browse files Browse the repository at this point in the history
  • Loading branch information
maximegris committed Aug 19, 2018
1 parent 1adad4a commit d8818c1
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 23 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
/app-builds
/release
main.js
src/**/*.js
*.js.map

# dependencies
/node_modules
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Bootstrap and package your project with Angular 6(+) and Electron (Typescript +

Currently runs with:

- Angular v6.0.5
- Electron v2.0.3
- Electron Builder v20.13.4
- Angular v6.1.2
- Electron v2.0.7
- Electron Builder v20.28.1

With this sample, you can :

Expand Down
9 changes: 6 additions & 3 deletions main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import { app, BrowserWindow, screen } from 'electron';
import * as path from 'path';
import * as url from 'url';

import {interval} from 'rxjs';
import { of } from 'rxjs';
import { timeout } from 'rxjs/operators';

let win, serve;
const args = process.argv.slice(1);
Expand All @@ -23,7 +24,8 @@ function createWindow() {

if (serve) {
require('electron-reload')(__dirname, {
electron: require(`${__dirname}/node_modules/electron`)});
electron: require(`${__dirname}/node_modules/electron`)
});
win.loadURL('http://localhost:4200');
} else {
win.loadURL(url.format({
Expand All @@ -43,7 +45,8 @@ function createWindow() {
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 {
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,26 +40,26 @@
"dependencies": {},
"devDependencies": {
"@angular-devkit/build-angular": "0.6.3",
"@angular/cli": "6.0.5",
"@angular/common": "6.0.5",
"@angular/compiler": "6.0.5",
"@angular/compiler-cli": "6.0.5",
"@angular/core": "6.0.5",
"@angular/forms": "6.0.5",
"@angular/http": "6.0.5",
"@angular/language-service": "6.0.5",
"@angular/platform-browser": "6.0.5",
"@angular/platform-browser-dynamic": "6.0.5",
"@angular/router": "6.0.5",
"@angular/cli": "6.1.2",
"@angular/common": "6.1.2",
"@angular/compiler": "6.1.2",
"@angular/compiler-cli": "6.1.2",
"@angular/core": "6.1.2",
"@angular/forms": "6.1.2",
"@angular/http": "6.1.2",
"@angular/language-service": "6.1.2",
"@angular/platform-browser": "6.1.2",
"@angular/platform-browser-dynamic": "6.1.2",
"@angular/router": "6.1.2",
"@ngx-translate/core": "10.0.1",
"@ngx-translate/http-loader": "3.0.1",
"@types/jasmine": "2.8.7",
"@types/jasminewd2": "2.0.3",
"@types/node": "8.9.4",
"codelyzer": "4.2.1",
"core-js": "2.5.6",
"electron": "2.0.3",
"electron-builder": "20.14.7",
"electron": "2.0.7",
"electron-builder": "20.28.1",
"electron-reload": "1.2.2",
"jasmine-core": "3.1.0",
"jasmine-spec-reporter": "4.2.1",
Expand All @@ -71,7 +71,7 @@
"npm-run-all": "4.1.3",
"npx": "10.2.0",
"protractor": "5.3.2",
"rxjs": "6.1.0",
"rxjs": "6.2.2",
"ts-node": "6.0.3",
"tslint": "5.10.0",
"typescript": "2.7.2",
Expand Down
4 changes: 1 addition & 3 deletions tsconfig-serve.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
]
},
"include": [
"main.ts",
"src/**/*",
"e2e/**/*"
"main.ts"
],
"exclude": [
"node_modules",
Expand Down

0 comments on commit d8818c1

Please sign in to comment.