Skip to content

Commit 16f5b25

Browse files
maximegrismaximegris
authored
Merge pull request #182 from leo6104/ngv6
Update to NodeJS 8, Angular 6, electron 2.0.2, RxJS 6.1
2 parents 70b359f + beea806 commit 16f5b25

26 files changed

+236
-434
lines changed

‎.angular-cli.json

-63
This file was deleted.

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ package-lock.json
3838

3939
# e2e
4040
/e2e/*.js
41+
!/e2e/protractor.conf.js
4142
/e2e/*.map
4243

4344
# System Files

‎.travis.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
language: node_js
22
node_js:
3-
- "7"
4-
- "6"
3+
- 8
4+
sudo: required
5+
addons:
6+
chrome: stable
7+
before_script:
8+
- export DISPLAY=:99.0
9+
- sh -e /etc/init.d/xvfb start
510
install:
11+
- npm set progress=false
612
- npm install
713
script:
14+
- ng lint
15+
- npm run test
16+
- npm run e2e
817
- npm run build

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2017 - Maxime GRIS
1+
Copyright 2018 - Maxime GRIS
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
44

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111

1212
# Introduction
1313

14-
Bootstrap and package your project with Angular 5(+) and Electron (Typescript + SASS + Hot Reload) for creating Desktop applications.
14+
Bootstrap and package your project with Angular 6(+) and Electron (Typescript + SASS + Hot Reload) for creating Desktop applications.
1515

1616
Currently runs with:
1717

18-
- Angular v5.2.5
19-
- Angular-CLI v1.6.4
20-
- Electron v1.8.2
21-
- Electron Builder v20.0.4
18+
- Angular v6.0.2
19+
- Angular-CLI v6.0.3
20+
- Electron v2.0.1
21+
- Electron Builder v20.13.4
2222

2323
With this sample, you can :
2424

‎angular.json

+159
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"angular-electron": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"architect": {
11+
"build": {
12+
"builder": "@angular-devkit/build-angular:browser",
13+
"options": {
14+
"outputPath": "dist",
15+
"index": "src/index.html",
16+
"main": "src/main.ts",
17+
"tsConfig": "src/tsconfig.app.json",
18+
"polyfills": "src/polyfills.ts",
19+
"assets": [
20+
"src/assets",
21+
"src/favicon.ico",
22+
"src/favicon.png",
23+
"src/favicon.icns",
24+
"src/favicon.256x256.png",
25+
"src/favicon.512x512.png"
26+
],
27+
"styles": [
28+
"src/styles.scss"
29+
],
30+
"scripts": []
31+
},
32+
"configurations": {
33+
"dev": {
34+
"optimization": false,
35+
"outputHashing": "all",
36+
"sourceMap": true,
37+
"extractCss": true,
38+
"namedChunks": false,
39+
"aot": false,
40+
"extractLicenses": true,
41+
"vendorChunk": false,
42+
"buildOptimizer": false,
43+
"fileReplacements": [
44+
{
45+
"replace": "src/environments/environment.ts",
46+
"with": "src/environments/environment.dev.ts"
47+
}
48+
]
49+
},
50+
"production": {
51+
"optimization": true,
52+
"outputHashing": "all",
53+
"sourceMap": false,
54+
"extractCss": true,
55+
"namedChunks": false,
56+
"aot": true,
57+
"extractLicenses": true,
58+
"vendorChunk": false,
59+
"buildOptimizer": true,
60+
"fileReplacements": [
61+
{
62+
"replace": "src/environments/environment.ts",
63+
"with": "src/environments/environment.prod.ts"
64+
}
65+
]
66+
}
67+
}
68+
},
69+
"serve": {
70+
"builder": "@angular-devkit/build-angular:dev-server",
71+
"options": {
72+
"browserTarget": "angular-electron:build"
73+
},
74+
"configurations": {
75+
"dev": {
76+
"browserTarget": "angular-electron:build:dev"
77+
},
78+
"production": {
79+
"browserTarget": "angular-electron:build:production"
80+
}
81+
}
82+
},
83+
"extract-i18n": {
84+
"builder": "@angular-devkit/build-angular:extract-i18n",
85+
"options": {
86+
"browserTarget": "angular-electron:build"
87+
}
88+
},
89+
"test": {
90+
"builder": "@angular-devkit/build-angular:karma",
91+
"options": {
92+
"main": "src/test.ts",
93+
"polyfills": "src/polyfills-test.ts",
94+
"tsConfig": "src/tsconfig.spec.json",
95+
"karmaConfig": "src/karma.conf.js",
96+
"scripts": [],
97+
"styles": [
98+
"src/styles.scss"
99+
],
100+
"assets": [
101+
"src/assets",
102+
"src/favicon.ico",
103+
"src/favicon.png",
104+
"src/favicon.icns",
105+
"src/favicon.256x256.png",
106+
"src/favicon.512x512.png"
107+
]
108+
}
109+
},
110+
"lint": {
111+
"builder": "@angular-devkit/build-angular:tslint",
112+
"options": {
113+
"tsConfig": [
114+
"src/tsconfig.app.json",
115+
"src/tsconfig.spec.json"
116+
],
117+
"exclude": [
118+
"**/node_modules/**"
119+
]
120+
}
121+
}
122+
}
123+
},
124+
"angular-electron-e2e": {
125+
"root": "e2e",
126+
"projectType": "application",
127+
"architect": {
128+
"e2e": {
129+
"builder": "@angular-devkit/build-angular:protractor",
130+
"options": {
131+
"protractorConfig": "e2e/protractor.conf.js",
132+
"devServerTarget": "angular-electron:serve"
133+
}
134+
},
135+
"lint": {
136+
"builder": "@angular-devkit/build-angular:tslint",
137+
"options": {
138+
"tsConfig": [
139+
"e2e/tsconfig.e2e.json"
140+
],
141+
"exclude": [
142+
"**/node_modules/**"
143+
]
144+
}
145+
}
146+
}
147+
}
148+
},
149+
"defaultProject": "angular-electron",
150+
"schematics": {
151+
"@schematics/angular:component": {
152+
"prefix": "app",
153+
"styleext": "scss"
154+
},
155+
"@schematics/angular:directive": {
156+
"prefix": "app"
157+
}
158+
}
159+
}

‎protractor.conf.js renamed to ‎e2e/protractor.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exports.config = {
77
allScriptsTimeout: 25000,
88
delayBrowserTimeInSeconds: 0,
99
specs: [
10-
'./e2e/**/*.e2e-spec.ts'
10+
'./**/*.e2e-spec.ts'
1111
],
1212
capabilities: {
1313
'browserName': 'chrome',

0 commit comments

Comments
 (0)