Skip to content

Commit 54d89ae

Browse files
leeoniyaleeoniya
committed
update domvm & results-ui
1 parent 1c67b89 commit 54d89ae

File tree

10 files changed

+93
-68
lines changed

10 files changed

+93
-68
lines changed

‎frameworks/keyed/domvm/build.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const rollup = require('rollup').rollup;
22
const buble = require('rollup-plugin-buble');
3-
const UglifyJS = require('uglify-js');
3+
const terser = require('terser');
44
const fs = require('fs');
55

66
rollup({
@@ -59,7 +59,6 @@ rollup({
5959
unsafe_regexp: false,
6060
unsafe_undefined: false,
6161
unused: true,
62-
warnings: false,
6362
};
6463

6564
const opts = {
@@ -75,7 +74,7 @@ rollup({
7574
}),
7675
};
7776

78-
const compiled = UglifyJS.minify(fs.readFileSync('dist/bundle.js', 'utf8'), opts).code;
77+
const compiled = terser.minify(fs.readFileSync('dist/bundle.js', 'utf8'), opts).code;
7978

8079
fs.writeFileSync('dist/bundle.min.js', compiled, 'utf8');
8180
}).catch(err => console.log(err.stack));

‎frameworks/keyed/domvm/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"name": "js-framework-benchmark-domvm-keyed",
3-
"version": "3.4.5-keyed",
3+
"version": "3.4.12-keyed",
44
"description": "Benchmark for domvm framework (keyed)",
55
"js-framework-benchmark": {
6-
"frameworkVersion": "3.4.5"
6+
"frameworkVersion": "3.4.12"
77
},
88
"scripts": {
99
"build-dev": "node build.js",
1010
"build-prod": "node build.js"
1111
},
1212
"devDependencies": {
13-
"rollup": "0.64.1",
14-
"rollup-plugin-buble": "0.19.2",
15-
"uglify-js": "3.4.7"
13+
"rollup": "1.16.3",
14+
"rollup-plugin-buble": "0.19.6",
15+
"terser": "^4.0.1"
1616
},
1717
"dependencies": {
18-
"domvm": "git://github.com/domvm/domvm.git#3.4.5"
18+
"domvm": "git://github.com/domvm/domvm.git#3.4.12"
1919
}
2020
}

‎frameworks/keyed/domvm/src/main.es6.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function TableTpl(store) {
7171
const key = item => item.id;
7272
const diff = {
7373
val: (item) => item.label + (item.id === store.selected),
74-
cmp: (o, n) => o !== n,
74+
eq: (o, n) => o === n,
7575
};
7676

7777
return (

‎frameworks/non-keyed/domvm/build.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const rollup = require('rollup').rollup;
22
const buble = require('rollup-plugin-buble');
3-
const UglifyJS = require('uglify-js');
3+
const terser = require('terser');
44
const fs = require('fs');
55

66
rollup({
@@ -59,7 +59,6 @@ rollup({
5959
unsafe_regexp: false,
6060
unsafe_undefined: false,
6161
unused: true,
62-
warnings: false,
6362
};
6463

6564
const opts = {
@@ -75,7 +74,7 @@ rollup({
7574
}),
7675
};
7776

78-
const compiled = UglifyJS.minify(fs.readFileSync('dist/bundle.js', 'utf8'), opts).code;
77+
const compiled = terser.minify(fs.readFileSync('dist/bundle.js', 'utf8'), opts).code;
7978

8079
fs.writeFileSync('dist/bundle.min.js', compiled, 'utf8');
8180
}).catch(err => console.log(err.stack));

‎frameworks/non-keyed/domvm/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"name": "js-framework-benchmark-domvm-non-keyed",
3-
"version": "3.4.5-non-keyed",
3+
"version": "3.4.12-non-keyed",
44
"description": "Benchmark for domvm framework (non-keyed)",
55
"js-framework-benchmark": {
6-
"frameworkVersion": "3.4.5"
6+
"frameworkVersion": "3.4.12"
77
},
88
"scripts": {
99
"build-dev": "node build.js",
1010
"build-prod": "node build.js"
1111
},
1212
"devDependencies": {
13-
"rollup": "0.64.1",
14-
"rollup-plugin-buble": "0.19.2",
15-
"uglify-js": "3.4.7"
13+
"rollup": "1.16.3",
14+
"rollup-plugin-buble": "0.19.6",
15+
"terser": "^4.0.1"
1616
},
1717
"dependencies": {
18-
"domvm": "git://github.com/domvm/domvm.git#3.4.5"
18+
"domvm": "git://github.com/domvm/domvm.git#3.4.12"
1919
}
2020
}

‎frameworks/non-keyed/domvm/src/main.es6.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ function ButtonTpl(store, action, text) {
7070
function TableTpl(store) {
7171
const diff = {
7272
val: (item) => item.label + (item.id === store.selected),
73-
cmp: (o, n) => o !== n,
73+
eq: (o, n) => o === n,
7474
};
7575

7676
return (

‎results-ui/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
},
1717
"devDependencies": {
1818
"clean-css": "^4.2.1",
19-
"domvm": "git://github.com/domvm/domvm.git#3.4.5",
20-
"rollup": "^0.65.0",
21-
"rollup-plugin-buble": "^0.19.2",
22-
"uglify-js": "^3.4.8",
23-
"yargs-parser": "^10.1.0"
19+
"domvm": "git://github.com/domvm/domvm.git#3.4.12",
20+
"rollup": "^1.15.6",
21+
"rollup-plugin-buble": "^0.19.6",
22+
"terser": "^4.0.1",
23+
"yargs-parser": "^13.1.1"
2424
},
2525
"dependencies": {}
2626
}

‎results-ui/src/bootstrap-reboot.css

+63-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎results-ui/src/build.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const fs = require('fs');
22
const rollup = require('rollup');
33
const buble = require('rollup-plugin-buble');
4-
const UglifyJS = require('uglify-js');
4+
const terser = require('terser');
55
const CleanCSS = require('clean-css');
66
const path = require("path");
77
const yargs = require("yargs-parser");
@@ -117,7 +117,6 @@ async function build() {
117117
unsafe_regexp: false,
118118
unsafe_undefined: false,
119119
unused: true,
120-
warnings: false,
121120
};
122121

123122
const uglifyOpts = {
@@ -133,11 +132,11 @@ async function build() {
133132
}),
134133
};
135134

136-
const { code, map } = await bundle.generate({
135+
const { output } = await bundle.generate({
137136
format: "iife",
138137
});
139138

140-
const minJs = UglifyJS.minify(code, uglifyOpts).code;
139+
const minJs = terser.minify(output[0].code, uglifyOpts).code;
141140

142141
var css = fs.readFileSync(__dirname + '/bootstrap-reboot.css', 'utf8').replace(/\/\*[\s\S]+?\*\/\s*/gm, '');
143142
css += fs.readFileSync(__dirname + '/style.css', 'utf8');

‎results-ui/src/style.css

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ body {
55
color: #333;
66
}
77

8+
h1, h2, h3, h4, h5, h6 {
9+
font-size: auto;
10+
}
11+
812
a {
913
color: #337ab7;
1014
text-decoration: none;

0 commit comments

Comments
 (0)