Skip to content

Commit eb64671

Browse files
committed
update node and webpack a little bit
1 parent 21426b4 commit eb64671

File tree

4 files changed

+6575
-10078
lines changed

4 files changed

+6575
-10078
lines changed

Dockerfile

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
FROM node:16-bookworm AS build-frontend
2-
# I'd love to use a node image but our version of node is too old :)
1+
FROM node:25-bookworm-slim AS build-frontend
32

43
RUN mkdir /opt/conditional
54

@@ -8,15 +7,14 @@ WORKDIR /opt/conditional
87
RUN apt-get -yq update && \
98
apt-get -yq install curl git
109

11-
RUN curl -O -L https://github.com/sass/dart-sass/releases/download/1.93.2/dart-sass-1.93.2-linux-x64.tar.gz && tar -xzvf dart-sass-*.tar.gz
12-
ENV PATH="$PATH:/opt/conditional/dart-sass"
13-
1410
COPY package.json package-lock.json /opt/conditional/
1511

12+
RUN npm ci
13+
1614
COPY build*.js /opt/conditional
1715
COPY frontend /opt/conditional/frontend
1816

19-
RUN npm ci && npm run build
17+
RUN npm run build
2018

2119
FROM docker.io/python:3.12-slim-bookworm
2220
MAINTAINER Computer Science House <[email protected]>

build-webpack.js

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,41 @@ var webpackConfig = {
2929
new webpack.NoErrorsPlugin()
3030
],
3131
resolve: {
32-
root: jsSrc,
33-
extensions: ['', '.js']
32+
modules: [
33+
path.join(__dirname, "frontend/javascript"),
34+
path.join(__dirname, "frontend/node_modules"),
35+
],
3436
},
3537
module: {
36-
loaders: [
38+
rules: [
3739
{
3840
test: /\.js$/,
39-
loader: 'babel-loader',
40-
exclude: /node_modules/,
41-
query: babelQuery
41+
use: {
42+
loader: 'babel-loader',
43+
// exclude: /node_modules/,
44+
query: babelQuery
45+
}
4246
},
4347
{
4448
test: require.resolve("jquery"),
45-
loader: 'expose?$!expose?jQuery'
49+
use: {
50+
loader: 'expose?$!expose?jQuery'
51+
}
4652
},
4753
{
4854
test: /bootstrap-material-datetimepicker/,
49-
loader: 'imports?moment'
55+
use: {
56+
loader: 'imports?moment'
57+
}
5058
},
5159
{
5260
test: /bootstrap-sweetalert.*$/,
53-
loader: 'babel-loader',
54-
query: babelQuery
61+
use: {
62+
loader: 'babel-loader',
63+
query: {
64+
query: babelQuery
65+
}
66+
}
5567
},
5668
]
5769
},

0 commit comments

Comments
 (0)