Skip to content

Commit 1c29ca1

Browse files
AlberplzAlberplz
committed
Version 1.3.1
Updated for Angular 2.4
1 parent 0dd5125 commit 1c29ca1

24 files changed

+136
-110
lines changed

‎examples/package.json

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,29 @@
11
{
22
"name": "angular2-color-picker-example",
3-
"description": "Example for Angular2 Color Picker",
4-
"version": "1.3.0",
3+
"version": "1.3.1",
4+
"description": "Example for Angular2 Color Picker",
55
"scripts": {
6-
"start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ",
7-
"lite": "lite-server",
8-
"postinstall": "typings install",
9-
"tsc": "tsc",
10-
"tsc:w": "tsc -w",
11-
"typings": "typings"
6+
"start": "npm run lite",
7+
"lite": "lite-server"
128
},
139
"license": "MIT",
1410
"dependencies": {
15-
"@angular/common": "~2.1.0",
16-
"@angular/compiler": "~2.1.0",
17-
"@angular/core": "~2.1.0",
18-
"@angular/forms": "~2.1.0",
19-
"@angular/http": "~2.1.0",
20-
"@angular/platform-browser": "~2.1.0",
21-
"@angular/platform-browser-dynamic": "~2.1.0",
22-
"@angular/router": "~3.1.0",
23-
"@angular/upgrade": "~2.1.0",
24-
"angular-in-memory-web-api": "~0.1.5",
25-
"bootstrap": "^3.3.7",
11+
"@angular/common": "~2.4.0",
12+
"@angular/compiler": "~2.4.0",
13+
"@angular/core": "~2.4.0",
14+
"@angular/forms": "~2.4.0",
15+
"@angular/http": "~2.4.0",
16+
"@angular/platform-browser": "~2.4.0",
17+
"@angular/platform-browser-dynamic": "~2.4.0",
18+
"@angular/router": "~3.4.0",
19+
"@angular/upgrade": "~2.4.0",
20+
"angular-in-memory-web-api": "~0.2.4",
2621
"core-js": "^2.4.1",
27-
"reflect-metadata": "^0.1.8",
28-
"rxjs": "5.0.0-beta.12",
29-
"systemjs": "0.19.39",
30-
"zone.js": "^0.6.25"
22+
"rxjs": "5.0.1",
23+
"zone.js": "^0.7.4"
3124
},
3225
"devDependencies": {
3326
"concurrently": "^3.0.0",
34-
"lite-server": "^2.2.2",
35-
"typescript": "^2.0.3",
36-
"typings": "^1.4.0"
27+
"lite-server": "^2.2.2"
3728
}
38-
}
29+
}

‎examples_webpack/config/karma-test-shim.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Error.stackTraceLimit = Infinity;
2+
3+
require('core-js/es6');
4+
require('core-js/es7/reflect');
5+
6+
require('zone.js/dist/zone');
7+
require('zone.js/dist/long-stack-trace-zone');
8+
require('zone.js/dist/proxy');
9+
require('zone.js/dist/sync-test');
10+
require('zone.js/dist/jasmine-patch');
11+
require('zone.js/dist/async-test');
12+
require('zone.js/dist/fake-async-test');
13+
14+
var appContext = require.context('../src', true, /\.spec\.ts/);
15+
16+
appContext.keys().forEach(appContext);
17+
18+
var testing = require('@angular/core/testing');
19+
var browser = require('@angular/platform-browser-dynamic/testing');
20+
21+
testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());

