Merge branch 'dev' into fix/commands

This commit is contained in:
Ajay Bura 2022-09-03 21:42:56 +05:30 committed by GitHub
commit 279c9460a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions

1
.npmrc Normal file
View file

@ -0,0 +1 @@
legacy-peer-deps=true

View file

@ -3,7 +3,7 @@ FROM node:17.9.0-alpine3.15 as builder
WORKDIR /src WORKDIR /src
COPY package.json package-lock.json /src/ COPY .npmrc package.json package-lock.json /src/
RUN npm ci RUN npm ci
COPY . /src/ COPY . /src/
RUN npm run build RUN npm run build

4
package-lock.json generated
View file

@ -77,8 +77,8 @@
"webpack-merge": "^5.7.3" "webpack-merge": "^5.7.3"
}, },
"engines": { "engines": {
"node": ">=14.15.0 <=17.9.0", "node": ">=14.15.0",
"npm": ">=6.14.8 <=8.5.5" "npm": ">=6.14.8"
} }
}, },
"node_modules/@ampproject/remapping": { "node_modules/@ampproject/remapping": {

View file

@ -4,8 +4,8 @@
"description": "Yet another matrix client", "description": "Yet another matrix client",
"main": "index.js", "main": "index.js",
"engines": { "engines": {
"npm": ">=6.14.8 <=8.5.5", "npm": ">=6.14.8",
"node": ">=14.15.0 <=17.9.0" "node": ">=14.15.0"
}, },
"scripts": { "scripts": {
"start": "webpack serve --config ./webpack.dev.js --open", "start": "webpack serve --config ./webpack.dev.js --open",