Skip to content

Commit

Permalink
Merge pull request #64 from seanparmelee/node10
Browse files Browse the repository at this point in the history
fix build & add node 10
  • Loading branch information
seanparmelee authored May 6, 2020
2 parents bf5bde4 + 03e085d commit 804e729
Show file tree
Hide file tree
Showing 8 changed files with 1,255 additions and 2,338 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: node_js
node_js:
- 9
- 12
- 10
- 8
- 7
- 6
cache: yarn
script:
Expand Down
16 changes: 4 additions & 12 deletions example/webpack1-babel/webpack.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,17 @@ module.exports = {
main: './test/main_test',
},

plugins: [
new webpack.DefinePlugin({ __VALUEA__: 10 }),
],
plugins: [new webpack.DefinePlugin({__VALUEA__: 10})],

output: {
path: path.resolve(__dirname, './dest'),
filename: 'bundle.js',
filename: '[name].js',
},

resolve: {
root: [
path.resolve(__dirname, './src'),
path.resolve(__dirname, './test'),
],
root: [path.resolve(__dirname, './src'), path.resolve(__dirname, './test')],
extensions: ['', '.js'],
modules: [
__dirname,
path.resolve(__dirname, './node_modules'),
],
modules: [__dirname, path.resolve(__dirname, './node_modules')],
},

resolveLoader: {
Expand Down
6 changes: 2 additions & 4 deletions example/webpack2-babel/webpack.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@ module.exports = {
main: './test/main_test',
},

plugins: [
new webpack.DefinePlugin({ __VALUEA__: 10 }),
],
plugins: [new webpack.DefinePlugin({__VALUEA__: 10})],

output: {
path: path.resolve(__dirname, './dest'),
filename: 'bundle.js',
filename: '[name].js',
},

resolve: {
Expand Down
2 changes: 1 addition & 1 deletion example/webpack3-babel/webpack.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = {

output: {
path: path.resolve(__dirname, './dest'),
filename: 'bundle.js',
filename: '[name].js',
},

resolve: {
Expand Down
2 changes: 1 addition & 1 deletion example/webpack4-babel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"jsdom": "^11.7.0",
"karma-jasmine": "^1.1.1",
"karma-jsdom-launcher": "^6.1.3",
"karma-webpack": "^3.0.0",
"karma-webpack": "^4.0.0",
"karma": "^2.0.0",
"webpack": "~4"
}
Expand Down
2 changes: 1 addition & 1 deletion example/webpack4-babel/webpack.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = {

output: {
path: path.resolve(__dirname, './dest'),
filename: 'bundle.js',
filename: '[name].js',
},

resolve: {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"prettier": "^1.11.1",
"pretty-quick": "^1.4.1",
"source-map-support": "^0.5.4",
"webpack": "^4.5.0",
"webpack-cli": "^2.0.14"
"webpack": "^4.35.0",
"webpack-cli": "^3.3.5"
},
"peerDependencies": {
"webpack": "^1 || ^2 || ^3 || ^4"
Expand Down
Loading

0 comments on commit 804e729

Please sign in to comment.