Skip to content
This repository was archived by the owner on Dec 7, 2018. It is now read-only.

Commit 7baa1d8

Browse files
committed
alpha 9 with typescript 2.1 + awesome-typescript-loader 3 beta
1 parent ec85ec8 commit 7baa1d8

File tree

5 files changed

+28
-52
lines changed

5 files changed

+28
-52
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ I share this with you as it is.
1212
I'll update this project in the future and I'll change the name to another one when Angular4 will be released.
1313

1414
## News
15+
- *01/30/2017* - Alpha 9 - Check [HERE](https://github.com/Ks89/Angular2-webpack2-skeleton/releases)
1516
- *01/28/2017* - Alpha 8 - Check [HERE](https://github.com/Ks89/Angular2-webpack2-skeleton/releases)
1617
- *01/22/2017* - Alpha 7 - Check [HERE](https://github.com/Ks89/Angular2-webpack2-skeleton/releases)
1718
- *01/21/2017* - Alpha 6 - Check [HERE](https://github.com/Ks89/Angular2-webpack2-skeleton/releases)
@@ -20,6 +21,10 @@ I'll update this project in the future and I'll change the name to another one w
2021

2122
## Changelog
2223

24+
#### Alpha 8
25+
- typescript 2.1
26+
- awesome-typescript-loader 3.0.0 beta
27+
2328
#### Alpha 8
2429
- improve npm scripts names #15
2530
- remove ./node_modules/.bin from npm scripts #13

config/webpack.common.js

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const InlineManifestWebpackPlugin = require('inline-manifest-webpack-plugin');
1616
const autoprefixer = require('autoprefixer');
1717
const ChunkManifestPlugin = require('chunk-manifest-webpack-plugin');
1818
const ngcWebpack = require('ngc-webpack');
19+
const CheckerPlugin = require('awesome-typescript-loader').CheckerPlugin;
1920

2021
const helpers = require('./helpers');
2122
const TITLE = 'My MEAN Website';
@@ -26,6 +27,7 @@ const TEMPLATE_HTML = 'index.html';
2627
const TEMPLATE_ADMIN_HTML = 'admin.html';
2728

2829
const AOT = helpers.hasNpmFlag('aot');
30+
const TS_CONFIG = AOT ? 'tsconfig-aot.json' : 'tsconfig.json';
2931

3032
module.exports = {
3133
entry: {
@@ -59,36 +61,11 @@ module.exports = {
5961
aot: AOT
6062
}
6163
},
62-
'awesome-typescript-loader?{configFileName: "tsconfig-aot.json"}',
64+
`awesome-typescript-loader?{configFileName: "${TS_CONFIG}"}`,
6365
'angular2-template-loader'
6466
],
6567
exclude: [/\.(spec|e2e)\.ts$/]
6668
},
67-
68-
69-
// {
70-
// test: /\.ts$/,
71-
// loaders: 'awesome-typescript-loader',
72-
// query: {
73-
// forkChecker: true
74-
// },
75-
// exclude: [/\.(spec|e2e)\.ts$/]
76-
// },
77-
// {
78-
// test: /\.ts$/,
79-
// loaders: [
80-
// 'angular2-template-loader',
81-
// '@angularclass/hmr-loader'
82-
// ],
83-
// exclude: [/\.(spec|e2e)\.ts$/]
84-
// },
85-
// {
86-
// test: /\.ts$/,
87-
// loaders: [
88-
// 'angular-router-loader' // lazy Loading
89-
// ],
90-
// exclude: [/\.(spec|e2e)\.ts$/]
91-
// },
9269
{
9370
test: /\.html$/,
9471
loader: 'raw-loader'
@@ -131,6 +108,7 @@ module.exports = {
131108
/@angular\/\*\*\/bundles\//]
132109
},
133110
plugins: [
111+
new CheckerPlugin(),
134112
new NamedModulesPlugin(),
135113
new ManifestPlugin(),
136114
new InlineManifestWebpackPlugin(), // TODO check if I can remove this

config/webpack.dev.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const HotModuleReplacementPlugin = require('webpack/lib/HotModuleReplacementPlug
77
const BrowserSyncPlugin = require('browser-sync-webpack-plugin');
88
const webpackMerge = require('webpack-merge');
99
const ExtractTextPlugin = require('extract-text-webpack-plugin');
10-
const { ForkCheckerPlugin } = require('awesome-typescript-loader');
1110

1211
const commonConfig = require('./webpack.common');
1312
const helpers = require('./helpers');
@@ -49,7 +48,6 @@ module.exports = webpackMerge(commonConfig, {
4948
publicPath: '/'
5049
},
5150
plugins: [
52-
new ForkCheckerPlugin(),
5351
new HotModuleReplacementPlugin(),
5452
new ExtractTextPlugin({
5553
filename: '[name].css',

package.json

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Angular-webpack2-skeleton",
3-
"version": "1.0.0-alpha.8",
3+
"version": "1.0.0-alpha.9",
44
"author": "Stefano Cappa",
55
"description": "Angular skeleton with webpack2",
66
"license": "Apache-v2",
@@ -14,22 +14,17 @@
1414
},
1515
"scripts": {
1616
"start": "webpack-dev-server --progress --port 8080",
17-
1817
"prebuild": "npm run clean-build",
1918
"build:dev": "webpack --config config/webpack.dev.js --colors --progress --display-error-details --display-cached --profile",
2019
"build:prod": "webpack --config config/webpack.prod.js --colors --progress --display-error-details --display-cached --profile",
2120
"build:prod:aot": "webpack --config config/webpack.prod.js --colors --progress --display-error-details --display-cached --profile",
22-
2321
"clean": "npm run clean-build && npm run clean-ngc && npm run clean-coverage",
2422
"clean-build": "rimraf ../My-MEAN-website-server/dist",
2523
"clean-coverage": "rimraf coverage",
26-
2724
"tslint": "tslint",
2825
"lint": "npm run tslint \"src/**/*.ts\"",
29-
3026
"pretest": "npm run clean-coverage",
3127
"test": "karma start --single-run",
32-
3328
"pree2e": "npm run webdriver:update -- --standalone",
3429
"e2e:live": "npm run e2e -- --elementExplorer",
3530
"e2e": "npm run e2e:only",
@@ -38,22 +33,21 @@
3833
"webdriver-manager": "webdriver-manager",
3934
"webdriver:start": "npm run webdriver-manager start",
4035
"webdriver:update": "npm run webdriver-manager update",
41-
4236
"coveralls": "coveralls < coverage/lcov.info",
4337
"codeclimate": "codeclimate-test-reporter < coverage/lcov.info",
4438
"next-update": "next-update -k true --tldr"
4539
},
4640
"dependencies": {
47-
"@angular/common": "^4.0.0-beta.5",
48-
"@angular/compiler": "^4.0.0-beta.5",
49-
"@angular/compiler-cli": "^4.0.0-beta.5",
50-
"@angular/core": "^4.0.0-beta.5",
51-
"@angular/forms": "^4.0.0-beta.5",
52-
"@angular/http": "^4.0.0-beta.5",
53-
"@angular/platform-browser": "^4.0.0-beta.5",
54-
"@angular/platform-browser-dynamic": "^4.0.0-beta.5",
55-
"@angular/platform-server": "^4.0.0-beta.5",
56-
"@angular/router": "^4.0.0-beta.5",
41+
"@angular/common": "^2.4.5",
42+
"@angular/compiler": "^2.4.5",
43+
"@angular/compiler-cli": "^2.4.5",
44+
"@angular/core": "^2.4.5",
45+
"@angular/forms": "^2.4.5",
46+
"@angular/http": "^2.4.5",
47+
"@angular/platform-browser": "^2.4.5",
48+
"@angular/platform-browser-dynamic": "^2.4.5",
49+
"@angular/platform-server": "^2.4.5",
50+
"@angular/router": "^3.4.5",
5751
"@angularclass/idle-preload": "^1.0.4",
5852
"@ng-bootstrap/ng-bootstrap": "^1.0.0-alpha.19",
5953
"bootstrap": "4.0.0-alpha.5",
@@ -79,7 +73,7 @@
7973
"@types/selenium-webdriver": "^2.53.39",
8074
"angular2-template-loader": "^0.6.0",
8175
"autoprefixer": "^6.6.1",
82-
"awesome-typescript-loader": "^2.2.4",
76+
"awesome-typescript-loader": "~3.0.0-beta.18",
8377
"browser-sync": "^2.18.6",
8478
"browser-sync-webpack-plugin": "^1.1.3",
8579
"chunk-manifest-webpack-plugin": "^1.0.0",
@@ -95,18 +89,18 @@
9589
"font-awesome-sass-loader": "^1.0.3",
9690
"fontawesome": "^4.7.0",
9791
"html-loader": "^0.4.4",
98-
"html-webpack-plugin": "^2.26.0",
92+
"html-webpack-plugin": "^2.28.0",
9993
"inline-manifest-webpack-plugin": "^3.0.1",
10094
"istanbul-instrumenter-loader": "^1.2.0",
10195
"jasmine-core": "^2.5.2",
102-
"karma": "^1.4.0",
96+
"karma": "^1.4.1",
10397
"karma-chrome-launcher": "^2.0.0",
10498
"karma-coverage": "^1.1.1",
10599
"karma-edge-launcher": "^0.2.0",
106100
"karma-firefox-launcher": "^1.0.0",
107101
"karma-ie-launcher": "^1.0.0",
108102
"karma-jasmine": "^1.1.0",
109-
"karma-jasmine-diff-reporter": "^0.6.3",
103+
"karma-jasmine-diff-reporter": "^1.0.0",
110104
"karma-jasmine-html-reporter": "^0.2.2",
111105
"karma-mocha-reporter": "^2.2.1",
112106
"karma-phantomjs-launcher": "^1.0.2",
@@ -135,14 +129,14 @@
135129
"ts-node": "^2.0.0",
136130
"tslint": "^4.4.2",
137131
"tslint-loader": "^3.2.0",
138-
"typescript": "2.0.10",
132+
"typescript": "^2.1.5",
139133
"url-loader": "^0.5.7",
140134
"webdriver-manager": "^11.1.1",
141135
"webpack": "^2.2.0",
142136
"webpack-dev-server": "^2.2.0",
143137
"webpack-manifest-plugin": "^1.1.0",
144138
"webpack-md5-hash": "^0.0.5",
145-
"webpack-merge": "^2.6.0"
139+
"webpack-merge": "^2.6.1"
146140
},
147141
"greenkeeper": {
148142
"ignore": [

tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"aot",
2525
"**/*.spec.ts",
2626
"**/*.e2e.ts",
27-
"src/main.aot.ts"
27+
"src/main.aot.ts",
28+
"src/admin.aot.ts"
2829
],
2930
"awesomeTypescriptLoaderOptions": {
3031
"useWebpackText": true,

0 commit comments

Comments
 (0)