Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: node_js
node_js:
- "7.0"
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
"eslint-plugin-react": "^7.0.1"
},
"dependencies": {
"@webpack-blocks/babel6": "^0.4.1",
"@webpack-blocks/css-modules": "^0.4.0",
"@webpack-blocks/dev-server2": "^0.4.0",
"@webpack-blocks/extract-text2": "^0.4.0",
Expand Down
1 change: 1 addition & 0 deletions src/lib/prerender.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default function prerender(config, params) {

require('babel-register')({
babelrc: false,
ignore: false,
...createBabelConfig(config, { modules: 'commonjs' })
});

Expand Down
20 changes: 11 additions & 9 deletions src/lib/webpack-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
addPlugins,
setDevTool
} from '@webpack-blocks/webpack2';
import babel from '@webpack-blocks/babel6';
import devServer from '@webpack-blocks/dev-server2';
import ExtractTextPlugin from 'extract-text-webpack-plugin';
import autoprefixer from 'autoprefixer';
Expand Down Expand Up @@ -97,14 +96,17 @@ export default env => {
}),

// ES2015
babel({
include(filepath) {
if (filepath.indexOf(src('.'))===0 || filepath.indexOf(resolve(__dirname, '../..'))===0 || filepath.split(/[/\\]/).indexOf('node_modules')===-1) return true;
let manifest = resolve(filepath.replace(/(.*([\/\\]node_modules|\.\.)[\/\\](@[^\/\\]+[\/\\])?[^\/\\]+)([\/\\].*)?$/g, '$1'), 'package.json'),
pkg = readJson(manifest) || {};
return !!(pkg.module || pkg['jsnext:main']);
},
...createBabelConfig(env)
customConfig({
module: {
loaders: [
{
enforce: 'pre',
test: /\.jsx?$/,
loader: 'babel-loader',
options: createBabelConfig(env)
}
]
}
}),

// automatic async components :)
Expand Down