Skip to content

Commit 95d3682

Browse files
https://github.com/vladotesanovic/angular2-express-starter/issues/88
angular, cli, ngrx update
1 parent 18218e8 commit 95d3682

28 files changed

+10596
-161
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<img width="150" src="https://i.cloudup.com/zfY6lL7eFa-3000x3000.png" />
22
<img width="50" src="https://angular.io/assets/images/logos/angular/angular.svg" />
33

4-
## Angular2+ Express Starter ( Advanced )
4+
## Angular4+ Express Starter ( Advanced )
55

6-
- Angular 2+ ( 4.x )
6+
- Angular 5+
77
- ExpressJS ( 4.x - with compression )
88
- Webpack ( angular-cli )
99

e2e/app.e2e-spec.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import { TmpPage } from './app.po';
1+
import { AppPage } from './app.po';
22

3-
describe('tmp App', function() {
4-
let page: TmpPage;
3+
describe('Angular2-express-starter App', () => {
4+
let page: AppPage;
55

66
beforeEach(() => {
7-
page = new TmpPage();
7+
page = new AppPage();
88
});
99

10-
it('should display message saying app works', () => {
10+
it('should display title Weather module', () => {
1111
page.navigateTo();
12-
expect(page.getParagraphText()).toEqual('app works!');
12+
expect(page.getParagraphText()).toEqual('Weather module');
1313
});
1414
});

e2e/app.po.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { browser, element, by } from 'protractor';
22

3-
export class TmpPage {
3+
export class AppPage {
44
navigateTo() {
55
return browser.get('/');
66
}
77

88
getParagraphText() {
9-
return element(by.css('app-root h1')).getText();
9+
return element(by.css('heading')).getText();
1010
}
1111
}

e2e/tsconfig.e2e.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "../out-tsc/e2e",
5+
"baseUrl": "./",
6+
"module": "commonjs",
7+
"target": "es5",
8+
"types": [
9+
"jasmine",
10+
"jasminewd2",
11+
"node"
12+
]
13+
}
14+
}

karma.conf.js

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Karma configuration file, see link for more information
2-
// https://karma-runner.github.io/0.13/config/configuration-file.html
2+
// https://karma-runner.github.io/1.0/config/configuration-file.html
33

44
module.exports = function (config) {
55
config.set({
@@ -15,25 +15,14 @@ module.exports = function (config) {
1515
client:{
1616
clearContext: false // leave Jasmine Spec Runner output visible in browser
1717
},
18-
files: [
19-
{ pattern: './src/test.ts', watched: false }
20-
],
21-
preprocessors: {
22-
'./src/test.ts': ['@angular/cli']
23-
},
24-
mime: {
25-
'text/x-typescript': ['ts','tsx']
26-
},
2718
coverageIstanbulReporter: {
2819
reports: [ 'html', 'lcovonly' ],
2920
fixWebpackSourcePaths: true
3021
},
3122
angularCli: {
3223
environment: 'dev'
3324
},
34-
reporters: config.angularCli && config.angularCli.codeCoverage
35-
? ['progress', 'coverage-istanbul']
36-
: ['progress', 'kjhtml'],
25+
reporters: ['progress', 'kjhtml'],
3726
port: 9876,
3827
colors: true,
3928
logLevel: config.LOG_INFO,

nodemon.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22
"verbose": false,
33
"ignore": [
44
".git",
5-
"node_modules/**/node_modules"
5+
"node_modules/**/node_modules",
6+
"server/**/*.spec.ts"
67
],
7-
"execMap": {
8-
"js": "node"
9-
},
108
"watch": [
11-
"dist/server"
9+
"server/**/*.ts"
1210
],
1311
"env": {
1412
"NODE_ENV": "development"
1513
},
16-
"ext": "js json"
14+
"ext": "ts",
15+
"exec": "ts-node ./server/bin/www.ts"
1716
}

0 commit comments

Comments
 (0)