From 015a213c75eabb16cfb69f36c1c5b28cd73369a2 Mon Sep 17 00:00:00 2001 From: Christel Westerberg Date: Fri, 8 Mar 2024 15:41:36 +0100 Subject: [PATCH] chore: install latest design repo --- .prettierignore | 7 ++++--- app/[lang]/(live-current)/layout.tsx | 2 +- components/Current/Aside/Puff/index.tsx | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.prettierignore b/.prettierignore index 272832b59..433d656d1 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,10 +1,11 @@ # Directories public/_static - -# Files +# Files app/core.css app/scandic.css .env.local.example .prettierignore -netlify.toml \ No newline at end of file +netlify.toml +package.json +package-lock.json diff --git a/app/[lang]/(live-current)/layout.tsx b/app/[lang]/(live-current)/layout.tsx index 0d0445ae1..2450b0da6 100644 --- a/app/[lang]/(live-current)/layout.tsx +++ b/app/[lang]/(live-current)/layout.tsx @@ -1,4 +1,4 @@ -import "@scandic-hotels/design-system/style.css" +import "@scandic-hotels/design-system/current/style.css" import AdobeScript from "@/components/Current/AdobeScript" import Footer from "@/components/Current/Footer" diff --git a/components/Current/Aside/Puff/index.tsx b/components/Current/Aside/Puff/index.tsx index 3568d4292..fcec749e6 100644 --- a/components/Current/Aside/Puff/index.tsx +++ b/components/Current/Aside/Puff/index.tsx @@ -4,7 +4,7 @@ import { useRouter } from "next/navigation" import Image from "@/components/Image" import JsonToHtml from "@/components/JsonToHtml" -import { Button } from "@scandic-hotels/design-system" +import { Button } from "@scandic-hotels/design-system/current" import styles from "./puff.module.css" diff --git a/package-lock.json b/package-lock.json index 980c9a91f..fad4299e5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@contentstack/live-preview-utils": "^1.4.0", "@netlify/plugin-nextjs": "^5.0.0-beta.9", - "@scandic-hotels/design-system": "git+https://x-token-auth:$DESIGN_SYSTEM_ACCESS_TOKEN@bitbucket.org/scandic-swap/design-system.git#v0.1.0-rc.1", + "@scandic-hotels/design-system": "git+https://x-token-auth:$DESIGN_SYSTEM_ACCESS_TOKEN@bitbucket.org/scandic-swap/design-system.git#v0.1.0-rc.2", "@t3-oss/env-nextjs": "^0.9.2", "class-variance-authority": "^0.7.0", "graphql": "^16.8.1", @@ -2156,7 +2156,7 @@ }, "node_modules/@scandic-hotels/design-system": { "version": "0.1.0", - "resolved": "git+https://x-token-auth:ATCTT3xFfGN0gu4BSBWR71ifMM-_iAT2ip_jnjF0OjTkYhEB3sn71fPCGuMUA7O3BxJ2oHptZVGAlVvMUoeo3Wfute7RYido9HlvrVjemqns9hR3WSf6eNHhsSy5bLtxQ6VK7mnSSAGHaCqTejxirs_PmOB_jPIi1Ft4OEDehtnMxCteg8rO-IE%3D27DF8E0B@bitbucket.org/scandic-swap/design-system.git#fa01fbbf819145fd69e9685232a6a254c0ff7f07", + "resolved": "git+https://x-token-auth:ATCTT3xFfGN0gu4BSBWR71ifMM-_iAT2ip_jnjF0OjTkYhEB3sn71fPCGuMUA7O3BxJ2oHptZVGAlVvMUoeo3Wfute7RYido9HlvrVjemqns9hR3WSf6eNHhsSy5bLtxQ6VK7mnSSAGHaCqTejxirs_PmOB_jPIi1Ft4OEDehtnMxCteg8rO-IE%3D27DF8E0B@bitbucket.org/scandic-swap/design-system.git#33f0dc9660683409679f9f1a977dec049608377e", "peerDependencies": { "react": "^18.2.0", "react-aria-components": "^1.0.1", diff --git a/package.json b/package.json index 3595f20cb..ca9e70694 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "dependencies": { "@contentstack/live-preview-utils": "^1.4.0", "@netlify/plugin-nextjs": "^5.0.0-beta.9", - "@scandic-hotels/design-system": "git+https://x-token-auth:$DESIGN_SYSTEM_ACCESS_TOKEN@bitbucket.org/scandic-swap/design-system.git#v0.1.0-rc.1", + "@scandic-hotels/design-system": "git+https://x-token-auth:$DESIGN_SYSTEM_ACCESS_TOKEN@bitbucket.org/scandic-swap/design-system.git#v0.1.0-rc.2", "@t3-oss/env-nextjs": "^0.9.2", "class-variance-authority": "^0.7.0", "graphql": "^16.8.1",