Skip to content

Commit 1ee40ea

Browse files
committed
chore: merge master
2 parents f7dcae2 + c22348d commit 1ee40ea

File tree

3 files changed

+21
-19
lines changed

3 files changed

+21
-19
lines changed

config/webpack.config.dev.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ module.exports = {
8080
},
8181
resolve: {
8282
modules: ['node_modules'],
83-
extensions: ['.js', '.elm'],
83+
extensions: ['.js', '.mjs', '.elm'],
8484
},
8585
module: {
8686
strictExportPresence: true,
@@ -93,7 +93,7 @@ module.exports = {
9393
exclude: [/[/\\\\]elm-stuff[/\\\\]/, /[/\\\\]node_modules[/\\\\]/],
9494
include: paths.appSrc,
9595
loader: require.resolve('babel-loader'),
96-
query: {
96+
options: {
9797
presets: [
9898
[
9999
require.resolve('@babel/preset-env'),
@@ -227,6 +227,7 @@ module.exports = {
227227
exclude: [
228228
/\.html$/,
229229
/\.js$/,
230+
/\.mjs$/,
230231
/\.elm$/,
231232
/\.css$/,
232233
/\.scss$/,

config/webpack.config.prod.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ module.exports = {
136136
},
137137
resolve: {
138138
modules: ['node_modules'],
139-
extensions: ['.js', '.elm'],
139+
extensions: ['.js', '.mjs', '.elm'],
140140
},
141141
module: {
142142
strictExportPresence: true,
@@ -146,7 +146,7 @@ module.exports = {
146146
test: /\.js$/,
147147
exclude: [/[/\\\\]elm-stuff[/\\\\]/, /[/\\\\]node_modules[/\\\\]/],
148148
loader: require.resolve('babel-loader'),
149-
query: {
149+
options: {
150150
// Latest stable ECMAScript features
151151
presets: [
152152
[
@@ -275,6 +275,7 @@ module.exports = {
275275
exclude: [
276276
/\.html$/,
277277
/\.js$/,
278+
/\.mjs$/,
278279
/\.elm$/,
279280
/\.css$/,
280281
/\.scss$/,

package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
}
1818
},
1919
"dependencies": {
20-
"@babel/cli": "7.11.6",
21-
"@babel/core": "7.11.6",
22-
"@babel/plugin-transform-runtime": "7.11.5",
23-
"@babel/preset-env": "7.11.5",
24-
"@babel/runtime": "7.11.2",
25-
"assets-webpack-plugin": "5.1.2",
20+
"@babel/cli": "7.12.1",
21+
"@babel/core": "7.12.3",
22+
"@babel/plugin-transform-runtime": "7.12.1",
23+
"@babel/preset-env": "7.12.1",
24+
"@babel/runtime": "7.12.1",
25+
"assets-webpack-plugin": "3.9.12",
2626
"autoprefixer": "10.0.1",
2727
"babel-loader": "8.1.0",
2828
"babel-runtime": "6.26.0",
@@ -49,7 +49,7 @@
4949
"object-assign": "4.1.1",
5050
"optimize-css-assets-webpack-plugin": "5.0.4",
5151
"postcss-flexbugs-fixes": "4.2.1",
52-
"postcss-loader": "4.0.3",
52+
"postcss-loader": "4.0.4",
5353
"postcss-safe-parser": "5.0.2",
5454
"promise": "8.1.0",
5555
"prompt": "1.0.0",
@@ -58,9 +58,9 @@
5858
"sockjs-client": "1.5.0",
5959
"string-replace-loader": "2.3.0",
6060
"strip-ansi": "6.0.0",
61-
"style-loader": "1.2.1",
62-
"uglifyjs-webpack-plugin": "2.2.0",
63-
"url-loader": "4.1.0",
61+
"style-loader": "1.3.0",
62+
"uglifyjs-webpack-plugin": "1.3.0",
63+
"url-loader": "4.1.1",
6464
"webpack": "4.44.2",
6565
"webpack-dev-server": "3.11.0",
6666
"webpack-manifest-plugin": "2.2.0",
@@ -71,19 +71,19 @@
7171
"@commitlint/cli": "11.0.0",
7272
"@commitlint/config-conventional": "11.0.0",
7373
"babel-eslint": "10.1.0",
74-
"commitizen": "4.2.1",
74+
"commitizen": "4.2.2",
7575
"cross-env": "7.0.2",
7676
"cz-conventional-changelog": "3.3.0",
7777
"dir-compare": "2.3.0",
78-
"eslint": "7.10.0",
78+
"eslint": "7.12.0",
7979
"eslint-plugin-prettier": "3.1.4",
8080
"husky": "4.3.0",
81-
"lint-staged": "10.4.0",
82-
"mocha": "8.1.3",
81+
"lint-staged": "10.5.0",
82+
"mocha": "8.2.0",
8383
"nightmare": "3.0.2",
8484
"prettier": "2.1.2",
8585
"rimraf": "3.0.2",
86-
"semantic-release": "17.1.2",
86+
"semantic-release": "17.2.1",
8787
"shelljs": "0.8.3",
8888
"unexpected": "11.15.0"
8989
},

0 commit comments

Comments
 (0)