diff --git a/frontend/package.json b/frontend/package.json index 92020f1825..bef0675c57 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -105,7 +105,7 @@ "@penpot/mousetrap": "portal:./vendor/mousetrap", "@penpot/svgo": "penpot/svgo#v3.1", "@penpot/text-editor": "portal:./text-editor", - "@tokens-studio/sd-transforms": "^0.16.1", + "@tokens-studio/sd-transforms": "1.2.11", "compression": "^1.7.5", "date-fns": "^4.1.0", "eventsource-parser": "^3.0.0", @@ -124,7 +124,7 @@ "rxjs": "8.0.0-alpha.14", "sax": "^1.4.1", "source-map-support": "^0.5.21", - "style-dictionary": "4.0.0-prerelease.36", + "style-dictionary": "4.3.3", "tdigest": "^0.1.2", "tinycolor2": "^1.6.0", "ua-parser-js": "2.0.0", diff --git a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs index 02fd0082b5..b4f4c7afbc 100644 --- a/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs +++ b/frontend/src/app/main/ui/workspace/tokens/style_dictionary.cljs @@ -25,7 +25,7 @@ "Initiates the StyleDictionary instance. Setup transforms from tokens-studio used to parse and resolved token values." (do - (sd-transforms/registerTransforms sd) + (sd-transforms/register sd) (.registerFormat sd #js {:name "custom/json" :format (fn [^js res] (.-tokens (.-dictionary res)))}) @@ -192,9 +192,11 @@ config) (build-dictionary [_] - (let [config' (clj->js config)] + (let [platform "json" + config' (clj->js config)] (-> (sd. config') - (.buildAllPlatforms "json") + (.buildAllPlatforms platform) + (p/then #(.getPlatformTokens ^js % platform)) (p/then #(.-allTokens ^js %)))))) (defn resolve-tokens-tree+ diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 753bce59a4..a71eabadc9 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -460,7 +460,7 @@ __metadata: languageName: node linkType: hard -"@bundled-es-modules/glob@npm:^10.3.13": +"@bundled-es-modules/glob@npm:^10.4.2": version: 10.4.2 resolution: "@bundled-es-modules/glob@npm:10.4.2" dependencies: @@ -476,18 +476,27 @@ __metadata: languageName: node linkType: hard -"@bundled-es-modules/memfs@npm:^4.8.1": - version: 4.9.4 - resolution: "@bundled-es-modules/memfs@npm:4.9.4" +"@bundled-es-modules/memfs@npm:^4.9.4": + version: 4.17.0 + resolution: "@bundled-es-modules/memfs@npm:4.17.0" dependencies: - assert: "npm:^2.0.0" + assert: "npm:^2.1.0" buffer: "npm:^6.0.3" events: "npm:^3.3.0" - memfs: "npm:^4.9.3" + memfs: "npm:^4.17.0" path: "npm:^0.12.7" stream: "npm:^0.0.3" util: "npm:^0.12.5" - checksum: 10c0/e3548c14379183fb74aa9a94407c1cdb8587320216fb557c0af7277d2dccf23f10a2edf8726e99f878758730c0c8d71524f77e19b26660a067b01d9afa07c891 + checksum: 10c0/88b573e52afe2f14b0c06f1f4337883ccf3155b7c3f667af8ead248b84ba2743e4eee90eb283ec967a8486576509bb6d42ce1c43714253f70ee23c5e5e24bc73 + languageName: node + linkType: hard + +"@bundled-es-modules/postcss-calc-ast-parser@npm:^0.1.6": + version: 0.1.6 + resolution: "@bundled-es-modules/postcss-calc-ast-parser@npm:0.1.6" + dependencies: + postcss-calc-ast-parser: "npm:^0.1.4" + checksum: 10c0/a42abc7446328a0a0728fa675560d950995c33ed5a997e7e49885bd7ddd575243a892d9834bc311558a1fbf298d55542aad8f60c46aa6766bfc3dc82baa341f0 languageName: node linkType: hard @@ -2434,27 +2443,26 @@ __metadata: languageName: node linkType: hard -"@tokens-studio/sd-transforms@npm:^0.16.1": - version: 0.16.1 - resolution: "@tokens-studio/sd-transforms@npm:0.16.1" +"@tokens-studio/sd-transforms@npm:1.2.11": + version: 1.2.11 + resolution: "@tokens-studio/sd-transforms@npm:1.2.11" dependencies: - "@tokens-studio/types": "npm:^0.4.0" - color2k: "npm:^2.0.1" + "@bundled-es-modules/deepmerge": "npm:^4.3.1" + "@bundled-es-modules/postcss-calc-ast-parser": "npm:^0.1.6" + "@tokens-studio/types": "npm:^0.5.1" colorjs.io: "npm:^0.4.3" - deepmerge: "npm:^4.3.1" expr-eval-fork: "npm:^2.0.2" is-mergeable-object: "npm:^1.1.1" - postcss-calc-ast-parser: "npm:^0.1.4" peerDependencies: - style-dictionary: ^4.0.0-prerelease.27 - checksum: 10c0/496a22026ffa25e3f6d8438a1fb39d67383fa55c89de9ac6759e2dce10a16268f5009e4809d03ceab38597fc02025a90eb1d32083b98a9353feded83831549c9 + style-dictionary: ">=4.3.0 < 6" + checksum: 10c0/58c278a2d738bb2f84e0e01c84d2a96191495440a9a52087cf9ee0e51ae272392cb93d17a3978e1f814e4a4c885aa349227bc0c7f0998a21cfc308988687c0e9 languageName: node linkType: hard -"@tokens-studio/types@npm:^0.4.0": - version: 0.4.0 - resolution: "@tokens-studio/types@npm:0.4.0" - checksum: 10c0/0641385653c94704f63dc5e10699c49bdbb1e1d8cba54af31bf50c3be85056123109bb2fe5091b1ccebaa9eba4c4afce3148a3b850919ed67bc81e3294ae839c +"@tokens-studio/types@npm:^0.5.1": + version: 0.5.2 + resolution: "@tokens-studio/types@npm:0.5.2" + checksum: 10c0/aed7fef091d2f2fefbe4541b8274172e4d0d3e3183daccf6ab40414e2c04afd45f2d2385ae79bb309e59c84a4d22f15a63f0cc8bfba8f0494e77b611594047ad languageName: node linkType: hard @@ -3093,7 +3101,7 @@ __metadata: languageName: node linkType: hard -"assert@npm:^2.0.0": +"assert@npm:^2.1.0": version: 2.1.0 resolution: "assert@npm:2.1.0" dependencies: @@ -3937,13 +3945,6 @@ __metadata: languageName: node linkType: hard -"color2k@npm:^2.0.1": - version: 2.0.3 - resolution: "color2k@npm:2.0.3" - checksum: 10c0/e7c13d212c9d1abb1690e378bbc0a6fb1751e4b02e9a73ba3b2ade9d54da673834597d342791d577d1ce400ec486c7f92c5098f9fa85cd113bcfde57420a2bb9 - languageName: node - linkType: hard - "color@npm:^3.1.3": version: 3.2.1 resolution: "color@npm:3.2.1" @@ -4015,13 +4016,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^8.3.0": - version: 8.3.0 - resolution: "commander@npm:8.3.0" - checksum: 10c0/8b043bb8322ea1c39664a1598a95e0495bfe4ca2fad0d84a92d7d1d8d213e2a155b441d2470c8e08de7c4a28cf2bc6e169211c49e1b21d9f7edc6ae4d9356060 - languageName: node - linkType: hard - "commondir@npm:^1.0.1": version: 1.0.1 resolution: "commondir@npm:1.0.1" @@ -5894,7 +5888,7 @@ __metadata: "@storybook/react-vite": "npm:^8.5.2" "@storybook/test": "npm:^8.5.2" "@storybook/test-runner": "npm:^0.21.0" - "@tokens-studio/sd-transforms": "npm:^0.16.1" + "@tokens-studio/sd-transforms": "npm:1.2.11" "@types/node": "npm:^22.12.0" autoprefixer: "npm:^10.4.20" compression: "npm:^1.7.5" @@ -5946,7 +5940,7 @@ __metadata: shadow-cljs: "npm:2.28.20" source-map-support: "npm:^0.5.21" storybook: "npm:^8.5.2" - style-dictionary: "npm:4.0.0-prerelease.36" + style-dictionary: "npm:4.3.3" svg-sprite: "npm:^2.0.4" tdigest: "npm:^0.1.2" tinycolor2: "npm:^1.6.0" @@ -8284,15 +8278,15 @@ __metadata: languageName: node linkType: hard -"memfs@npm:^4.9.3": - version: 4.14.0 - resolution: "memfs@npm:4.14.0" +"memfs@npm:^4.17.0": + version: 4.17.0 + resolution: "memfs@npm:4.17.0" dependencies: "@jsonjoy.com/json-pack": "npm:^1.0.3" "@jsonjoy.com/util": "npm:^1.3.0" tree-dump: "npm:^1.0.1" tslib: "npm:^2.0.0" - checksum: 10c0/d1de2e4b3c269f5b5f27b63f60bb8ea9ae5800843776e0bed4548f2957dcd55237ac5eab3a5ffe0d561a6be53e42c055a7bc79efc1613563b14e14c287ef3b0a + checksum: 10c0/2901f69e80e1fbefa8aafe994a253fff6f34eb176d8b80d57476311611e516a11ab4dd93f852c8739fe04f2b57d6a4ca7a1828fa0bd401ce631bcac214b3d58b languageName: node linkType: hard @@ -9294,10 +9288,10 @@ __metadata: languageName: node linkType: hard -"path-unified@npm:^0.1.0": - version: 0.1.0 - resolution: "path-unified@npm:0.1.0" - checksum: 10c0/26c314221bcc0ca3ce59b67f50dffb6f37214d294fd9dfeb0219e9f12b93d8852c8525d32be9387011d902d361669a43e22ec419d522055794790222665b2de9 +"path-unified@npm:^0.2.0": + version: 0.2.0 + resolution: "path-unified@npm:0.2.0" + checksum: 10c0/5229bbcbb093b1c76e7a8f568dd7d362bae6bd9348099968252aa17b1ffd86ef845d560a6b483bb2e6a3b2c25a5e8288707b03e41b66b2761aa1e2ba67b07d5b languageName: node linkType: hard @@ -9650,6 +9644,15 @@ __metadata: languageName: node linkType: hard +"prettier@npm:^3.3.3": + version: 3.5.3 + resolution: "prettier@npm:3.5.3" + bin: + prettier: bin/prettier.cjs + checksum: 10c0/3880cb90b9dc0635819ab52ff571518c35bd7f15a6e80a2054c05dbc8a3aa6e74f135519e91197de63705bcb38388ded7e7230e2178432a1468005406238b877 + languageName: node + linkType: hard + "pretty-format@npm:^27.0.2": version: 27.5.1 resolution: "pretty-format@npm:27.5.1" @@ -11430,25 +11433,26 @@ __metadata: languageName: node linkType: hard -"style-dictionary@npm:4.0.0-prerelease.36": - version: 4.0.0-prerelease.36 - resolution: "style-dictionary@npm:4.0.0-prerelease.36" +"style-dictionary@npm:4.3.3": + version: 4.3.3 + resolution: "style-dictionary@npm:4.3.3" dependencies: "@bundled-es-modules/deepmerge": "npm:^4.3.1" - "@bundled-es-modules/glob": "npm:^10.3.13" - "@bundled-es-modules/memfs": "npm:^4.8.1" + "@bundled-es-modules/glob": "npm:^10.4.2" + "@bundled-es-modules/memfs": "npm:^4.9.4" "@zip.js/zip.js": "npm:^2.7.44" chalk: "npm:^5.3.0" change-case: "npm:^5.3.0" - commander: "npm:^8.3.0" + commander: "npm:^12.1.0" is-plain-obj: "npm:^4.1.0" json5: "npm:^2.2.2" patch-package: "npm:^8.0.0" - path-unified: "npm:^0.1.0" + path-unified: "npm:^0.2.0" + prettier: "npm:^3.3.3" tinycolor2: "npm:^1.6.0" bin: style-dictionary: bin/style-dictionary.js - checksum: 10c0/8707b3cced5ee7a858c425b296b53f3b9055f388839ab77ec94f9ed012ca99db43ce28fb540cec1659b92680a2769b1ed24d9af891ea98b9b298895341781f30 + checksum: 10c0/25b66885c80f00993a66916a9b064bf974baef59e387ce26265035dd8f35c55601d0c7d253506b3cea4de9d8c17fa693666ae4e1cea6e380f6a263065c824855 languageName: node linkType: hard