Skip to content

Commit 5d494d5

Browse files
authored
Merge pull request #7990 from owncloud/renovate/devdependencies-(non-major)
chore(deps): update devdependencies (non-major)
2 parents 96c31aa + 275fb46 commit 5d494d5

File tree

8 files changed

+1498
-281
lines changed

8 files changed

+1498
-281
lines changed

Diff for: package.json

+20-9
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"uuid": "*"
3838
},
3939
"devDependencies": {
40-
"@babel/core": "7.20.2",
40+
"@babel/core": "7.20.5",
4141
"@babel/polyfill": "7.12.1",
4242
"@babel/preset-env": "7.20.2",
4343
"@babel/register": "7.18.9",
@@ -50,14 +50,14 @@
5050
"@ownclouders/eslint-config": "workspace:*",
5151
"@ownclouders/prettier-config": "workspace:*",
5252
"@ownclouders/tsconfig": "workspace:*",
53-
"@playwright/test": "1.28.0",
53+
"@playwright/test": "1.28.1",
5454
"@rollup-extras/plugin-copy": "1.5.3",
5555
"@rollup/plugin-alias": "4.0.2",
56-
"@rollup/plugin-babel": "6.0.2",
57-
"@rollup/plugin-commonjs": "23.0.2",
56+
"@rollup/plugin-babel": "6.0.3",
57+
"@rollup/plugin-commonjs": "23.0.3",
5858
"@rollup/plugin-html": "1.0.1",
5959
"@rollup/plugin-inject": "5.0.2",
60-
"@rollup/plugin-json": "5.0.1",
60+
"@rollup/plugin-json": "5.0.2",
6161
"@rollup/plugin-node-resolve": "15.0.1",
6262
"@rollup/plugin-terser": "0.1.0",
6363
"@types/jest": "27.5.2",
@@ -76,7 +76,7 @@
7676
"cucumber-html-reporter": "5.5.0",
7777
"depcheck": "1.4.3",
7878
"ejs": "3.1.8",
79-
"eslint": "8.27.0",
79+
"eslint": "8.28.0",
8080
"flush-promises": "1.0.2",
8181
"focus-trap": "6.9.4",
8282
"focus-trap-vue": "1.1.1",
@@ -94,20 +94,20 @@
9494
"node-fetch": "2.6.7",
9595
"pino": "7.11.0",
9696
"pino-pretty": "7.6.1",
97-
"playwright": "1.28.0",
97+
"playwright": "1.28.1",
9898
"postcss": "8.4.19",
9999
"qs": "6.11.0",
100100
"react": "17.0.2",
101101
"requirejs": "2.3.6",
102-
"rollup": "3.3.0",
102+
"rollup": "3.5.0",
103103
"rollup-plugin-delete": "2.0.0",
104104
"rollup-plugin-gzip": "3.1.0",
105105
"rollup-plugin-livereload": "2.0.5",
106106
"rollup-plugin-modify": "3.0.0",
107107
"rollup-plugin-polyfill-node": "0.11.0",
108108
"rollup-plugin-postcss": "4.0.2",
109109
"rollup-plugin-progress": "1.1.2",
110-
"rollup-plugin-serve": "2.0.1",
110+
"rollup-plugin-serve": "2.0.2",
111111
"rollup-plugin-ts": "3.0.2",
112112
"rollup-plugin-visualizer": "5.8.3",
113113
"rollup-plugin-vue": "5.1.9",
@@ -128,7 +128,18 @@
128128
"node": "16.18.1"
129129
},
130130
"pnpm": {
131+
"packageExtensions": {
132+
"@adobe/leonardo-contrast-colors": {
133+
"dependencies": {
134+
"d3": "^5.12.0",
135+
"d3-cam02": "^0.1.5",
136+
"d3-hsluv": "^0.1.2",
137+
"d3-hsv": "^0.1.0"
138+
}
139+
}
140+
},
131141
"patchedDependencies": {
142+
"@adobe/[email protected]": "patches/@[email protected]",
132143
133144
}
134145
}

