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.

Sign up for GitHub

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

Update dependencies #33

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Update dependencies #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11ce9b4
package.json: Update node version in engines
nezlobnaya Mar 6, 2024
f46b605
package.json: Replace node-saas with sass; Run dependencies upgrade w…
nezlobnaya Mar 6, 2024
b96d681
package.json: Run core-js upgrade with backward-compatible features
nezlobnaya Mar 6, 2024
18adf9a
Run major dependencies update
nezlobnaya Mar 6, 2024
9d3445d
webpack: Update css-loader syntax
nezlobnaya Mar 6, 2024
ef7258a
Dockerfile: Update image, instructions
nezlobnaya Mar 6, 2024
ff9a822
README.md: Update docker compose syntax
nezlobnaya Mar 6, 2024
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
12 changes: 7 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
FROM node:13-alpine
FROM node:20-alpine

ENV INSTALL_PATH /app
ENV PATH $INSTALL_PATH/node_modules/.bin:$PATH

ADD package.json yarn.lock /tmp/
RUN cd /tmp && yarn install
RUN mkdir -p $INSTALL_PATH && cp -a /tmp/node_modules $INSTALL_PATH
COPY package.json yarn.lock /tmp/
RUN cd /tmp && yarn install --frozen-lockfile \
&& yarn cache clean \
&& mkdir -p $INSTALL_PATH && cp -a /tmp/node_modules $INSTALL_PATH

ADD . $INSTALL_PATH

COPY . $INSTALL_PATH

WORKDIR $INSTALL_PATH

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ There is no way in LibCal to host templates externally so we will just use this
Using an nginx proxy we can develop our styles and JS locally in realtime. To bring up the local proxy do the following:

```
docker-compose run compile
docker-compose up dev
docker compose run compile
docker compose up dev
# Visit localhost:8080
```

Expand Down
26 changes: 13 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
"build:prod": "NODE_ENV=${NODE_ENV:-production} yarn run build --mode=production"
},
"devDependencies": {
"@babel/core": "^7.7.7",
"@babel/plugin-transform-runtime": "^7.7.6",
"@babel/preset-env": "^7.7.7",
"babel-loader": "^8.0.6",
"core-js": "^3.6.2",
"css-loader": "^3.4.1",
"extract-loader": "^3.1.0",
"file-loader": "^5.0.2",
"node-sass": "^4.13.0",
"sass-loader": "^8.0.0",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10"
"@babel/core": "^7.24.0",
"@babel/plugin-transform-runtime": "^7.24.0",
"@babel/preset-env": "^7.24.0",
"babel-loader": "^9.1.3",
"core-js": "^3.36.0",
"css-loader": "^6.10.0",
"extract-loader": "^5.1.0",
"file-loader": "^6.2.0",
"sass": "^1.71.1",
"sass-loader": "^14.1.1",
"webpack": "^5.90.3",
"webpack-cli": "^5.1.4"
},
"engines": {
"node": "13"
"node": "20.x"
}
}
5 changes: 4 additions & 1 deletion webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ module.exports = {
loader: 'extract-loader'
},
{
loader: 'css-loader?-url'
loader: 'css-loader',
options: {
url: true,
},
},
{
loader: 'sass-loader'
Expand Down
Loading