Skip to content

Commit acdf18f

Browse files
Add example of using TypeScript 2.1 + Webpack 2.1 + paths to help with aspnet#494
1 parent 633969c commit acdf18f

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

templates/Angular2Spa/ClientApp/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { AppComponent } from './components/app/app.component'
55
import { NavMenuComponent } from './components/navmenu/navmenu.component';
66
import { HomeComponent } from './components/home/home.component';
77
import { FetchDataComponent } from './components/fetchdata/fetchdata.component';
8-
import { CounterComponent } from './components/counter/counter.component';
8+
import { CounterComponent } from 'ClientApp/app/components/counter/counter.component';
99

1010
@NgModule({
1111
bootstrap: [ AppComponent ],

templates/Angular2Spa/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"es6-shim": "^0.35.1",
2828
"event-source-polyfill": "^0.0.7",
2929
"expose-loader": "^0.7.1",
30-
"extract-text-webpack-plugin": "^1.0.1",
30+
"extract-text-webpack-plugin": "^2.0.0-beta",
3131
"file-loader": "^0.9.0",
3232
"html-loader": "^0.4.4",
3333
"isomorphic-fetch": "^2.2.1",
@@ -39,10 +39,10 @@
3939
"rxjs": "5.0.0-beta.12",
4040
"style-loader": "^0.13.1",
4141
"to-string-loader": "^1.1.5",
42-
"ts-loader": "^0.8.2",
43-
"typescript": "^2.0.3",
42+
"ts-loader": "^1.3.0",
43+
"typescript": "^2.1.0",
4444
"url-loader": "^0.5.7",
45-
"webpack": "^1.13.2",
45+
"webpack": "^2.1.0-beta",
4646
"webpack-hot-middleware": "^2.12.2",
4747
"webpack-merge": "^0.14.1",
4848
"zone.js": "^0.6.25"

templates/Angular2Spa/tsconfig.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
22
"compilerOptions": {
3+
"baseUrl": ".",
4+
"paths": {
5+
"*": [
6+
"*"
7+
]
8+
},
39
"moduleResolution": "node",
410
"target": "es5",
511
"sourceMap": true,

templates/Angular2Spa/webpack.config.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ var merge = require('webpack-merge');
66
// Configuration in common to both client-side and server-side bundles
77
var sharedConfig = {
88
context: __dirname,
9-
resolve: { extensions: [ '', '.js', '.ts' ] },
9+
resolve: {
10+
extensions: [ '.js', '.ts' ],
11+
modules: [
12+
'node_modules',
13+
'.'
14+
]
15+
},
1016
output: {
1117
filename: '[name].js',
1218
publicPath: '/dist/' // Webpack dev middleware, if enabled, handles requests for this URL prefix
@@ -46,7 +52,7 @@ var clientBundleConfig = merge(sharedConfig, {
4652

4753
// Configuration for server-side (prerendering) bundle suitable for running in Node
4854
var serverBundleConfig = merge(sharedConfig, {
49-
resolve: { packageMains: ['main'] },
55+
resolve: { mainFields: ['main'] },
5056
entry: { 'main-server': './ClientApp/boot-server.ts' },
5157
plugins: [
5258
new webpack.DllReferencePlugin({

templates/Angular2Spa/webpack.config.vendor.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var merge = require('webpack-merge');
66
var extractCSS = new ExtractTextPlugin('vendor.css');
77

88
var sharedConfig = {
9-
resolve: { extensions: [ '', '.js' ] },
9+
resolve: { extensions: [ '.js' ] },
1010
module: {
1111
loaders: [
1212
{ test: /\.json$/, loader: require.resolve('json-loader') },
@@ -68,7 +68,7 @@ var clientBundleConfig = merge(sharedConfig, {
6868

6969
var serverBundleConfig = merge(sharedConfig, {
7070
target: 'node',
71-
resolve: { packageMains: ['main'] },
71+
resolve: { mainFields: ['main'] },
7272
output: {
7373
path: path.join(__dirname, 'ClientApp', 'dist'),
7474
libraryTarget: 'commonjs2',

0 commit comments

Comments
 (0)