Browse Source

Merge pull request #48 from krzysiekpiasecki/master

Upgrade to stable BS4, Fix webpack output dir, Migrate to babel-preset-env
pull/50/head
Aigars Silkalns 8 years ago
committed by GitHub
parent
commit
f2a1fab027
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
  1. +3
    -1
      .babelrc
  2. +2
    -2
      package.json
  3. +1
    -1
      src/assets/scripts/datatable/index.js
  4. +1
    -1
      webpack/config.js

+ 3
- 1
.babelrc View File

@ -4,7 +4,9 @@
"transform-object-rest-spread"
],
"presets": [
["es2015", { "modules": false }],
["env", {
"modules": false
}],
"stage-0"
]
}

+ 2
- 2
package.json View File

@ -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",
@ -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",


+ 1
- 1
src/assets/scripts/datatable/index.js View File

@ -3,4 +3,4 @@ import 'datatables';
export default (function () {
$('#dataTable').DataTable();
}())
}());

+ 1
- 1
webpack/config.js View File

@ -56,7 +56,7 @@ module.exports = {
entry,
output: {
path: manifest.paths.build,
publicPath: '/',
publicPath: '',
filename: manifest.outputFiles.bundle,
},
module: {


Loading…
Cancel
Save