Skip to content

Commit 1c51027

Browse files
committed
make webpack configs CommonJS-safe for Vercel builds
1 parent 52f91ca commit 1c51027

4 files changed

Lines changed: 16 additions & 20 deletions

File tree

webpack.config.base.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import TerserPlugin from 'terser-webpack-plugin';
44
import webpack from 'webpack';
55

66
import path from 'path';
7-
import {fileURLToPath} from 'url';
87

98
import {commit, releaseChannel, releaseId} from './scripts/release.ts';
109

11-
const __dirname = path.dirname(fileURLToPath(import.meta.url));
10+
const projectRoot = process.cwd();
1211

1312
export const IS_PROD = process.env.NODE_ENV === 'production';
1413

@@ -34,7 +33,7 @@ export const baseConfig: webpack.Configuration = {
3433
mode: IS_PROD ? 'production' : 'development',
3534

3635
output: {
37-
path: path.resolve(__dirname, 'dist'),
36+
path: path.resolve(projectRoot, 'dist'),
3837
filename: '[name].js',
3938
},
4039
node: {
@@ -45,12 +44,12 @@ export const baseConfig: webpack.Configuration = {
4544
resolve: {
4645
extensions: ['.tsx', '.ts', '.js', '.ttf'],
4746
alias: {
48-
src: path.resolve(__dirname, 'src/'),
49-
main: path.resolve(__dirname, 'src/main/'),
50-
ui: path.resolve(__dirname, 'src/renderer/'),
51-
overlay: path.resolve(__dirname, 'src/overlay/'),
52-
web: path.resolve(__dirname, 'src/website/'),
53-
api: path.resolve(__dirname, 'src/api/'),
47+
src: path.resolve(projectRoot, 'src/'),
48+
main: path.resolve(projectRoot, 'src/main/'),
49+
ui: path.resolve(projectRoot, 'src/renderer/'),
50+
overlay: path.resolve(projectRoot, 'src/overlay/'),
51+
web: path.resolve(projectRoot, 'src/website/'),
52+
api: path.resolve(projectRoot, 'src/api/'),
5453
},
5554
},
5655
devtool: IS_PROD ? 'source-map' : 'eval-source-map',

webpack.config.overlay.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@ import webpack from 'webpack';
44
import {merge} from 'webpack-merge';
55

66
import path from 'path';
7-
import {fileURLToPath} from 'url';
87

98
import {baseConfig, hotReloadPlugins} from './webpack.config.base.ts';
109

11-
const __dirname = path.dirname(fileURLToPath(import.meta.url));
10+
const projectRoot = process.cwd();
1211

1312
const overlayConfig: webpack.Configuration = merge(baseConfig, {
1413
entry: {
1514
overlay: './src/overlay/app.tsx',
1615
},
1716
output: {
18-
path: path.resolve(__dirname, 'dist/overlay'),
17+
path: path.resolve(projectRoot, 'dist/overlay'),
1918
publicPath: '/',
2019
},
2120
devServer: {
22-
contentBase: path.join(__dirname, 'dist/overlay'),
21+
contentBase: path.join(projectRoot, 'dist/overlay'),
2322
historyApiFallback: true,
2423
port: 2005,
2524
hot: true,

webpack.config.renderer.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import webpack from 'webpack';
44
import {merge} from 'webpack-merge';
55

66
import path from 'path';
7-
import {fileURLToPath} from 'url';
87

98
import {baseConfig, hotReloadPlugins, IS_PROD} from './webpack.config.base.ts';
109

11-
const __dirname = path.dirname(fileURLToPath(import.meta.url));
10+
const projectRoot = process.cwd();
1211

1312
const rendererConfig: webpack.Configuration = merge(baseConfig, {
1413
target: 'electron-renderer',
@@ -17,7 +16,7 @@ const rendererConfig: webpack.Configuration = merge(baseConfig, {
1716
sentry: './src/shared/sentry/renderer.ts',
1817
},
1918
devServer: {
20-
contentBase: path.join(__dirname, 'dist'),
19+
contentBase: path.join(projectRoot, 'dist'),
2120
historyApiFallback: true,
2221
port: 2003,
2322
hot: true,

webpack.config.website.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@ import webpack from 'webpack';
44
import {merge} from 'webpack-merge';
55

66
import path from 'path';
7-
import {fileURLToPath} from 'url';
87

98
import {baseConfig, hotReloadPlugins} from './webpack.config.base.ts';
109

11-
const __dirname = path.dirname(fileURLToPath(import.meta.url));
10+
const projectRoot = process.cwd();
1211

1312
const websiteConfig: webpack.Configuration = merge(baseConfig, {
1413
entry: {
1514
app: './src/website/app.tsx',
1615
},
1716
output: {
18-
path: path.resolve(__dirname, 'dist/website'),
17+
path: path.resolve(projectRoot, 'dist/website'),
1918
publicPath: '/',
2019
},
2120
devServer: {
22-
contentBase: path.join(__dirname, 'dist/website'),
21+
contentBase: path.join(projectRoot, 'dist/website'),
2322
historyApiFallback: true,
2423
port: 2004,
2524
hot: true,

0 commit comments

Comments
 (0)