‎examples_webpack/config/webpack.common.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,42 @@ module.exports = {
1010
'app': './src/main.ts'
1111
},
1212
resolve: {
13-
extensions: ['', '.js', '.ts']
13+
extensions: ['.ts', '.js']
1414
},
1515
module: {
16-
loaders: [
16+
rules: [
1717
{
1818
test: /\.ts$/,
1919
loaders: ['awesome-typescript-loader', 'angular2-template-loader']
2020
},
2121
{
2222
test: /\.html$/,
23-
loader: 'html'
23+
loader: 'html-loader'
2424
},
2525
{
2626
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
27-
loader: 'file?name=assets/[name].[hash].[ext]'
27+
loader: 'file-loader?name=assets/[name].[hash].[ext]'
2828
},
2929
{
3030
test: /\.css$/,
3131
exclude: helpers.root('src', 'app'),
32-
loader: ExtractTextPlugin.extract('style', 'css?sourceMap')
32+
loader: ExtractTextPlugin.extract({fallbackLoader: 'style-loader', loader: 'css-loader?sourceMap'})
3333
},
3434
{
3535
test: /\.css$/,
3636
include: helpers.root('src', 'app'),
37-
loader: 'raw'
37+
loader: 'raw-loader'
3838
}
3939
]
4040
},
4141
plugins: [
42+
// Workaround for angular/angular#11580
43+
new webpack.ContextReplacementPlugin(
44+
// The (\\|\/) piece accounts for path separators in *nix and Windows
45+
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
46+
helpers.root('./src'), // location of your src
47+
{} // a map of your routes
48+
),
4249
new webpack.optimize.CommonsChunkPlugin({
4350
name: ['app', 'vendor', 'polyfills']
4451
}),

‎examples_webpack/config/webpack.prod.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,8 @@ module.exports = webpackMerge(commonConfig, {
1414
filename: '[name].[hash].js',
1515
chunkFilename: '[id].[hash].chunk.js'
1616
},
17-
htmlLoader: {
18-
minimize: false // workaround for ng2
19-
},
2017
plugins: [
21-
new webpack.NoErrorsPlugin(),
22-
new webpack.optimize.DedupePlugin(),
18+
new webpack.NoEmitOnErrorsPlugin(),
2319
new webpack.optimize.UglifyJsPlugin({// https://github.com/angular/angular/issues/10618
2420
mangle: {
2521
keep_fnames: true
@@ -30,6 +26,11 @@ module.exports = webpackMerge(commonConfig, {
3026
'process.env': {
3127
'ENV': JSON.stringify(ENV)
3228
}
29+
}),
30+
new webpack.LoaderOptionsPlugin({
31+
htmlLoader: {
32+
minimize: false // workaround for ng2
33+
}
3334
})
3435
]
3536
});

‎examples_webpack/config/webpack.test.js

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,44 @@
1+
var webpack = require('webpack');
12
var helpers = require('./helpers');
23

34
module.exports = {
45
devtool: 'inline-source-map',
56
resolve: {
6-
extensions: ['', '.ts', '.js']
7+
extensions: ['.ts', '.js']
78
},
89
module: {
9-
loaders: [
10+
rules: [
1011
{
1112
test: /\.ts$/,
1213
loaders: ['awesome-typescript-loader', 'angular2-template-loader']
1314
},
1415
{
1516
test: /\.html$/,
16-
loader: 'html'
17+
loader: 'html-loader'
1718

1819
},
1920
{
2021
test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
21-
loader: 'null'
22+
loader: 'null-loader'
2223
},
2324
{
2425
test: /\.css$/,
2526
exclude: helpers.root('src', 'app'),
26-
loader: 'null'
27+
loader: 'null-loader'
2728
},
2829
{
2930
test: /\.css$/,
3031
include: helpers.root('src', 'app'),
31-
loader: 'raw'
32+
loader: 'raw-loader'
3233
}
3334
]
34-
}
35+
},
36+
plugins: [
37+
new webpack.ContextReplacementPlugin(
38+
// The (\\|\/) piece accounts for path separators in *nix and Windows
39+
/angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
40+
helpers.root('./src'), // location of your src
41+
{} // a map of your routes
42+
)
43+
]
3544
}

‎examples_webpack/package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
{
2-
"name": "angular2-color-picker-example-webpack",
3-
"version": "1.3.0",
4-
"description": "Example for Angular2 Color Picker, Webpack",
2+
"name": "angular2-color-picker-example",
3+
"version": "1.3.1",
4+
"description": "Example for Angular2 Color Picker",
55
"scripts": {
66
"start": "webpack-dev-server --inline --progress --port 8080",
77
"test": "karma start",
8-
"build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail",
9-
"postinstall": "typings install"
8+
"build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail"
109
},
1110
"license": "MIT",
1211
"dependencies": {
13-
"@angular/common": "~2.1.0",
14-
"@angular/compiler": "~2.1.0",
15-
"@angular/core": "~2.1.0",
16-
"@angular/forms": "~2.1.0",
17-
"@angular/http": "~2.1.0",
18-
"@angular/platform-browser": "~2.1.0",
19-
"@angular/platform-browser-dynamic": "~2.1.0",
20-
"@angular/router": "~3.1.0",
12+
"@angular/common": "~2.4.0",
13+
"@angular/compiler": "~2.4.0",
14+
"@angular/core": "~2.4.0",
15+
"@angular/forms": "~2.4.0",
16+
"@angular/http": "~2.4.0",
17+
"@angular/platform-browser": "~2.4.0",
18+
"@angular/platform-browser-dynamic": "~2.4.0",
19+
"@angular/router": "~3.4.0",
2120
"core-js": "^2.4.1",
22-
"rxjs": "5.0.0-beta.12",
23-
"zone.js": "^0.6.25"
21+
"rxjs": "5.0.1",
22+
"zone.js": "^0.7.4"
2423
},
2524
"devDependencies": {
26-
"angular2-template-loader": "^0.4.0",
27-
"awesome-typescript-loader": "^2.2.4",
28-
"css-loader": "^0.23.1",
29-
"extract-text-webpack-plugin": "^1.0.1",
30-
"file-loader": "^0.8.5",
25+
"@types/node": "^6.0.45",
26+
"@types/jasmine": "^2.5.35",
27+
"angular2-template-loader": "^0.6.0",
28+
"awesome-typescript-loader": "^3.0.0-beta.18",
29+
"css-loader": "^0.26.1",
30+
"extract-text-webpack-plugin": "2.0.0-beta.5",
31+
"file-loader": "^0.9.0",
3132
"html-loader": "^0.4.3",
32-
"html-webpack-plugin": "^2.15.0",
33+
"html-webpack-plugin": "^2.16.1",
3334
"jasmine-core": "^2.4.1",
3435
"karma": "^1.2.0",
3536
"karma-jasmine": "^1.0.2",
3637
"karma-phantomjs-launcher": "^1.0.2",
3738
"karma-sourcemap-loader": "^0.3.7",
38-
"karma-webpack": "^1.8.0",
39+
"karma-webpack": "^2.0.1",
3940
"null-loader": "^0.1.1",
4041
"phantomjs-prebuilt": "^2.1.7",
4142
"raw-loader": "^0.5.1",
4243
"rimraf": "^2.5.2",
4344
"style-loader": "^0.13.1",
44-
"typescript": "^2.0.2",
45-
"typings": "^1.3.2",
46-
"webpack": "^1.13.0",
47-
"webpack-dev-server": "^1.14.1",
48-
"webpack-merge": "^0.14.0"
45+
"typescript": "~2.0.10",
46+
"webpack": "2.2.0",
47+
"webpack-dev-server": "2.2.0-rc.0",
48+
"webpack-merge": "^2.4.0"
4949
}
5050
}

‎examples_webpack/src/polyfills.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import 'core-js/es6';
22
import 'core-js/es7/reflect';
33
require('zone.js/dist/zone');
4+
45
if (process.env.ENV === 'production') {
56
// Production
67
} else {
7-
// Development
8+
// Development and test
89
Error['stackTraceLimit'] = Infinity;
910
require('zone.js/dist/long-stack-trace-zone');
1011
}

‎examples_webpack/src/vendor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Angular 2
1+
// Angular
22
import '@angular/platform-browser';
33
import '@angular/platform-browser-dynamic';
44
import '@angular/core';

‎examples_webpack/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"sourceMap": true,
77
"emitDecoratorMetadata": true,
88
"experimentalDecorators": true,
9-
"removeComments": false,
9+
"lib": ["es2015", "dom"],
1010
"noImplicitAny": true,
1111
"suppressImplicitAnyIndexErrors": true
1212
}
13-
}
13+
}

‎index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)