From 57f4e706d68d4b977b3df5694a9e671e75acfda6 Mon Sep 17 00:00:00 2001 From: Krzysztof Piasecki Date: Fri, 9 Feb 2018 07:31:17 +0100 Subject: [PATCH 1/5] Migrate to Babel env preset --- .babelrc | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.babelrc b/.babelrc index b7ad399..968e86e 100755 --- a/.babelrc +++ b/.babelrc @@ -4,7 +4,9 @@ "transform-object-rest-spread" ], "presets": [ - ["es2015", { "modules": false }], + ["env", { + "modules": false + }], "stage-0" ] } diff --git a/package.json b/package.json index d75b00b..e171c10 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-plugin-transform-runtime": "^6.23.0", - "babel-preset-es2015": "^6.24.1", + "babel-preset-env": "1.6.1", "babel-preset-stage-0": "^6.24.1", "babel-runtime": "^6.26.0", "case-sensitive-paths-webpack-plugin": "^2.1.1", From 7f3d935ed5415bf157ddf51598d4b2c10caffca9 Mon Sep 17 00:00:00 2001 From: Krzysztof Piasecki Date: Fri, 9 Feb 2018 21:03:20 +0100 Subject: [PATCH 2/5] Fix babel-preset-env version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e171c10..ad252df 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-plugin-transform-runtime": "^6.23.0", - "babel-preset-env": "1.6.1", + "babel-preset-env": "^1.6.1", "babel-preset-stage-0": "^6.24.1", "babel-runtime": "^6.26.0", "case-sensitive-paths-webpack-plugin": "^2.1.1", From 00d643181f6c1b6fde688f0a735a47c92a93e013 Mon Sep 17 00:00:00 2001 From: Krzysztof Piasecki Date: Fri, 9 Feb 2018 23:14:40 +0100 Subject: [PATCH 3/5] Fix output path --- webpack/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack/config.js b/webpack/config.js index 5f16294..11e03d9 100755 --- a/webpack/config.js +++ b/webpack/config.js @@ -56,7 +56,7 @@ module.exports = { entry, output: { path: manifest.paths.build, - publicPath: '/', + publicPath: '', filename: manifest.outputFiles.bundle, }, module: { From c108cb75601de8b8eb2cbb2f30dfa8065cc009f0 Mon Sep 17 00:00:00 2001 From: Krzysztof Piasecki Date: Sat, 10 Feb 2018 07:58:47 +0100 Subject: [PATCH 4/5] Add semicolon --- src/assets/scripts/datatable/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/scripts/datatable/index.js b/src/assets/scripts/datatable/index.js index cf92d77..f02fded 100755 --- a/src/assets/scripts/datatable/index.js +++ b/src/assets/scripts/datatable/index.js @@ -3,4 +3,4 @@ import 'datatables'; export default (function () { $('#dataTable').DataTable(); -}()) +}()); From c56b276838038313f5e6e9115775c40e7dfab88b Mon Sep 17 00:00:00 2001 From: Krzysztof Piasecki Date: Sat, 10 Feb 2018 10:13:01 +0100 Subject: [PATCH 5/5] Upgrade to Bootstrap 4.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad252df..1b660d6 100755 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "babel-polyfill": "^6.26.0", - "bootstrap": "4.0.0-beta.2", + "bootstrap": "^4.0.0", "bootstrap-datepicker": "^1.7.1", "chart.js": "^2.7.1", "datatables": "^1.10.13",