From 7d20926c9bb71457fcd9b2a4dcd4f0eaa6aa6de3 Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Sat, 25 Aug 2018 05:51:29 +0200 Subject: [PATCH] Moving configurations around. --- .babelrc | 15 +++++++++++---- .browserslistrc | 5 ----- .eslintrc.json | 6 ------ package.json | 13 +++++++++++++ src/.babelrc | 8 ++++++++ webpack.config.babel.js | 14 +------------- 6 files changed, 33 insertions(+), 28 deletions(-) delete mode 100644 .browserslistrc delete mode 100644 .eslintrc.json create mode 100644 src/.babelrc diff --git a/.babelrc b/.babelrc index 6669947..13cf9ce 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,12 @@ { - "presets": [ - "@babel/env" - ] -} \ No newline at end of file + "presets": [ + [ + "@babel/env", + { + "targets": { + "node": true + } + } + ] + ] +} diff --git a/.browserslistrc b/.browserslistrc deleted file mode 100644 index 3c314c9..0000000 --- a/.browserslistrc +++ /dev/null @@ -1,5 +0,0 @@ -last 2 major versions -last 2 years -not dead -IE >= 9 ->= 1% diff --git a/.eslintrc.json b/.eslintrc.json deleted file mode 100644 index 0955f09..0000000 --- a/.eslintrc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "airbnb-base", - "env": { - "browser": true - } -} \ No newline at end of file diff --git a/package.json b/package.json index de7cbab..306a059 100644 --- a/package.json +++ b/package.json @@ -50,5 +50,18 @@ "video:mkdirp": "mkdirp dist/video", "video:dash": "babel-node -- development/node/ffmpeg -loglevel warning -stats -i video/big.mp4 -c copy -use_timeline 1 -use_template 1 -single_file 1 -f dash -y dist/video/clock.mpd", "video:dash:production": "babel-node -- development/node/ffmpeg -loglevel warning -stats -i video/big.mp4 -c copy -use_timeline 1 -use_template 1 -f dash -y dist/video/clock.mpd" + }, + "browserslist": [ + "last 2 major versions", + "last 2 years", + "not dead", + "IE >= 9", + ">= 1%" + ], + "eslintConfig": { + "extends": "airbnb-base", + "env": { + "browser": true + } } } diff --git a/src/.babelrc b/src/.babelrc new file mode 100644 index 0000000..3e72b0e --- /dev/null +++ b/src/.babelrc @@ -0,0 +1,8 @@ +{ + "presets": [ + ["@babel/env", { + "targets": { }, + "modules": false + }] + ] +} \ No newline at end of file diff --git a/webpack.config.babel.js b/webpack.config.babel.js index f3325d1..f8cdb67 100644 --- a/webpack.config.babel.js +++ b/webpack.config.babel.js @@ -54,19 +54,7 @@ export default (env, { mode }) => { { test: /\.js$/i, include: sourceDirectory, - use: [ - { - loader: 'babel-loader', - options: { - presets: [ - ['@babel/env', { - targets: { - }, - }], - ], - }, - }, - ], + loader: 'babel-loader', }, {