File tree Expand file tree Collapse file tree 4 files changed +6575
-10078
lines changed Expand file tree Collapse file tree 4 files changed +6575
-10078
lines changed Original file line number Diff line number Diff line change 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
43RUN mkdir /opt/conditional
54
@@ -8,15 +7,14 @@ WORKDIR /opt/conditional
87RUN 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-
1410COPY package.json package-lock.json /opt/conditional/
1511
12+ RUN npm ci
13+
1614COPY build*.js /opt/conditional
1715COPY frontend /opt/conditional/frontend
1816
19- RUN npm ci && npm run build
17+ RUN npm run build
2018
2119FROM docker.io/python:3.12-slim-bookworm
2220MAINTAINER Computer Science House <webmaster@csh.rit.edu>
Original file line number Diff line number Diff 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 : / \. j s $ / ,
39- loader : 'babel-loader' ,
40- exclude : / n o d e _ m o d u l e s / ,
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 : / b o o t s t r a p - m a t e r i a l - d a t e t i m e p i c k e r / ,
49- loader : 'imports?moment'
55+ use : {
56+ loader : 'imports?moment'
57+ }
5058 } ,
5159 {
5260 test : / b o o t s t r a p - s w e e t a l e r t .* $ / ,
53- loader : 'babel-loader' ,
54- query : babelQuery
61+ use : {
62+ loader : 'babel-loader' ,
63+ query : {
64+ query : babelQuery
65+ }
66+ }
5567 } ,
5668 ]
5769 } ,
You can’t perform that action at this time.
0 commit comments