diff --git a/.eslintignore b/.eslintignore index cf60de2eeb..e1850edfd3 100644 --- a/.eslintignore +++ b/.eslintignore @@ -51,3 +51,4 @@ cache uniond ./site/src/lib/rehype-file-tree.ts +result diff --git a/app/app.nix b/app/app.nix index 4e26003c50..b908baadae 100644 --- a/app/app.nix +++ b/app/app.nix @@ -4,7 +4,7 @@ in { packages = { app = pkgs.buildNpmPackage { - npmDepsHash = "sha256-5KgxTfOWJEioLsKdXtwRBJ6aD2F7BEs4dGa1XeOA74Y="; + npmDepsHash = "sha256-lNtno0vO/BHoQRFZh4uzl1bPNj6p5zUomTO7/ClnGkw="; src = ./.; sourceRoot = "app"; pname = "app"; diff --git a/app/package-lock.json b/app/package-lock.json index 7338ebb724..abe9309eb1 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -46,7 +46,7 @@ "postcss": "^8.4.34", "prettier": "^3.2.5", "prettier-plugin-svelte": "^3.1.2", - "prettier-plugin-tailwindcss": "0.5.11", + "prettier-plugin-tailwindcss": "^0.5.11", "svelte": "^4.2.10", "svelte-check": "^3.6.3", "tailwind-scrollbar": "^3.0.5", diff --git a/app/package.json b/app/package.json index 09569f5e82..5fd259278c 100644 --- a/app/package.json +++ b/app/package.json @@ -53,7 +53,7 @@ "postcss": "^8.4.34", "prettier": "^3.2.5", "prettier-plugin-svelte": "^3.1.2", - "prettier-plugin-tailwindcss": "0.5.11", + "prettier-plugin-tailwindcss": "^0.5.11", "svelte": "^4.2.10", "svelte-check": "^3.6.3", "tailwind-scrollbar": "^3.0.5", diff --git a/app/svelte.config.js b/app/svelte.config.js index baae4da653..6c929d1f80 100644 --- a/app/svelte.config.js +++ b/app/svelte.config.js @@ -10,19 +10,6 @@ export default { preprocessMeltUI() ]), kit: { - csp: { - directives: { - 'frame-ancestors': [ - 'self', - 'localhost', - 'localhost:*', - 'https://verify.walletconnect.com/', - 'https://verify.walletconnect.org/', - 'https://*.union.build', - 'https://union.build' - ] - } - }, adapter: adapter({ strict: true }), diff --git a/site/.prettierrc.mjs b/site/.prettierrc.mjs deleted file mode 100644 index e9f956b525..0000000000 --- a/site/.prettierrc.mjs +++ /dev/null @@ -1,22 +0,0 @@ -/** @type {import('prettier').Config} */ -export default { - semi: false, - tabWidth: 2, - printWidth: 100, - endOfLine: 'auto', - singleQuote: true, - proseWrap: 'never', - jsxSingleQuote: true, - arrowParens: 'avoid', - trailingComma: 'none', - singleAttributePerLine: true, - overrides: [ - { - files: '*.mdx', - options: { - useTabs: false, - tabWidth: 2 - } - } - ] -} diff --git a/site/astro.config.ts b/site/astro.config.ts index 9d694935c0..ef1c564ec7 100644 --- a/site/astro.config.ts +++ b/site/astro.config.ts @@ -1,8 +1,8 @@ import svelte from "@astrojs/svelte"; import tailwind from "@astrojs/tailwind"; import starlight from "@astrojs/starlight"; +import { defineConfig } from "astro/config"; import { markdownConfiguration } from "./markdown.config.ts"; -import { defineConfig, squooshImageService } from "astro/config"; const SITE_URL = "https://union.build"; @@ -79,9 +79,6 @@ export default defineConfig({ dark: "./src/assets/union-logo/union-logo-transparent.svg", light: "./src/assets/union-logo/union-logo-white-transparent.svg", }, - editLink: { - baseUrl: "https://github.com/unionlabs/union/edit/main/site", - }, sidebar: [ { label: "Introduction", @@ -143,9 +140,6 @@ export default defineConfig({ }), svelte(), ], - image: { - service: squooshImageService(), - }, vite: { optimizeDeps: { exclude: ["@urql/svelte", "echarts"], diff --git a/site/package-lock.json b/site/package-lock.json index 5a06a1e8ff..067958de1c 100644 --- a/site/package-lock.json +++ b/site/package-lock.json @@ -9,11 +9,11 @@ "version": "0.0.1", "dependencies": { "@astrojs/markdown-remark": "^4.2.1", - "@astrojs/starlight": "^0.17.2", + "@astrojs/starlight": "^0.17.3", "@astrojs/starlight-tailwind": "^2.0.1", "@astrojs/svelte": "^5.0.3", "@astrojs/tailwind": "^5.1.0", - "@expressive-code/plugin-collapsible-sections": "^0.32.3", + "@expressive-code/plugin-collapsible-sections": "^0.32.4", "@urql/svelte": "^4.0.4", "astro": "4.0.9", "astro-capo": "^0.0.1", @@ -30,10 +30,10 @@ "remark-math": "^6.0.0", "remark-smartypants": "^2.1.0", "remark-toc": "^9.0.0", - "shikiji": "^0.10.1", + "shikiji": "^0.10.2", "slugify": "^1.6.6", "smartypants": "^0.2.2", - "svelte": "^4.2.9", + "svelte": "^4.2.10", "tailwindcss": "^3.4.1" }, "devDependencies": { @@ -45,11 +45,8 @@ "@tailwindcss/container-queries": "^0.1.1", "@tailwindcss/typography": "^0.5.10", "@total-typescript/ts-reset": "^0.5.1", - "@types/node": "^20.11.8", - "prettier": "3.1.1", - "prettier-plugin-tailwindcss": "0.5.10", + "@types/node": "^20.11.16", "tailwindcss-animate": "1.0.7", - "tsx": "4.7.0", "typed-query-selector": "^2.11.0", "typescript": "^5.3.3" } @@ -287,9 +284,9 @@ } }, "node_modules/@astrojs/starlight": { - "version": "0.17.2", - "resolved": "https://registry.npmjs.org/@astrojs/starlight/-/starlight-0.17.2.tgz", - "integrity": "sha512-2Zme8DobPaocbALX6LqkR8thDxa0RK3qikNccvwzowuYjGMzGvldt524RimFaVB0zTNrtrw2Sp1jamF1KJae8w==", + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/@astrojs/starlight/-/starlight-0.17.3.tgz", + "integrity": "sha512-TEI34d0N9Q2YXOGMS6wYEwv1rLsSkbCMa1JWnJ67UWIZ+bWfcM+kwHLnenwEHs9fQ5e0HvS2GWQxvRBb/mwYkw==", "dependencies": { "@astrojs/mdx": "^2.0.4", "@astrojs/sitemap": "^3.0.4", @@ -1159,9 +1156,9 @@ } }, "node_modules/@expressive-code/core": { - "version": "0.32.3", - "resolved": "https://registry.npmjs.org/@expressive-code/core/-/core-0.32.3.tgz", - "integrity": "sha512-uVA0/VMWz9Ak454CL8C74kvIikr7dwz2pCajSRVxR2wR+3NrgkRjbbny101f24uSs+s4k6YorJYrvX2p4SfQuA==", + "version": "0.32.4", + "resolved": "https://registry.npmjs.org/@expressive-code/core/-/core-0.32.4.tgz", + "integrity": "sha512-S0OwgZCy29OCcwFUBTLDrShUovIUWZcQn3EvSoKsGfzf/wTisK7XqZ1uH0Y7Mlof3Hf9uJMjOhJZvxTLtQUdSQ==", "dependencies": { "@ctrl/tinycolor": "^3.6.0", "hast-util-to-html": "^8.0.4", @@ -1418,11 +1415,11 @@ } }, "node_modules/@expressive-code/plugin-collapsible-sections": { - "version": "0.32.3", - "resolved": "https://registry.npmjs.org/@expressive-code/plugin-collapsible-sections/-/plugin-collapsible-sections-0.32.3.tgz", - "integrity": "sha512-Ul/OQGfdeZB5DHumIj0iJtZMgYI9sArlh+6Qt3pGB6wsurYX+P9sWQANtbUWl83rYzdUTd5NWZgtvGg4RVuHYA==", + "version": "0.32.4", + "resolved": "https://registry.npmjs.org/@expressive-code/plugin-collapsible-sections/-/plugin-collapsible-sections-0.32.4.tgz", + "integrity": "sha512-1fZi7IlfO9Agv5G4kafR0Nw90dIdgzaUwG144CfFxT+0dkWAQCAg3k+fe5WsS8G1bS/nCpkyL+aoOPgADMh/kw==", "dependencies": { - "@expressive-code/core": "^0.32.3", + "@expressive-code/core": "^0.32.4", "hast-util-select": "^5.0.5", "hastscript": "^7.2.0" } @@ -2710,9 +2707,9 @@ "integrity": "sha512-IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA==" }, "node_modules/@types/node": { - "version": "20.11.10", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.10.tgz", - "integrity": "sha512-rZEfe/hJSGYmdfX9tvcPMYeYPW2sNl50nsw4jZmRcaG0HIAb0WYEpsB05GOb53vjqpyE9GUhlDQ4jLSoB5q9kg==", + "version": "20.11.16", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.16.tgz", + "integrity": "sha512-gKb0enTmRCzXSSUJDq6/sPcqrfCv2mkkG6Jt/clpn5eiCbKTY+SgZUxo+p8ZKMof5dCp9vHQUAB7wOUTod22wQ==", "dependencies": { "undici-types": "~5.26.4" } @@ -4699,18 +4696,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/get-tsconfig": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz", - "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==", - "dev": true, - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, "node_modules/github-slugger": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz", @@ -8395,10 +8380,12 @@ } }, "node_modules/prettier": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", - "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", "dev": true, + "optional": true, + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -8409,75 +8396,30 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/prettier-plugin-tailwindcss": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.10.tgz", - "integrity": "sha512-9UGSejqFxGG6brYjFfTYlJ8zs4L/lvZg1AngFfaC5Fs1otSskASv5IWKmjPu5MlABQUtTKtMArKyYr/hWpXSUg==", + "node_modules/prettier-plugin-astro": { + "version": "0.13.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.13.0.tgz", + "integrity": "sha512-5HrJNnPmZqTUNoA97zn4gNQv9BgVhv+et03314WpQ9H9N8m2L9OSV798olwmG2YLXPl1iSstlJCR1zB3x5xG4g==", "dev": true, - "engines": { - "node": ">=14.21.3" - }, - "peerDependencies": { - "@ianvs/prettier-plugin-sort-imports": "*", - "@prettier/plugin-pug": "*", - "@shopify/prettier-plugin-liquid": "*", - "@trivago/prettier-plugin-sort-imports": "*", - "prettier": "^3.0", - "prettier-plugin-astro": "*", - "prettier-plugin-css-order": "*", - "prettier-plugin-import-sort": "*", - "prettier-plugin-jsdoc": "*", - "prettier-plugin-marko": "*", - "prettier-plugin-organize-attributes": "*", - "prettier-plugin-organize-imports": "*", - "prettier-plugin-style-order": "*", - "prettier-plugin-svelte": "*" + "optional": true, + "peer": true, + "dependencies": { + "@astrojs/compiler": "^1.5.5", + "prettier": "^3.0.0", + "sass-formatter": "^0.7.6" }, - "peerDependenciesMeta": { - "@ianvs/prettier-plugin-sort-imports": { - "optional": true - }, - "@prettier/plugin-pug": { - "optional": true - }, - "@shopify/prettier-plugin-liquid": { - "optional": true - }, - "@trivago/prettier-plugin-sort-imports": { - "optional": true - }, - "prettier-plugin-astro": { - "optional": true - }, - "prettier-plugin-css-order": { - "optional": true - }, - "prettier-plugin-import-sort": { - "optional": true - }, - "prettier-plugin-jsdoc": { - "optional": true - }, - "prettier-plugin-marko": { - "optional": true - }, - "prettier-plugin-organize-attributes": { - "optional": true - }, - "prettier-plugin-organize-imports": { - "optional": true - }, - "prettier-plugin-style-order": { - "optional": true - }, - "prettier-plugin-svelte": { - "optional": true - }, - "prettier-plugin-twig-melody": { - "optional": true - } + "engines": { + "node": "^14.15.0 || >=16.0.0" } }, + "node_modules/prettier-plugin-astro/node_modules/@astrojs/compiler": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.8.2.tgz", + "integrity": "sha512-o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw==", + "dev": true, + "optional": true, + "peer": true + }, "node_modules/prismjs": { "version": "1.29.0", "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz", @@ -9241,15 +9183,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/resolve-pkg-maps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "dev": true, - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" - } - }, "node_modules/restore-cursor": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-4.0.0.tgz", @@ -9709,6 +9642,14 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/s.color": { + "version": "0.0.15", + "resolved": "https://registry.npmjs.org/s.color/-/s.color-0.0.15.tgz", + "integrity": "sha512-AUNrbEUHeKY8XsYr/DYpl+qk5+aM+DChopnWOPEzn8YKzOhv4l2zH6LzZms3tOZP3wwdOyc0RmTciyi46HLIuA==", + "dev": true, + "optional": true, + "peer": true + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -9733,6 +9674,17 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "node_modules/sass-formatter": { + "version": "0.7.9", + "resolved": "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.7.9.tgz", + "integrity": "sha512-CWZ8XiSim+fJVG0cFLStwDvft1VI7uvXdCNJYXhDvowiv+DsbD1nXLiQ4zrE5UBvj5DWZJ93cwN0NX5PMsr1Pw==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "suf-log": "^2.5.3" + } + }, "node_modules/sax": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", @@ -10219,6 +10171,17 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/suf-log": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/suf-log/-/suf-log-2.5.3.tgz", + "integrity": "sha512-KvC8OPjzdNOe+xQ4XWJV2whQA0aM1kGVczMQ8+dStAO6KfEB140JEVQ9dE76ONZ0/Ylf67ni4tILPJB41U0eow==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "s.color": "0.0.15" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -10242,9 +10205,9 @@ } }, "node_modules/svelte": { - "version": "4.2.9", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.9.tgz", - "integrity": "sha512-hsoB/WZGEPFXeRRLPhPrbRz67PhP6sqYgvwcAs+gWdSQSvNDw+/lTeUJSWe5h2xC97Fz/8QxAOqItwBzNJPU8w==", + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-4.2.10.tgz", + "integrity": "sha512-Ep06yCaCdgG1Mafb/Rx8sJ1QS3RW2I2BxGp2Ui9LBHSZ2/tO/aGLc5WqPjgiAP6KAnLJGaIr/zzwQlOo1b8MxA==", "dependencies": { "@ampproject/remapping": "^2.2.1", "@jridgewell/sourcemap-codec": "^1.4.15", @@ -10480,25 +10443,6 @@ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" }, - "node_modules/tsx": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.7.0.tgz", - "integrity": "sha512-I+t79RYPlEYlHn9a+KzwrvEwhJg35h/1zHsLC2JXvhC2mdynMv6Zxzvhv5EMV6VF5qJlLlkSnMVvdZV3PSIGcg==", - "dev": true, - "dependencies": { - "esbuild": "~0.19.10", - "get-tsconfig": "^4.7.2" - }, - "bin": { - "tsx": "dist/cli.mjs" - }, - "engines": { - "node": ">=18.0.0" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - } - }, "node_modules/type-fest": { "version": "2.19.0", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", diff --git a/site/package.json b/site/package.json index fea10c8e6b..9bc4fdd188 100644 --- a/site/package.json +++ b/site/package.json @@ -9,16 +9,15 @@ "preview": "astro preview", "astro": "astro", "check": "astro check", - "format": "prettier --write . --ignore-path='.eslintignore' --ignore-unknown --cache", "typecheck": "tsc --project tsconfig.json --noEmit" }, "dependencies": { "@astrojs/markdown-remark": "^4.2.1", - "@astrojs/starlight": "^0.17.2", + "@astrojs/starlight": "^0.17.3", "@astrojs/starlight-tailwind": "^2.0.1", "@astrojs/svelte": "^5.0.3", "@astrojs/tailwind": "^5.1.0", - "@expressive-code/plugin-collapsible-sections": "^0.32.3", + "@expressive-code/plugin-collapsible-sections": "^0.32.4", "@urql/svelte": "^4.0.4", "astro": "4.0.9", "astro-capo": "^0.0.1", @@ -35,10 +34,10 @@ "remark-math": "^6.0.0", "remark-smartypants": "^2.1.0", "remark-toc": "^9.0.0", - "shikiji": "^0.10.1", + "shikiji": "^0.10.2", "slugify": "^1.6.6", "smartypants": "^0.2.2", - "svelte": "^4.2.9", + "svelte": "^4.2.10", "tailwindcss": "^3.4.1" }, "devDependencies": { @@ -50,11 +49,8 @@ "@tailwindcss/container-queries": "^0.1.1", "@tailwindcss/typography": "^0.5.10", "@total-typescript/ts-reset": "^0.5.1", - "@types/node": "^20.11.8", - "prettier": "3.1.1", - "prettier-plugin-tailwindcss": "0.5.10", + "@types/node": "^20.11.16", "tailwindcss-animate": "1.0.7", - "tsx": "4.7.0", "typed-query-selector": "^2.11.0", "typescript": "^5.3.3" }, diff --git a/site/site.nix b/site/site.nix index 0529ecba68..21d3540178 100644 --- a/site/site.nix +++ b/site/site.nix @@ -4,23 +4,18 @@ in { packages = { site = pkgs.buildNpmPackage { - npmDepsHash = "sha256-4YjZqfA13yM8XX+N18UkHtT6CddFIETntuuXyFRn59g="; + npmDepsHash = "sha256-uWLsohYklJyUPkwXtoI/YsqGfHmwcxSmpVZFEZ4gcTc="; src = ./.; srcs = [ ./. ./../evm/. ]; sourceRoot = "site"; pname = "site"; version = "0.0.1"; - PUPPETEER_SKIP_DOWNLOAD = true; - - # nodejs = pkgs.nodejs_20; nativeBuildInputs = pkgsDeps; buildInputs = pkgsDeps; - installPhase = '' mkdir -p $out cp -r ./dist/* $out ''; - doDist = false; }; }; diff --git a/site/src/content/docs/docs/demos/pingpong.mdx b/site/src/content/docs/docs/demos/pingpong.mdx index d9065d0aa8..a89be82cef 100644 --- a/site/src/content/docs/docs/demos/pingpong.mdx +++ b/site/src/content/docs/docs/demos/pingpong.mdx @@ -35,7 +35,7 @@ The `PingPong` contract showcases a basic example of cross-chain communication o ## Implementation -The interface used by the implementation is the one described in [the Solidity integration section.](../integration/solidity) +The interface used by the implementation is the one described in [the Solidity integration section.](../../integration/solidity)