mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-11-12 13:13:45 +01:00
Linked URL: adapt for yarn; bump node to 24.14.1
This commit is contained in:
@@ -1 +1 @@
|
||||
24.13.0
|
||||
24.14.1
|
||||
|
||||
@@ -2,7 +2,12 @@
|
||||
# Instead run bin/update_build_scripts from
|
||||
# https://github.com/overleaf/internal/
|
||||
|
||||
FROM node:24.13.0 AS base
|
||||
FROM node:24.14.1 AS base
|
||||
|
||||
ENV PATH="/overleaf/node_modules/.bin:$PATH"
|
||||
ENV COREPACK_HOME=/opt/corepack
|
||||
RUN corepack enable && corepack install -g yarn@4.14.1
|
||||
ENV COREPACK_ENABLE_NETWORK=0
|
||||
|
||||
WORKDIR /overleaf/services/linked-url-proxy
|
||||
|
||||
@@ -12,16 +17,16 @@ RUN mkdir /home/node/.config && chown node:node /home/node/.config
|
||||
|
||||
FROM base AS app
|
||||
|
||||
COPY package.json package-lock.json /overleaf/
|
||||
COPY package.json yarn.lock .yarnrc.yml /overleaf/
|
||||
COPY libraries/fetch-utils/package.json /overleaf/libraries/fetch-utils/package.json
|
||||
COPY libraries/logger/package.json /overleaf/libraries/logger/package.json
|
||||
COPY libraries/metrics/package.json /overleaf/libraries/metrics/package.json
|
||||
COPY libraries/o-error/package.json /overleaf/libraries/o-error/package.json
|
||||
COPY libraries/settings/package.json /overleaf/libraries/settings/package.json
|
||||
COPY services/linked-url-proxy/package.json /overleaf/services/linked-url-proxy/package.json
|
||||
COPY patches/ /overleaf/patches/
|
||||
COPY .yarn/patches/ /overleaf/.yarn/patches/
|
||||
|
||||
RUN cd /overleaf && npm ci --quiet
|
||||
RUN cd /overleaf && yarn workspaces focus @overleaf/linked-url-proxy overleaf
|
||||
|
||||
COPY libraries/fetch-utils/ /overleaf/libraries/fetch-utils/
|
||||
COPY libraries/logger/ /overleaf/libraries/logger/
|
||||
|
||||
@@ -50,12 +50,12 @@ clean:
|
||||
|
||||
# Run the linting commands in the scope of the monorepo.
|
||||
# Eslint and prettier (plus some configs) are on the root.
|
||||
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:24.13.0 npm run --silent
|
||||
RUN_LINTING = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(HERE) node:24.14.1 npm run --silent
|
||||
|
||||
RUN_LINTING_CI = docker run --rm --volume $(MONOREPO)/.editorconfig:/overleaf/.editorconfig --volume $(MONOREPO)/.eslintignore:/overleaf/.eslintignore --volume $(MONOREPO)/.eslintrc:/overleaf/.eslintrc --volume $(MONOREPO)/.prettierignore:/overleaf/.prettierignore --volume $(MONOREPO)/.prettierrc:/overleaf/.prettierrc --volume $(MONOREPO)/tsconfig.backend.json:/overleaf/tsconfig.backend.json --volume $(MONOREPO)/services/linked-url-proxy/reports:/overleaf/services/linked-url-proxy/reports $(IMAGE_CI) npm run --silent
|
||||
|
||||
# Same but from the top of the monorepo
|
||||
RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:24.13.0 npm run --silent
|
||||
RUN_LINTING_MONOREPO = docker run --rm -v $(MONOREPO):$(MONOREPO) -w $(MONOREPO) node:24.14.1 npm run --silent
|
||||
|
||||
SHELLCHECK_OPTS = \
|
||||
--shell=bash \
|
||||
|
||||
@@ -2,5 +2,5 @@ linked-url-proxy
|
||||
--env-add=
|
||||
--env-pass-through=
|
||||
--esmock-loader=False
|
||||
--node-version=24.13.0
|
||||
--node-version=24.14.1
|
||||
--public-repo=False
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
services:
|
||||
test_unit:
|
||||
image: node:24.13.0
|
||||
image: node:24.14.1
|
||||
volumes:
|
||||
- .:/overleaf/services/linked-url-proxy
|
||||
- ../../node_modules:/overleaf/node_modules
|
||||
@@ -19,7 +19,7 @@ services:
|
||||
user: node
|
||||
|
||||
test_acceptance:
|
||||
image: node:24.13.0
|
||||
image: node:24.14.1
|
||||
volumes:
|
||||
- .:/overleaf/services/linked-url-proxy
|
||||
- ../../node_modules:/overleaf/node_modules
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
},
|
||||
"version": "0.1.1",
|
||||
"dependencies": {
|
||||
"@overleaf/settings": "*",
|
||||
"@overleaf/logger": "*",
|
||||
"@overleaf/metrics": "*",
|
||||
"@overleaf/settings": "workspace:*",
|
||||
"@overleaf/logger": "workspace:*",
|
||||
"@overleaf/metrics": "workspace:*",
|
||||
"async": "^3.2.5",
|
||||
"express": "^4.22.1",
|
||||
"ipaddr.js": "^2.1.0",
|
||||
|
||||
Reference in New Issue
Block a user