Upgrade node to 16.6, upgrade yarn to 3.0.0 (#17)

This commit is contained in:
Simon J
2021-08-13 19:11:58 +10:00
committed by GitHub
parent 96d283d35e
commit 66b6f24e61
7 changed files with 8302 additions and 5470 deletions

7
.gitignore vendored
View File

@@ -3,3 +3,10 @@
build
ignore
node_modules
.yarn/*
!.yarn/patches
!.yarn/releases
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
.pnp.*

2
.nvmrc
View File

@@ -1 +1 @@
14.15.4
16.6.2

631
.yarn/releases/yarn-berry.cjs vendored Executable file

File diff suppressed because one or more lines are too long

3
.yarnrc.yml Normal file
View File

@@ -0,0 +1,3 @@
nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-berry.cjs

View File

@@ -1,4 +1,4 @@
FROM node:14.15-alpine as build
FROM node:16.6-alpine as build
WORKDIR /bonob
@@ -10,14 +10,21 @@ COPY package.json .
COPY register.js .
COPY tsconfig.json .
COPY yarn.lock .
COPY .yarnrc.yml .
COPY .yarn/releases ./.yarn/releases
RUN yarn install && \
RUN apk add --no-cache --update --virtual .gyp \
vips-dev \
python3 \
make \
g++ && \
yarn install --immutable && \
yarn test --no-cache && \
yarn build
FROM node:14.15-alpine
FROM node:16.6-alpine
ENV BONOB_PORT=4534
@@ -28,10 +35,11 @@ WORKDIR /bonob
COPY package.json .
COPY yarn.lock .
COPY --from=build /bonob/build/src/* ./
COPY --from=build /bonob/node_modules ./node_modules
COPY web web
COPY src/Sonoswsdl-1.19.4-20190411.142401-3.wsdl /bonob/Sonoswsdl-1.19.4-20190411.142401-3.wsdl
RUN yarn install --prod
RUN apk add --no-cache --update vips
USER nobody

View File

@@ -24,7 +24,7 @@
"soap": "^0.37.0",
"ts-md5": "^1.2.7",
"typescript": "^4.1.3",
"underscore":"^1.12.1",
"underscore": "^1.12.1",
"uuid": "^8.3.2",
"winston": "^3.3.3",
"x2js": "^3.4.1"
@@ -48,8 +48,8 @@
"scripts": {
"clean": "rm -Rf build",
"build": "tsc",
"dev": "BONOB_PORT=4000 BONOB_URL=http://$(hostname):4000 BONOB_SONOS_SERVICE_NAME=bonobDev BONOB_SONOS_DEVICE_DISCOVERY=true BONOB_SONOS_AUTO_REGISTER=false nodemon ./src/app.ts",
"register-dev": "ts-node ./src/register.ts http://$(hostname):4000",
"test": "jest"
"dev": "BONOB_SONOS_SERVICE_NAME=bonobDev BONOB_SONOS_DEVICE_DISCOVERY=true BONOB_SONOS_AUTO_REGISTER=false nodemon ./src/app.ts",
"register-dev": "ts-node ./src/register.ts http://$(hostname):4534",
"test": "jest --testPathIgnorePatterns=build"
}
}

13105
yarn.lock

File diff suppressed because it is too large Load Diff