Skip to content

Commit 68dae65

Browse files
committed
build(package.json): update depandancy and scss compiler command
1 parent 1d09442 commit 68dae65

File tree

6 files changed

+136
-116
lines changed

6 files changed

+136
-116
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,13 @@ jobs:
4242
run: |
4343
poetry install
4444
45-
- uses: actions/setup-node@v3
45+
- uses: actions/setup-node@v4
4646
with:
47-
node-version: 8
48-
49-
- name: Setup Yarn install
50-
uses: borales/actions-yarn@v4
51-
with:
52-
cmd: install
47+
node-version: '20.x'
48+
49+
- name: install via yarn2
50+
run: |
51+
yarn install --immutable
5352
5453
- name: Run ruff on src
5554
run: |

Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ FROM node:20.11.0-bullseye-slim as node_stage
44
COPY ./yarn.lock yarn.lock
55
COPY ./package.json package.json
66

7-
RUN apt-get update
8-
RUN apt-get install python-pip -y
97

10-
RUN npm install -g yarn
11-
RUN yarn install --dev --frozen-lockfile \
12-
&& rm -rf $HOME/.cache/yarn/*
8+
9+
RUN corepack enable
10+
RUN yarn install --immutable
1311

1412

1513
# [Python Stage for Django web server]

dev.Dockerfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ FROM node:20.11.0-bullseye as node_stage
44
COPY ./yarn.lock yarn.lock
55
COPY ./package.json package.json
66

7-
RUN apt-get update
8-
RUN apt-get install python-pip -y
9-
10-
RUN npm install -g yarn
11-
RUN yarn install --dev --frozen-lockfile
7+
RUN corepack enable
8+
RUN yarn install --immutable
129

1310
# [Python Stage for Django web server]
1411
FROM python:3.10.14-slim-bullseye as python_stage

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
"@babel/plugin-syntax-import-meta": "^7.10.4",
1313
"@babel/plugin-transform-class-properties": "^7.23.2",
1414
"@babel/preset-env": "^7.23.2",
15-
"autoprefixer": "^9.0.0",
15+
"autoprefixer": "^10.4.19",
1616
"babelify": "^10.0.0",
1717
"browserify": "^17.0.0",
1818
"node-sass": "^9.0.0",
19-
"postcss-cli": "^10.0.0"
19+
"postcss": "^8.4.38",
20+
"postcss-cli": "^11.0.0"
2021
},
2122
"dependencies": {
2223
"blueimp-gallery": "^2.44.0",

src/pycontw2016/settings/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ def node_bin(name):
265265
COMPRESS_SCSS_COMPILER_CMD = (
266266
'{node_sass_bin} --include --output-style expanded {paths} '
267267
'--include-path="{node_modules}" "{infile}" "{outfile}" && '
268-
'{postcss_bin} --use "{node_modules}/autoprefixer" '
268+
'{postcss_bin} --use "{node_modules}/autoprefixer/lib/autoprefixer.js" '
269269
'--autoprefixer.browsers "{autoprefixer_browsers}" -r "{outfile}"'
270270
)
271271

0 commit comments

Comments
 (0)