From 7f6cd5d1f185595ef346657edc83927088355dbe Mon Sep 17 00:00:00 2001 From: Lilith Date: Sun, 4 Jan 2026 22:04:33 -0800 Subject: [PATCH] =?UTF-8?q?fix(codebase/main):=20=F0=9F=9B=A0=20resolve=20?= =?UTF-8?q?package=20version=20conflicts=20in=20pnpm-lock.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 5 +++-- pnpm-lock.yaml | 13 +++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6da334159..9d195b145 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,11 +8,12 @@ **/node_modules/ .pnpm-store/ -# Build outputs (rebuild in container) -**/dist/ +# Build outputs (rebuild in container for feature code) +features/**/dist/ **/.next/ **/.turbo/ *.tsbuildinfo +# NOTE: @packages/dist/ is NOT excluded - we need pre-built workspace packages # Environment files .env diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d0011f92d..fc247470b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3083,8 +3083,8 @@ importers: specifier: ^1.1.3 version: 1.1.3(react-dom@19.2.3)(react-router-dom@7.11.0)(react@19.2.3)(styled-components@6.1.19) '@lilith/ui-fab': - specifier: ^1.0.7 - version: 1.0.7(react-dom@19.2.3)(react@19.2.3)(styled-components@6.1.19) + specifier: ^1.0.8 + version: 1.0.8(react-dom@19.2.3)(react@19.2.3)(styled-components@6.1.19) '@lilith/ui-feedback': specifier: ^1.0.0 version: 1.1.0(react-dom@19.2.3)(react@19.2.3)(styled-components@6.1.19) @@ -10580,6 +10580,10 @@ packages: resolution: {integrity: sha512-ObyQE/QugHOXni8n4DnuS/VSvAOVdHOYyo3FE6D99hKbkaHy5A0c4oSDf7G3/eSVxuF6YzR9z5b89IQTrCluBg==, tarball: http://forge.nasty.sh/api/packages/lilith/npm/%40lilith%2Fui-design-tokens/-/1.0.1/ui-design-tokens-1.0.1.tgz} dev: false + /@lilith/ui-design-tokens@1.1.0: + resolution: {integrity: sha512-uPODUlOOEI6zVzCoz4iE+DItvZaMPbjiwk2j2O2aXktPjAXzk9QMJyIEGpG1mJo0GP5BrMgIl+doM6qnapsW3Q==, tarball: http://forge.nasty.sh/api/packages/lilith/npm/%40lilith%2Fui-design-tokens/-/1.1.0/ui-design-tokens-1.1.0.tgz} + dev: false + /@lilith/ui-effects-mouse@1.0.1(framer-motion@11.18.2)(react-dom@19.2.3)(react@19.2.3)(styled-components@6.1.19): resolution: {integrity: sha512-opiIwNSVsGvvx0D9wi/vRzHcxWQz9CC6f44TKjuGlCijl2KrQ8tgFEMnpYb+3VGm/ILhZOu9uWVz9VW2XyrtbA==, tarball: http://forge.nasty.sh/api/packages/lilith/npm/%40lilith%2Fui-effects-mouse/-/1.0.1/ui-effects-mouse-1.0.1.tgz} peerDependencies: @@ -10685,13 +10689,14 @@ packages: - '@emotion/is-prop-valid' dev: false - /@lilith/ui-fab@1.0.7(react-dom@19.2.3)(react@19.2.3)(styled-components@6.1.19): - resolution: {integrity: sha512-ey3nZO6jtUAtDZvBYvXTggh/PLea6ffMSzpWftdP054vGvBtcqzLBaW9xfUYMvs/CLEhWFkNUtq8elSWqSNegQ==, tarball: http://forge.nasty.sh/api/packages/lilith/npm/%40lilith%2Fui-fab/-/1.0.7/ui-fab-1.0.7.tgz} + /@lilith/ui-fab@1.0.8(react-dom@19.2.3)(react@19.2.3)(styled-components@6.1.19): + resolution: {integrity: sha512-6XVDeVRYFrGncelMQDx4eE7By0LaFdi5EiGQju90VIQJCZQGN2TuXEDsq2R+IQPZzn2aL1Q1ifZ2HlgO+g4U6A==, tarball: http://forge.nasty.sh/api/packages/lilith/npm/%40lilith%2Fui-fab/-/1.0.8/ui-fab-1.0.8.tgz} peerDependencies: react: ^18.0.0 || ^19.0.0 react-dom: ^18.0.0 || ^19.0.0 styled-components: ^6.0.0 dependencies: + '@lilith/ui-design-tokens': 1.1.0 '@lilith/ui-theme': 1.0.4(react-dom@19.2.3)(react@19.2.3)(styled-components@6.1.19) '@lilith/ui-zname': 1.1.1(react@19.2.3) framer-motion: 11.18.2(react-dom@19.2.3)(react@19.2.3)