Skip to content

Commit d0c0e7d

Browse files
MarkPieszakMarkPieszak
committed
fix(ng2-bootstrap): library updates & bootstrap4 added
closes TrilonIO#33 Updated launch.son to reflect .netcore 1.1 (in Bin) Updated misc dependencies
1 parent a808990 commit d0c0e7d

File tree

5 files changed

+42
-47
lines changed

5 files changed

+42
-47
lines changed

‎.vscode/launch.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"type": "coreclr",
77
"request": "launch",
88
"preLaunchTask": "build",
9-
"program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/aspnetcore-angular2-universal.dll",
9+
"program": "${workspaceRoot}/bin/Debug/netcoreapp1.1/aspnetcore-angular2-universal.dll",
1010
"args": [],
1111
"cwd": "${workspaceRoot}",
1212
"stopAtEntry": false,
@@ -37,7 +37,7 @@
3737
"type": "coreclr",
3838
"request": "launch",
3939
"preLaunchTask": "build",
40-
"program": "${workspaceRoot}/bin/Debug/netcoreapp1.0/aspnetcore-angular2-universal.dll",
40+
"program": "${workspaceRoot}/bin/Debug/netcoreapp1.1/aspnetcore-angular2-universal.dll",
4141
"args": [],
4242
"cwd": "${workspaceRoot}",
4343
"stopAtEntry": false,

‎Client/app/platform-modules/app.common.module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { RouterModule } from '@angular/router';
1313
import { Store, StoreModule } from '@ngrx/store';
1414
import { EffectsModule } from '@ngrx/effects';
1515

16-
import { Ng2BootstrapModule } from 'ng2-bootstrap/ng2-bootstrap';
16+
import { Ng2BootstrapModule } from 'ng2-bootstrap';
1717

