Fixes after rebasing on master

This commit is contained in:
6ea86b96 2017-06-14 13:49:37 +07:00
parent e5260612d6
commit 28ea648215
3 changed files with 232 additions and 406 deletions

612
ui/package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -32,19 +32,6 @@ module.exports = {
loaders: ["eslint"],
// define an include so we check just the files we need
include: PATHS.app
}
],
noParse: /node_modules\/localforage\/dist\/localforage.js/,
loaders: [
{ test: /\.css$/, loader: "style!css" },
{
test: /\.jsx?$/,
loader: 'babel',
exclude: /node_modules/,
query: {
cacheDirectory: true,
presets:[ 'es2015', 'react', 'stage-2' ]
}
},
{
test: /\.css$/,

View file

@ -40,19 +40,6 @@ module.exports = {
loaders: ["eslint"],
// define an include so we check just the files we need
include: PATHS.app
}
],
noParse: /node_modules\/localforage\/dist\/localforage.js/,
loaders: [
{ test: /\.css$/, loader: "style!css" },
{
test: /\.jsx?$/,
loader: 'babel',
exclude: /node_modules/,
query: {
cacheDirectory: true,
presets:[ 'es2015', 'react', 'stage-2' ]
}
},
{
test: /\.css$/,