Move webpack configuration in subfolder of client/

Move webpack configuration to a subfolder in the client directory

Remove trailing whitespace

Rename prd.config.js to prod.config.js

Simplify lint:js target path
pull/3300/head
Janneke Janssen 2016-12-19 19:03:14 +01:00 zatwierdzone przez Thibaud Colas
rodzic 87b400d00b
commit 64bb8b2989
4 zmienionych plików z 6 dodań i 6 usunięć

Wyświetl plik

@ -30,7 +30,7 @@ function entryPoints(paths) {
module.exports = function exports() { module.exports = function exports() {
var CLIENT_DIR = path.resolve(__dirname, 'client', 'src'); var CLIENT_DIR = path.resolve(__dirname, '..', 'src');
return { return {
entry: entryPoints('./wagtail/**/static_src/**/app/*.entry.js'), entry: entryPoints('./wagtail/**/static_src/**/app/*.entry.js'),

Wyświetl plik

@ -1,5 +1,5 @@
var webpack = require('webpack'); var webpack = require('webpack');
var base = require('./webpack.base.config'); var base = require('./base.config');
var config = base('development'); var config = base('development');

Wyświetl plik

@ -1,5 +1,5 @@
var webpack = require('webpack'); var webpack = require('webpack');
var base = require('./webpack.base.config'); var base = require('./base.config');
var config = base('production'); var config = base('production');

Wyświetl plik

@ -47,10 +47,10 @@
}, },
"scripts": { "scripts": {
"postinstall": "cd ./client; npm install; cd ..", "postinstall": "cd ./client; npm install; cd ..",
"build": "gulp build; webpack --progress --colors --config webpack.prd.config.js", "build": "gulp build; webpack --progress --colors --config ./client/webpack/prod.config.js",
"watch": "webpack --progress --colors --config webpack.dev.config.js & gulp watch", "watch": "webpack --progress --colors --config ./client/webpack/dev.config.js & gulp watch",
"start": "npm run watch", "start": "npm run watch",
"lint:js": "eslint --max-warnings 16 webpack.*.config.js ./client/src", "lint:js": "eslint --max-warnings 16 ./client",
"lint": "npm run lint:js", "lint": "npm run lint:js",
"test": "npm run test:unit", "test": "npm run test:unit",
"test:unit": "env NODE_PATH=$NODE_PATH:$PWD/client/src mocha --compilers js:babel-core/register client/tests/**/*.test.js", "test:unit": "env NODE_PATH=$NODE_PATH:$PWD/client/src mocha --compilers js:babel-core/register client/tests/**/*.test.js",