Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps-dev): bump @types/webpack from 4.41.26 to 5.28.0 #136

Merged
merged 2 commits into from
Apr 13, 2021
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
59 changes: 48 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@types/chromecast-caf-receiver": "^5.0.12",
"@types/jest": "^26.0.22",
"@types/node": "^14.14.37",
"@types/webpack": "^4.41.25",
"@types/webpack": "^5.28.0",
"@types/webpack-dev-server": "^3.11.3",
"@types/webpack-merge": "^5.0.0",
"@typescript-eslint/eslint-plugin": "^4.22.0",
Expand Down
9 changes: 8 additions & 1 deletion tsconfig-webpack.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
"module": "commonjs",
"target": "es5",
"esModuleInterop": true,
"resolveJsonModule": true
"resolveJsonModule": true,
"allowSyntheticDefaultImports": true,
"types": [
"@types/node",
"@types/webpack",
"@types/webpack-dev-server",
"@types/webpack-merge"
]
}
}
6 changes: 5 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
"baseUrl": "./src",
"paths": {
"~/*": ["./*"]
}
},
"types": [
"@types/node",
"@types/chromecast-caf-receiver"
]
}
}
10 changes: 5 additions & 5 deletions webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import { merge } from 'webpack-merge';
import { CleanWebpackPlugin } from 'clean-webpack-plugin';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import ImageMinimizerPlugin from 'image-minimizer-webpack-plugin';

import packagejson from './package.json';
import version from './package.json';

const common: webpack.Configuration = {
context: path.resolve(__dirname, 'src'),
Expand All @@ -22,6 +21,7 @@ const common: webpack.Configuration = {
extensions: ['.ts', '.js']
},
plugins: [
// @ts-expect-error - Typings mismatch between versions
new CleanWebpackPlugin(),
new HtmlWebpackPlugin({
filename: 'index.html',
Expand Down Expand Up @@ -67,6 +67,7 @@ const common: webpack.Configuration = {
const development: webpack.Configuration = {
mode: 'development',
devtool: 'inline-source-map',
// @ts-expect-error - Typings mismatch between versions
devServer: {
contentBase: path.join(__dirname, 'dist'),
compress: true,
Expand All @@ -78,7 +79,7 @@ const development: webpack.Configuration = {
plugins: [
new DefinePlugin({
PRODUCTION: JSON.stringify(false),
RECEIVERVERSION: JSON.stringify(packagejson.version)
RECEIVERVERSION: JSON.stringify(version)
})
]
};
Expand All @@ -88,13 +89,12 @@ const production: webpack.Configuration = {
plugins: [
new DefinePlugin({
PRODUCTION: JSON.stringify(true),
RECEIVERVERSION: JSON.stringify(packagejson.version)
RECEIVERVERSION: JSON.stringify(version)
})
]
};

module.exports = (
env: string,
argv: { [key: string]: string }
): webpack.Configuration => {
let config;
Expand Down