Skip to content

Commit

Permalink
build(package.json): update depandancy and scss compiler command
Browse files Browse the repository at this point in the history
  • Loading branch information
rockleona committed May 31, 2024
1 parent 1d09442 commit 68dae65
Show file tree
Hide file tree
Showing 6 changed files with 136 additions and 116 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@ jobs:
run: |
poetry install
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 8

- name: Setup Yarn install
uses: borales/actions-yarn@v4
with:
cmd: install
node-version: '20.x'

- name: install via yarn2
run: |
yarn install --immutable
- name: Run ruff on src
run: |
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ FROM node:20.11.0-bullseye-slim as node_stage
COPY ./yarn.lock yarn.lock
COPY ./package.json package.json

RUN apt-get update
RUN apt-get install python-pip -y

RUN npm install -g yarn
RUN yarn install --dev --frozen-lockfile \
&& rm -rf $HOME/.cache/yarn/*

RUN corepack enable
RUN yarn install --immutable


# [Python Stage for Django web server]
Expand Down
7 changes: 2 additions & 5 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ FROM node:20.11.0-bullseye as node_stage
COPY ./yarn.lock yarn.lock
COPY ./package.json package.json

RUN apt-get update
RUN apt-get install python-pip -y

RUN npm install -g yarn
RUN yarn install --dev --frozen-lockfile
RUN corepack enable
RUN yarn install --immutable

# [Python Stage for Django web server]
FROM python:3.10.14-slim-bullseye as python_stage
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-transform-class-properties": "^7.23.2",
"@babel/preset-env": "^7.23.2",
"autoprefixer": "^9.0.0",
"autoprefixer": "^10.4.19",
"babelify": "^10.0.0",
"browserify": "^17.0.0",
"node-sass": "^9.0.0",
"postcss-cli": "^10.0.0"
"postcss": "^8.4.38",
"postcss-cli": "^11.0.0"
},
"dependencies": {
"blueimp-gallery": "^2.44.0",
Expand Down
2 changes: 1 addition & 1 deletion src/pycontw2016/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ def node_bin(name):
COMPRESS_SCSS_COMPILER_CMD = (
'{node_sass_bin} --include --output-style expanded {paths} '
'--include-path="{node_modules}" "{infile}" "{outfile}" && '
'{postcss_bin} --use "{node_modules}/autoprefixer" '
'{postcss_bin} --use "{node_modules}/autoprefixer/lib/autoprefixer.js" '
'--autoprefixer.browsers "{autoprefixer_browsers}" -r "{outfile}"'
)

Expand Down
Loading

0 comments on commit 68dae65

Please sign in to comment.