1818
// Main "APP" Root Component
1919
import { BaseSharedModule, AppComponent, ROUTES, appReducer } from 'app';
@@ -59,7 +59,7 @@ const MODULES = [
5959
EffectsModule,
6060

6161
// Bootstrap
62-
Ng2BootstrapModule,
62+
Ng2BootstrapModule.forRoot(),
6363

6464
// Routing
6565
RouterModule.forRoot(ROUTES)

‎Views/Shared/_Layout.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<title>@ViewData["Title"] - Angular2 ASPNET Core - Starter</title>
88
<base href="/" />
99

10-
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
10+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
1111

12-
@*<link rel="stylesheet" href="http://github.com/~/dist/vendor.css" asp-append-version="true" />*@
12+
<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
1313

1414
</head>
1515

‎package.json‎

Lines changed: 33 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "aspnetcore-angular2-universal-starter",
3-
"version": "1.0.0-beta.1",
3+
"version": "1.0.0-beta.2",
44
"author": {
55
"name": "Mark Pieszak",
66
"email": "[email protected]",
@@ -10,13 +10,32 @@
1010
"type": "git",
1111
"url": "git+https://github.com/MarkPieszak/aspnetcore-angular2-universal.git"
1212
},
13-
"config": {
14-
"engine-strict": true
15-
},
16-
"engineStrict": true,
17-
"engines": {
18-
"node": ">= 5 <= 7",
19-
"npm": ">= 3"
13+
"scripts": {
14+
"ci": "npm test && npm run e2e",
15+
"clean": "npm cache clean && npm run rimraf -- node_modules doc typings coverage wwwroot/dist",
16+
"clean:dist": "npm run rimraf -- wwwroot/dist",
17+
"docs": "npm run typedoc -- --options typedoc.json --exclude '**/*.spec.ts' ./Client/",
18+
"e2e": "npm run protractor",
19+
"e2e:live": "npm run e2e -- --elementExplorer",
20+
"lint": "npm run tslint \"Client/**/*.ts\"",
21+
"postinstall": "webpack --config webpack.config.vendor.js",
22+
"posttest": "npm run coverage",
23+
"postversion": "git push && git push --tags",
24+
"pretest": "npm run lint",
25+
"preversion": "npm test",
26+
"protractor": "protractor",
27+
"pree2e": "npm run webdriver:update -- --standalone",
28+
"rimraf": "rimraf",
29+
"test": "karma start",
30+
"tslint": "tslint",
31+
"typedoc": "typedoc",
32+
"version": "npm run build",
33+
"webdriver:start": "npm run webdriver-manager start",
34+
"webdriver:update": "npm run webdriver-manager update",
35+
"webdriver-manager": "webdriver-manager",
36+
"webpack": "webpack",
37+
"start:dashboard": "npm run webpack-dashboard -- webpack-dev-server --inline --hot --progress --port 8080",
38+
"webpack-dashboard": "webpack-dashboard"
2039
},
2140
"dependencies": {
2241
"@angular/common": "2.2.1",
@@ -48,8 +67,8 @@
4867
},
4968
"devDependencies": {
5069
"@types/chai": "^3.4.34",
51-
"@types/hammerjs": "2.0.33",
52-
"@types/jasmine": "2.5.35",
70+
"@types/hammerjs": "2.0.34",
71+
"@types/jasmine": "2.5.40",
5372
"@types/node": "^6.0.46",
5473
"@types/protractor": "1.5.20",
5574
"@types/selenium-webdriver": "2.44.29",
@@ -97,11 +116,11 @@
97116
"typescript": "2.0.10",
98117
"url-loader": "^0.5.7",
99118
"webpack": "2.1.0-beta.25",
100-
"webpack-dashboard": "0.2.0",
101-
"webpack-dev-middleware": "^1.8.4",
119+
"webpack-dashboard": "0.2.1",
120+
"webpack-dev-middleware": "^1.9.0",
102121
"webpack-dev-server": "^2.1.0-beta.9",
103122
"webpack-externals-plugin": "^1.0.0",
104-
"webpack-hot-middleware": "^2.13.2",
123+
"webpack-hot-middleware": "^2.15.0",
105124
"webpack-merge": "^0.15.0",
106125
"webpack-node-externals": "^1.5.4"
107126
},
@@ -116,32 +135,5 @@
116135
"ts2",
117136
"webpack",
118137
"webpack2"
119-
],
120-
"scripts": {
121-
"ci": "npm test && npm run e2e",
122-
"clean": "npm cache clean && npm run rimraf -- node_modules doc typings coverage wwwroot/dist",
123-
"clean:dist": "npm run rimraf -- wwwroot/dist",
124-
"docs": "npm run typedoc -- --options typedoc.json --exclude '**/*.spec.ts' ./Client/",
125-
"e2e": "npm run protractor",
126-
"e2e:live": "npm run e2e -- --elementExplorer",
127-
"lint": "npm run tslint \"Client/**/*.ts\"",
128-
"postinstall": "webpack --config webpack.config.vendor.js",
129-
"posttest": "npm run coverage",
130-
"postversion": "git push && git push --tags",
131-
"pretest": "npm run lint",
132-
"preversion": "npm test",
133-
"protractor": "protractor",
134-
"pree2e": "npm run webdriver:update -- --standalone",
135-
"rimraf": "rimraf",
136-
"test": "karma start",
137-
"tslint": "tslint",
138-
"typedoc": "typedoc",
139-
"version": "npm run build",
140-
"webdriver:start": "npm run webdriver-manager start",
141-
"webdriver:update": "npm run webdriver-manager update",
142-
"webdriver-manager": "webdriver-manager",
143-
"webpack": "webpack",
144-
"start:dashboard": "npm run webpack-dashboard -- webpack-dev-server --inline --hot --progress --port 8080",
145-
"webpack-dashboard": "webpack-dashboard"
146-
}
138+
]
147139
}

‎project.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@
6767
"web.config",
6868
"webpack.*.js",
6969
"wwwroot"
70+
],
71+
"exclude": [
72+
"wwwroot/dist/*.map"
7073
]
7174
},
7275

0 commit comments

Comments
 (0)