Skip to content

Commit e7fac6e

Browse files
committed
ref/ upgrade angular to 6.0.3
1 parent a7e33b6 commit e7fac6e

File tree

2 files changed

+25
-17
lines changed

2 files changed

+25
-17
lines changed

Diff for: README.md

+15-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Bootstrap and package your project with Angular 6(+) and Electron (Typescript +
1515

1616
Currently runs with:
1717

18-
- Angular v6.0.2
18+
- Angular v6.0.3
1919
- Angular-CLI v6.0.3
2020
- Electron v2.0.1
2121
- Electron Builder v20.13.4
@@ -60,12 +60,6 @@ The application code is managed by `main.ts`. In this sample, the app runs with
6060
The Angular component contains an example of Electron and NodeJS native lib import.
6161
You can desactivate "Developer Tools" by commenting `win.webContents.openDevTools();` in `main.ts`.
6262

63-
## Manage your environment variables
64-
65-
- Using local variables : `npm start` or `cross-env ENV=local npm start`
66-
- Using development variables : `cross-env ENV=dev npm start`
67-
- Using production variables : `cross-env ENV=prod npm start`
68-
6963
## Included Commands
7064

7165
|Command|Description|
@@ -85,6 +79,20 @@ You can desactivate "Developer Tools" by commenting `win.webContents.openDevTool
8579
Maybe you want to execute the application in the browser (WITHOUT HOT RELOAD ACTUALLY...) ? You can do it with `npm run ng:serve`.
8680
Note that you can't use Electron or NodeJS native libraries in this case. Please check `providers/electron.service.ts` to watch how conditional import of electron/Native libraries is done.
8781

82+
## Error with nodejs third party packages
83+
84+
However since Angular 6 does not provide an eject anymore, you can't configure your webpack config file to import node externals.
85+
86+
An issue in [Angular repository](https://github.com/angular/angular-cli/issues/10681) is opened about this feature.
87+
88+
Please have a look at [Stack Overflow Post workaround](https://stackoverflow.com/questions/50234196/after-updating-from-angular-5-to-6-i-keep-getting-the-error-cant-resolve-timer) or use branch [angular5](https://github.com/maximegris/angular-electron/tree/angular5) and continue to eject your configuration file.
89+
90+
## Branch & Packages version
91+
92+
- Angular 4 & Electron 1 : Branch [angular4](https://github.com/maximegris/angular-electron/tree/angular4)
93+
- Angular 5 & Electron 1 : Branch [angular5](https://github.com/maximegris/angular-electron/tree/angular5)
94+
- Angular 6 & Electron 2 : (master)
95+
8896
[build-badge]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master
8997
[build]: https://travis-ci.org/maximegris/angular-electron.svg?branch=master
9098
[dependencyci-badge]: https://dependencyci.com/github/maximegris/angular-electron/badge

Diff for: package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@
3737
"devDependencies": {
3838
"@angular-devkit/build-angular": "0.6.3",
3939
"@angular/cli": "6.0.3",
40-
"@angular/common": "6.0.2",
41-
"@angular/compiler": "6.0.2",
42-
"@angular/compiler-cli": "6.0.2",
43-
"@angular/core": "6.0.2",
44-
"@angular/forms": "6.0.2",
45-
"@angular/http": "6.0.2",
46-
"@angular/language-service": "6.0.2",
47-
"@angular/platform-browser": "6.0.2",
48-
"@angular/platform-browser-dynamic": "6.0.2",
49-
"@angular/router": "6.0.2",
40+
"@angular/common": "6.0.3",
41+
"@angular/compiler": "6.0.3",
42+
"@angular/compiler-cli": "6.0.3",
43+
"@angular/core": "6.0.3",
44+
"@angular/forms": "6.0.3",
45+
"@angular/http": "6.0.3",
46+
"@angular/language-service": "6.0.3",
47+
"@angular/platform-browser": "6.0.3",
48+
"@angular/platform-browser-dynamic": "6.0.3",
49+
"@angular/router": "6.0.3",
5050
"@ngx-translate/core": "10.0.1",
5151
"@ngx-translate/http-loader": "3.0.1",
5252
"@types/jasmine": "2.8.7",

0 commit comments

Comments
 (0)