Skip to content

Commit 853a9dd

Browse files
committed
1.8.7
1 parent 10d34ed commit 853a9dd

File tree

3 files changed

+28
-16
lines changed

3 files changed

+28
-16
lines changed

.dawn/pipe.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ build:
1919
cssModules: false
2020
compress: false
2121
stats: true
22+
presetEnv: true
2223

2324
test:
2425
- name: lint

lib/generate.js

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,29 @@ async function handleOpts(opts) {
6868

6969
function createBabelOptions(opts) {
7070
opts.presets = opts.presets || [];
71+
if (opts.presetEnv !== false) {
72+
opts.presets.push([require.resolve('babel-preset-env'), {
73+
targets: opts.targets || {
74+
browsers: opts.browsers || [
75+
'last 2 versions',
76+
'IE >= 9'
77+
],
78+
uglify: utils.isNull(opts.uglify) ? true : opts.uglify
79+
},
80+
loose: opts.loose !== false,
81+
modules: opts.modules || 'commonjs',
82+
useBuiltIns: utils.isNull(opts.useBuiltIns) ?
83+
'usage' : opts.useBuiltIns
84+
}]);
85+
} else {
86+
opts.presets.push([
87+
require.resolve('babel-preset-es2015'), {
88+
loose: opts.loose !== false,
89+
modules: opts.modules || 'commonjs',
90+
spec: opts.spec || false
91+
}
92+
]);
93+
}
7194
if (opts.react !== false) {
7295
opts.presets.push(require.resolve('babel-preset-react'));
7396
}
@@ -76,21 +99,8 @@ function createBabelOptions(opts) {
7699
babelrc: true,
77100
cacheDirectory: true,
78101
presets: [
79-
[require.resolve('babel-preset-env'), {
80-
targets: opts.targets || {
81-
browsers: opts.browsers || [
82-
'last 2 versions',
83-
'IE >= 9'
84-
],
85-
uglify: utils.isNull(opts.uglify) ? true : opts.uglify
86-
},
87-
loose: opts.loose !== false,
88-
modules: opts.modules || 'commonjs',
89-
useBuiltIns: utils.isNull(opts.useBuiltIns) ?
90-
'usage' : opts.useBuiltIns
91-
}],
92-
require.resolve('babel-preset-stage-0'),
93-
...opts.presets
102+
...opts.presets,
103+
require.resolve('babel-preset-stage-0')
94104
],
95105
plugins: [
96106
require.resolve('babel-plugin-transform-runtime'),

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dn-middleware-webpack",
3-
"version": "1.8.6",
3+
"version": "1.8.7",
44
"description": "",
55
"main": "./lib/index.js",
66
"scripts": {
@@ -22,6 +22,7 @@
2222
"babel-plugin-typecheck": "^3.9.0",
2323
"babel-polyfill": "^6.26.0",
2424
"babel-preset-env": "^1.6.0",
25+
"babel-preset-es2015": "^6.24.1",
2526
"babel-preset-react": "^6.24.1",
2627
"babel-preset-stage-0": "^6.24.1",
2728
"babel-runtime": "^6.23.0",

0 commit comments

Comments
 (0)