Skip to content

Update to webpack 5 in supervisor frontend #18552

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

Merged
merged 3 commits into from
Aug 22, 2023
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
27 changes: 14 additions & 13 deletions components/supervisor/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,25 @@
"version": "0.0.0",
"dependencies": {
"@gitpod/gitpod-protocol": "0.1.5",
"@gitpod/supervisor-api-grpc": "0.1.5"
"@gitpod/supervisor-api-grpc": "0.1.5",
"crypto-browserify": "3.12.0",
"stream-browserify": "^2.0.1",
"url": "^0.11.1",
"util": "^0.11.1",
"buffer": "^4.3.0",
"process": "^0.11.10"
},
"devDependencies": {
"@babel/core": "^7.10.0",
"@babel/plugin-transform-classes": "^7.10.0",
"@babel/plugin-transform-runtime": "^7.10.0",
"@babel/preset-env": "^7.10.0",
"@types/sharedworker": "^0.0.29",
"@types/trusted-types": "^2.0.0",
"babel-loader": "^8.1.0",
"concurrently": "^5.3.0",
"copy-webpack-plugin": "^6.2.0",
"css-loader": "^0.28.11",
"source-map-loader": "^1.1.0",
"style-loader": "^0.23.1",
"concurrently": "^6.2.1",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.8.1",
"source-map-loader": "^4.0.1",
"style-loader": "^3.3.3",
"typescript": "~4.4.2",
"webpack": "^4.40.0",
"webpack-cli": "^3.1.1"
"webpack": "^5.37.1",
"webpack-cli": "^4.7.0"
},
"scripts": {
"build": "tsc && webpack --mode=production",
Expand Down
4 changes: 2 additions & 2 deletions components/supervisor/frontend/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"rootDir": "src",
"outDir": "lib",
"module": "commonjs",
"target": "es6",
"target": "ES2021",
"lib": [
"es6",
"dom"
Expand All @@ -17,4 +17,4 @@
"include": [
"src"
]
}
}
44 changes: 13 additions & 31 deletions components/supervisor/frontend/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@

// @ts-check

const webpack = require("webpack");
const path = require("path");
const CopyWebpackPlugin = require("copy-webpack-plugin");

module.exports = {
target: "web",
entry: {
main: path.resolve(__dirname, "lib/index.js"),
},
Expand All @@ -24,44 +26,24 @@ module.exports = {
test: /\.css$/i,
use: ["style-loader", "css-loader"],
},
{
test: /\\.js$/,
enforce: "pre",
loader: "source-map-loader",
},
{
test: /\.js$/,
// include only es6 dependencies to transpile them to es5 classes
include: /vscode-ws-jsonrpc|vscode-jsonrpc|vscode-languageserver-protocol|vscode-languageserver-types/,
use: {
loader: "babel-loader",
options: {
presets: ["@babel/preset-env"],
plugins: [
// reuse runtime babel lib instead of generating it in each js file
"@babel/plugin-transform-runtime",
// ensure that classes are transpiled
"@babel/plugin-transform-classes",
],
// see https://github.com/babel/babel/issues/8900#issuecomment-431240426
sourceType: "unambiguous",
cacheDirectory: true,
},
},
},
],
},
node: {
fs: "empty",
child_process: "empty",
net: "empty",
crypto: true,
tls: "empty",
resolve: {
fallback: {
crypto: require.resolve("crypto-browserify"),
stream: require.resolve("stream-browserify"),
url: require.resolve("url"),
util: require.resolve("util"),
},
},
devtool: "source-map",
plugins: [
new CopyWebpackPlugin({
patterns: [{ from: "public", to: "." }],
}),
new webpack.ProvidePlugin({
process: "process/browser",
Buffer: ["buffer", "Buffer"],
}),
],
};
Loading