diff --git a/.gitignore b/.gitignore index 7dbb9268..c341e25c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ npm-debug.log* !.npmignore !.eslintrc !.eslintignore +!.prettierignore example/dist diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..75be5d09 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +.eslintrc +package.json \ No newline at end of file diff --git a/package.json b/package.json index 2275c90f..c17280a1 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "make:lib": "rimraf lib && mkdir lib && npm run make:lib:js && npm run make:lib:css && npm run make:combined-translation-keys", "make:translation-keys": "node scripts/findTranslationKeys.js", "prepublishOnly": "npm run make:lib", - "start": "webpack-dev-server --hot", + "start": "webpack serve --hot", "storybook": "start-storybook -p 9001 -c .storybook", "test": "npm run test:lint && npm run test:pretty && npm run test:js", "test:js": "jest --setupTestFrameworkScriptFile=raf/polyfill --maxWorkers=2", @@ -97,9 +97,9 @@ "rimraf": "3.0.2", "sass-loader": "7.1.0", "style-loader": "2.0.0", - "webpack": "4.46.0", - "webpack-cli": "3.3.12", - "webpack-dev-server": "3.11.2" + "webpack": "5.30.0", + "webpack-cli": "4.6.0", + "webpack-dev-server": "4.0.0-beta.1" }, "peerDependencies": { "react": ">15", diff --git a/webpack.config.js b/webpack.config.js index 37a42304..bdf03791 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -47,7 +47,7 @@ module.exports = { plugins: [new webpack.IgnorePlugin(/vertx/)], devServer: { open: true, - contentBase: './dev', + static: './dev', }, devtool: 'eval-source-map', };