IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 02:10:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug: Update react-use-measure dependency to fix docker-build-full f… (#31802)

Browse Source 
* Bug: Update `react-use-measure` dependency to fix docker-build-full failure

* Add #remove-cjs-export to point to the correct branch

* Add git package - update js-builder version
This commit is contained in:
Dimitris Sotirakis 2021-03-12 12:28:54 +02:00 committed by GitHub
parent f7d6244fa2
commit f917c2ab0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -1,10 +1,11 @@
FROM node:14.15.5-alpine3.13 as js-builder FROM node:15.11.0-alpine3.13 as js-builder
WORKDIR /usr/src/app/ WORKDIR /usr/src/app/
COPY package.json yarn.lock ./ COPY package.json yarn.lock ./
COPY packages packages COPY packages packages
RUN apk --no-cache add git
RUN yarn install --pure-lockfile --no-progress RUN yarn install --pure-lockfile --no-progress
COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./ COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./

4
package.json
View File

@ -290,7 +290,7 @@
"slate": "0.47.8", "slate": "0.47.8",
"slate-plain-serializer": "0.7.10", "slate-plain-serializer": "0.7.10",
"tether": "1.4.7", "tether": "1.4.7",
"tether-drop": "https://github.com/torkelo/drop/tarball/master", "tether-drop": "https://github.com/torkelo/drop",
"tinycolor2": "1.4.1", "tinycolor2": "1.4.1",
"tti-polyfill": "0.2.2", "tti-polyfill": "0.2.2",
"uuid": "8.3.0", "uuid": "8.3.0",
@ -299,7 +299,7 @@
}, },
"resolutions": { "resolutions": {
"caniuse-db": "1.0.30000772", "caniuse-db": "1.0.30000772",
"react-use-measure": "https://github.com/mckn/react-use-measure.git#remove-cjs-export" "react-use-measure": "https://github.com/mckn/react-use-measure#remove-cjs-export"
}, },
"workspaces": { "workspaces": {
"packages": [ "packages": [

8
yarn.lock
View File

@ -22202,9 +22202,9 @@ react-transition-group@^4.3.0:
loose-envify "^1.4.0" loose-envify "^1.4.0"
prop-types "^15.6.2" prop-types "^15.6.2"
react-use-measure@2.0.1, "react-use-measure@https://github.com/mckn/react-use-measure.git#remove-cjs-export": react-use-measure@2.0.1, "react-use-measure@https://github.com/mckn/react-use-measure#remove-cjs-export":
version "2.0.3" version "2.0.3"
resolved "https://github.com/mckn/react-use-measure.git#73530149cb2810cc629f73fa680f8681a0f398ca" resolved "https://github.com/mckn/react-use-measure#73530149cb2810cc629f73fa680f8681a0f398ca"
dependencies: dependencies:
debounce "^1.2.0" debounce "^1.2.0"
@ -25058,9 +25058,9 @@ test-value@^3.0.0:
array-back "^2.0.0" array-back "^2.0.0"
typical "^2.6.1" typical "^2.6.1"
"tether-drop@https://github.com/torkelo/drop/tarball/master": "tether-drop@https://github.com/torkelo/drop":
version "1.5.0" version "1.5.0"
resolved "https://github.com/torkelo/drop/tarball/master#6a3eb15b882b416f06e1e7ae04c7e57d08418020" resolved "https://github.com/torkelo/drop#fc83ca88db0076fbf6359cbe1743a9ef0f1ee6e1"
dependencies: dependencies:
tether "^1.1.0" tether "^1.1.0"