Skip to content

Commit

Permalink
Consistent semver usage of @clr/ui dependency (#2132)
Browse files Browse the repository at this point in the history
* Consistent semver usage of @clr/ui dependency

Dockerfile and package.json now use the same major Clarity version.

* Improve crl ui import
  • Loading branch information
antgamdia committed Oct 29, 2020
1 parent 7259335 commit f0d8b77
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 0 additions & 2 deletions dashboard/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ COPY package.json yarn.lock /app/
RUN yarn install --frozen-lockfile

RUN mkdir /app/src
RUN curl -L https://unpkg.com/@bitnami/hex@3.2.0/dist/hex.min.css > /app/src/hex.min.css
RUN curl -L https://unpkg.com/@clr/ui@4.0.1/clr-ui.min.css > /app/src/clr-ui.min.css
COPY . /app
RUN yarn run prettier-check && yarn run ts-compile-check
RUN yarn run build
Expand Down
3 changes: 2 additions & 1 deletion dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
"dependencies": {
"@clr/city": "^1.1.0",
"@clr/core": "^4.0.1",
"@clr/icons": "^4.0.4",
"@clr/react": "^4.0.1",
"@clr/ui": "^2.3.4",
"@clr/ui": "^4.0.1",
"@types/diff": "^4.0.2",
"@types/js-yaml": "^3.10.1",
"@types/json-schema": "^7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion dashboard/src/components/Layout/Clarity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import {
import "@clr/core/icon/register.js";
import * as React from "react";

import "../../clr-ui.min.css";
import "@clr/ui/clr-ui.min.css";

Icons.addIcons(
angleIcon,
Expand Down
13 changes: 9 additions & 4 deletions dashboard/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1257,6 +1257,11 @@
css-vars-ponyfill "^2.3.2"
normalize.css "^8.0.1"

"@clr/icons@^4.0.4":
version "4.0.4"
resolved "https://registry.yarnpkg.com/@clr/icons/-/icons-4.0.4.tgz#36e447116940eed708a915e4f9a1d8ce3390dc06"
integrity sha512-1snMF963n5CTWhE3FKbk/sLsGMGastLqzyRDT4YjNt4H/9b3sv+z9svkoptmUK8j+m52ByORcnKtf8711XDNHQ==

"@clr/react@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@clr/react/-/react-4.0.1.tgz#7c1921cb41c2a12151b16b41bc43fef6ffee9f0d"
Expand All @@ -1268,10 +1273,10 @@
"@clr/city" "^1.1.0"
normalize.css "^8.0.1"

"@clr/ui@^2.3.4":
version "2.4.4"
resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-2.4.4.tgz#f120dfa5f440634e556db14bbebe596488cfba6a"
integrity sha512-u164Mkwb7Jb4nwQhF1r28rEEqNbnVIAnrAsG/4ef1LrHGOJCFychswXTNYy8f9zpNixX6GZwgq6TzIrFGsRcfw==
"@clr/ui@^4.0.1":
version "4.0.4"
resolved "https://registry.yarnpkg.com/@clr/ui/-/ui-4.0.4.tgz#dcdeb012abe99bd0873867ffb83a98d328b64dcf"
integrity sha512-9lCtH/PkUZaZDKj2PsIxOC7he4PXrbpJCsUC8gcQZm7sYNLRcHPBEaUAPHAA7SBf+6+v4UxogAZ/N9/lnPndDg==

"@cnakazawa/watch@^1.0.3":
version "1.0.4"
Expand Down

0 comments on commit f0d8b77

Please sign in to comment.