This repository was archived by the owner on Oct 1, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +5
-15
lines changed Expand file tree Collapse file tree 2 files changed +5
-15
lines changed Original file line number Diff line number Diff line change @@ -18,9 +18,7 @@ const defaultOptions = {
1818 {
1919 loader : require . resolve ( 'babel-loader' ) ,
2020 options : {
21- presets : [ 'babel-preset-env' , 'babel-preset-react' ] . map (
22- require . resolve
23- ) ,
21+ presets : [ 'babel-preset-env' , 'babel-preset-react' ] . map ( require . resolve ) ,
2422 } ,
2523 } ,
2624 ] ,
@@ -63,16 +61,8 @@ const preprocessor = (options = {}) => {
6361 }
6462
6563 // user can override the default options
66- let webpackOptions = Object . assign (
67- { } ,
68- defaultOptions . webpackOptions ,
69- options . webpackOptions
70- )
71- let watchOptions = Object . assign (
72- { } ,
73- defaultOptions . watchOptions ,
74- options . watchOptions
75- )
64+ let webpackOptions = Object . assign ( { } , defaultOptions . webpackOptions , options . webpackOptions )
65+ let watchOptions = Object . assign ( { } , defaultOptions . watchOptions , options . watchOptions )
7666
7767 // we're provided a default output path that lives alongside Cypress's
7868 // app data files so we don't have to worry about where to put the bundled
Original file line number Diff line number Diff line change 2121 "ban" : " ban" ,
2222 "deps" : " deps-ok && dependency-check --no-dev ." ,
2323 "license" : " license-checker --production --onlyunknown --csv" ,
24- "lint" : " prettier- eslint --write ' *.js' " ,
24+ "lint" : " eslint --fix *.js" ,
2525 "pretest" : " npm run lint" ,
2626 "secure" : " nsp check" ,
2727 "size" :
4040 "deps-ok" : " 1.2.1" ,
4141 "dont-crack" : " 1.2.1" ,
4242 "eslint" : " 4.6.1" ,
43- "eslint-plugin-cypress-dev" : " 1.0.2 " ,
43+ "eslint-plugin-cypress-dev" : " 1.1.1 " ,
4444 "eslint-plugin-mocha" : " 4.11.0" ,
4545 "github-post-release" : " 1.13.1" ,
4646 "license-checker" : " 13.0.3" ,
You can’t perform that action at this time.
0 commit comments