Diff for: packages/design-system/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"not OperaMobile > 0"
4242
],
4343
"devDependencies": {
44-
"@adobe/leonardo-contrast-colors": "1.0.0-alpha.8",
44+
"@adobe/leonardo-contrast-colors": "1.0.0-alpha.16",
4545
"@babel/core": "^7.16.5",
4646
"@babel/plugin-proposal-class-properties": "^7.16.5",
4747
"@babel/plugin-proposal-object-rest-spread": "^7.16.5",
@@ -93,7 +93,7 @@
9393
"rimraf": "^3.0.2",
9494
"sass-loader": "^10.1.0",
9595
"sass-resources-loader": "^2.0.1",
96-
"sass": "1.32.12",
96+
"sass": "1.56.1",
9797
"semver": "^7.1.3",
9898
"shelljs": "^0.8.3",
9999
"style-dictionary": "^3.0.0-rc.8",

Diff for: packages/design-system/src/components/OcButton/OcButton.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export default {
179179
@import '../../styles/styles';
180180
181181
@mixin oc-button-gap($factor) {
182-
gap: round($oc-space-small * $factor / 2) * 2;
182+
gap: round(calc($oc-space-small * $factor / 2)) * 2;
183183
}
184184
185185
@mixin oc-button-line-height($factor) {

Diff for: packages/design-system/src/components/OcProgressPie/OcProgressPie.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ $default-size: 64px;
7070
7171
// Shadow
7272
&::after {
73-
border: $default-size / 10 solid var(--oc-color-swatch-passive-hover);
73+
border: calc($default-size / 10) solid var(--oc-color-swatch-passive-hover);
7474
border-radius: 50%;
7575
box-sizing: border-box;
7676
content: '';
@@ -80,7 +80,7 @@ $default-size: 64px;
8080
}
8181
8282
&-container {
83-
clip: rect(0, $default-size, $default-size, $default-size / 2);
83+
clip: rect(0, $default-size, $default-size, calc($default-size / 2));
8484
height: 100%;
8585
left: 0;
8686
position: absolute;
@@ -89,10 +89,10 @@ $default-size: 64px;
8989
9090
&::before,
9191
&::after {
92-
border: ($default-size / 10) solid var(--oc-color-swatch-brand-default);
92+
border: calc($default-size / 10) solid var(--oc-color-swatch-brand-default);
9393
border-color: var(--oc-color-swatch-brand-default);
9494
border-radius: 50%;
95-
clip: rect(0, $default-size / 2, $default-size, 0);
95+
clip: rect(0, calc($default-size / 2), $default-size, 0);
9696
content: '';
9797
display: block;
9898
height: 100%;

Diff for: packages/design-system/src/components/OcSpinner/OcSpinner.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ export default {
5555
@import '../../styles/styles';
5656
5757
@mixin oc-spinner-size($factor) {
58-
height: round($oc-size-icon-default * $factor / 2) * 2;
59-
width: round($oc-size-icon-default * $factor / 2) * 2;
58+
height: round(calc($oc-size-icon-default * $factor / 2)) * 2;
59+
width: round(calc($oc-size-icon-default * $factor / 2)) * 2;
6060
}
6161
6262
.oc-spinner {

Diff for: packages/web-app-skeleton/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve": "SERVER=true rollup -c -w"
1010
},
1111
"devDependencies": {
12-
"rollup": "3.3.0",
12+
"rollup": "3.5.0",
1313
"rollup-plugin-serve": "1.1.0",
1414
"rollup-plugin-vue": "5.1.9",
1515
"vue": "2.7.14"

Diff for: patches/@[email protected]

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
diff --git a/backgroundcolor.mjs b/backgroundcolor.mjs
2+
index 69acd17a5c35eb436f79b0a56bf26e8f89be4aa2..06790f68156a06de270c5e165baff6e5ace8858e 100644
3+
--- a/backgroundcolor.mjs
4+
+++ b/backgroundcolor.mjs
5+
@@ -10,9 +10,9 @@ OF ANY KIND, either express or implied. See the License for the specific languag
6+
governing permissions and limitations under the License.
7+
*/
8+
9+
-import { hsluvArray, convertColorValue, createScale, removeDuplicates } from "./utils";
10+
+import { hsluvArray, convertColorValue, createScale, removeDuplicates } from "./utils.mjs";
11+
12+
-import { Color } from "./color";
13+
+import { Color } from "./color.mjs";
14+
15+
class BackgroundColor extends Color {
16+
get backgroundColorScale() {
17+
diff --git a/color.mjs b/color.mjs
18+
index 2a60cf4eb6d7be27b780ae074756f5c7e9e75fa3..0555af9945be890b47548897c9571bfcfe3c0820 100644
19+
--- a/color.mjs
20+
+++ b/color.mjs
21+
@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
22+
*/
23+
24+
import chroma from "chroma-js";
25+
-import { colorSpaces, createScale } from "./utils";
26+
+import { colorSpaces, createScale } from "./utils.mjs";
27+
28+
class Color {
29+
constructor({ name, colorKeys, colorspace = 'RGB', ratios, smooth = false, output = 'HEX', saturation = 100 }) {
30+
diff --git a/index.mjs b/index.mjs
31+
index d2884cd9563c435627ef7213972af578864b1544..09b2b7f8f66f92f984b38970b228a4975518c60f 100644
32+
--- a/index.mjs
33+
+++ b/index.mjs
34+
@@ -11,12 +11,12 @@ governing permissions and limitations under the License.
35+
*/
36+
37+
import chroma from "chroma-js";
38+
-import { extendChroma } from "./chroma-plus";
39+
-import { convertColorValue, createScale, getContrast as contrast, luminance, minPositive, ratioName } from "./utils";
40+
+import { extendChroma } from "./chroma-plus.mjs";
41+
+import { convertColorValue, createScale, getContrast as contrast, luminance, minPositive, ratioName } from "./utils.mjs";
42+
43+
-import { Color } from "./color";
44+
-import { BackgroundColor } from "./backgroundcolor";
45+
-import { Theme } from "./theme";
46+
+import { Color } from "./color.mjs";
47+
+import { BackgroundColor } from "./backgroundcolor.mjs";
48+
+import { Theme } from "./theme.mjs";
49+
50+
extendChroma(chroma);
51+
52+
diff --git a/package.json b/package.json
53+
index 18f901f655cf21204b5f27a33d5fa38085a7f2a2..6e8beece9d16fc4185d11dd8fc48bc83c54ac080 100644
54+
--- a/package.json
55+
+++ b/package.json
56+
@@ -3,11 +3,13 @@
57+
"version": "1.0.0-alpha.16",
58+
"description": "Generate colors based on a desired contrast ratio",
59+
"repository": "[email protected]:adobe/leonardo.git",
60+
- "main": "./index.js",
61+
- "type": "module",
62+
+ "main": "./dist/index.js",
63+
+ "module": "./index.mjs",
64+
+ "type": "commonjs",
65+
"exports": {
66+
".": {
67+
- "default": "./index.js"
68+
+ "import": "./index.mjs",
69+
+ "require": "./dist/index.js"
70+
}
71+
},
72+
"jest": {
73+
@@ -36,6 +38,10 @@
74+
"chroma-js": "^2.4.2",
75+
"ciebase": "^0.1.1",
76+
"ciecam02": "^0.4.6",
77+
+ "d3": "^5.12.0",
78+
+ "d3-cam02": "^0.1.5",
79+
+ "d3-hsluv": "^0.1.2",
80+
+ "d3-hsv": "^0.1.0",
81+
"hsluv": "^0.1.0"
82+
},
83+
"devDependencies": {
84+
diff --git a/theme.mjs b/theme.mjs
85+
index 63911e49bda6c20dbcb96e88b6d9f04056d5ca01..3ec32a5a9846b4bcade53f84ef25b9e0ed73f9e9 100644
86+
--- a/theme.mjs
87+
+++ b/theme.mjs
88+
@@ -12,9 +12,9 @@ governing permissions and limitations under the License.
89+
90+
import chroma from "chroma-js";
91+
92+
-import { colorSpaces, convertColorValue, multiplyRatios, ratioName, round, searchColors } from "./utils";
93+
+import { colorSpaces, convertColorValue, multiplyRatios, ratioName, round, searchColors } from "./utils.mjs";
94+
95+
-import { BackgroundColor } from "./backgroundcolor";
96+
+import { BackgroundColor } from "./backgroundcolor.mjs";
97+
98+
class Theme {
99+
constructor({ colors, backgroundColor, lightness, contrast = 1, saturation = 100, output = 'HEX', formula = 'wcag2' }) {
100+
diff --git a/utils.mjs b/utils.mjs
101+
index 7724bd2bd4bfaf03817e2854ebc67a461f264448..21a427aae31b752ccdb26fa924c3582f2aeee82f 100644
102+
--- a/utils.mjs
103+
+++ b/utils.mjs
104+
@@ -12,7 +12,7 @@ governing permissions and limitations under the License.
105+
106+
import { APCAcontrast, sRGBtoY } from "apca-w3";
107+
import chroma from "chroma-js";
108+
-import { catmullRom2bezier, prepareCurve } from "./curve";
109+
+import { catmullRom2bezier, prepareCurve } from "./curve.mjs";
110+
111+
const colorSpaces = {
112+
CAM02: 'jab',

0 commit comments

Comments
 (0)