diff --git a/Gruntfile.js b/Gruntfile.js index 8596904..bebeac5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,24 +4,54 @@ module.exports = function (grunt) { pkg: grunt.file.readJSON('package.json'), webpack: { app: { - entry: './app/index.jsx', + entry: __dirname + '/app/index.jsx', output: { filename: 'bundle.js', - path: './dist/app/' + path: __dirname + '/dist/app/' }, resolve: { extensions: ['.js', '.jsx'], }, module: { - loaders: [ + rules: [ { test: /\.jsx?$/, exclude: /node_modules/, - loader: 'babel-loader', - query: { - sourceMap: true, - presets: ['env', 'react'] - } + use: [ + { + loader: 'babel-loader', + options: { + sourceMap: true, + presets: ['env', 'react'] + } + } + ] + }, + { + test: /\.css$/, + use: [ + 'style-loader', + { + loader: 'css-loader', + options: { + modules: true, + importLoaders: 1 + } + }, + { + loader: 'postcss-loader', + options: { + plugins: { + 'postcss-import': { + root: __dirname, + }, + 'postcss-mixins': {}, + 'postcss-each': {}, + 'postcss-cssnext': {} + } + } + } + ] } ] } @@ -32,27 +62,21 @@ module.exports = function (grunt) { files: [ { expand: true, - cwd: './app/', + cwd: __dirname + '/app/', src: ['index.html'], - dest: './dist/app/' + dest: __dirname + '/dist/app/' }, { expand: true, - cwd: './app/', + cwd: __dirname + '/app/', src: ['assets/**'], - dest: './dist/app/assets/' + dest: __dirname + '/dist/app/assets/' }, { expand: true, - cwd: './node_modules/bootstrap/', + cwd: __dirname + '/node_modules/oidc-client/', src: ['dist/**'], - dest: './dist/app/assets/bootstrap/' - }, - { - expand: true, - cwd: './node_modules/oidc-client/', - src: ['dist/**'], - dest: './dist/app/assets/oidc-client/' + dest: __dirname + '/dist/app/assets/oidc-client/' } ] } @@ -72,9 +96,9 @@ module.exports = function (grunt) { files: [ { expand: true, - cwd: './server/', + cwd: __dirname + '/server/', src: ['**/*.js'], - dest: './dist/server/' + dest: __dirname + '/dist/server/' } ] } @@ -84,9 +108,9 @@ module.exports = function (grunt) { files: [ { expand: true, - cwd: './app/', + cwd: __dirname + '/app/', src: ['**/*.js*'], - dest: './dist/app/' + dest: __dirname + '/dist/app/' } ] }, @@ -94,9 +118,9 @@ module.exports = function (grunt) { files: [ { expand: true, - cwd: './server/', + cwd: __dirname + '/server/', src: ['**/*.js'], - dest: './dist/server/' + dest: __dirname + '/dist/server/' } ] } diff --git a/package.json b/package.json index e5aab65..4d65c53 100644 --- a/package.json +++ b/package.json @@ -31,16 +31,23 @@ "grunt-contrib-copy": "^1.0.0", "grunt-eslint": "^19.0.0", "grunt-webpack": "^2.0.1", - "webpack": "^2.2.1" + "webpack": "^2.3.2" }, "dependencies": { - "bootstrap": "^4.0.0-alpha.6", + "css-loader": "^0.27.3", "express": "^4.14.1", "mysql": "^2.13.0", "oidc-client": "^1.3.0-beta.3", + "postcss-cssnext": "^2.10.0", + "postcss-each": "^0.9.3", + "postcss-import": "^9.1.0", + "postcss-loader": "^1.3.3", + "postcss-mixins": "^5.4.1", "react": "^15.4.2", "react-dom": "^15.4.2", "react-router-dom": "^4.0.0-beta.6", - "semver": "^5.3.0" + "react-toolbox": "^2.0.0-beta.7", + "semver": "^5.3.0", + "style-loader": "^0.16.0" } }