Skip to content

Commit c4a895c

Browse files
magikcypressmarcusoffesson
authored andcommitted
Update car-models example (qlik-oss#292)
1 parent 98eed4a commit c4a895c

File tree

5 files changed

+41
-26
lines changed

5 files changed

+41
-26
lines changed

examples/complete/car-models/.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": [["es2015", { "modules": false }]],
3+
}

examples/complete/car-models/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@
4444
<app></app>
4545
<script src="app.js"></script>
4646
</body>
47-
</html>
47+
</html>

examples/complete/car-models/package.json

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,24 @@
88
},
99
"author": "Qlik",
1010
"license": "MIT",
11-
"dependencies": {
12-
"enigma.js": "^2.0.0-0",
13-
"angular": "^1.5.8",
14-
"d3": "^4.2.2",
15-
"ws": "^1.1.1"
16-
},
11+
"dependencies": {},
1712
"devDependencies": {
18-
"babel-core": "^6.14.0",
19-
"babel-loader": "^6.2.5",
13+
"angular": "^1.6.6",
14+
"babel": "^6.23.0",
15+
"babel-core": "^6.26.0",
16+
"babel-loader": "^7.1.2",
2017
"babel-plugin-transform-exponentiation-operator": "^6.24.1",
21-
"babel-preset-es2015": "^6.14.0",
22-
"json-loader": "^0.5.4",
18+
"babel-plugin-transform-object-assign": "^6.22.0",
19+
"babel-preset-env": "^1.6.1",
20+
"babel-preset-es2015": "^6.24.1",
21+
"d3": "^4.11.0",
22+
"enigma.js": "^2.1.1",
23+
"fs": "0.0.1-security",
24+
"fs-extra": "^4.0.2",
25+
"json-loader": "^0.5.7",
2326
"raw-loader": "^0.5.1",
24-
"webpack": "^1.13.2",
25-
"webpack-dev-server": "^1.15.1"
27+
"webpack": "^3.8.1",
28+
"webpack-dev-server": "^2.9.3",
29+
"ws": "^3.2.0"
2630
}
2731
}

examples/complete/car-models/src/app.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import angular from 'angular';
55
import enigma from 'enigma.js';
66

7-
import schema from 'json!../node_modules/enigma.js/schemas/12.20.0.json';
8-
import template from 'raw!./app.html';
9-
import csv from 'raw!../data.csv';
7+
import schema from 'json-loader!../node_modules/enigma.js/schemas/12.20.0.json';
8+
import template from 'raw-loader!./app.html';
9+
import csv from 'raw-loader!../data.csv';
1010
import paintBarchart from './chart';
11+
// import session from '../certificates';
1112

1213
const SCRIPT =
1314
`LOAD * Inline [
Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-env node */
22

3+
const webpack = require('webpack');
34
const path = require('path');
45

56
module.exports = {
@@ -10,17 +11,23 @@ module.exports = {
1011
filename: 'app.js',
1112
publicPath: 'http://localhost:8080/',
1213
},
13-
debug: true,
14-
devtool: 'source-map',
14+
plugins: [
15+
new webpack.LoaderOptionsPlugin({
16+
debug: true,
17+
}),
18+
],
1519
module: {
16-
loaders: [{
17-
test: /\.js$/,
18-
loader: 'babel',
19-
exclude: [path.resolve(__dirname, 'node_modules')],
20-
query: {
21-
presets: ['es2015'],
22-
plugins: ['transform-exponentiation-operator'],
20+
rules: [
21+
{
22+
test: /\.js$/,
23+
exclude: /(node_modules|bower_components)/,
24+
use: {
25+
loader: 'babel-loader',
26+
options: {
27+
presets: ['env', 'es2015'],
28+
},
29+
},
2330
},
24-
}],
31+
],
2532
},
2633
};

0 commit comments

Comments
 (0)