scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in fix/pinned-yarn-version (pull request #1428)

Browse Source 
fix: different packageManager versions in different package.json's caused issues when installing

* fix: different packageManager versions in different package.json's caused issues when installing

* fix: build error


Approved-by: Anton Gunnarsson
This commit is contained in:
Joakim Jäderberg
2025-02-27 08:41:34 +00:00
parent 31a536b1f7
commit 082a162257
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx
View File

@@ -1,5 +1,8 @@
import { Suspense } from "react" import { Suspense } from "react"
import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
import { getIntl } from "@/i18n"
import { LinkedReservationCardSkeleton } from "./LinkedReservation/LinkedReservationCardSkeleton" import { LinkedReservationCardSkeleton } from "./LinkedReservation/LinkedReservationCardSkeleton"
import { LinkedReservation } from "./LinkedReservation" import { LinkedReservation } from "./LinkedReservation"
import Room from "./Room" import Room from "./Room"
@@ -7,8 +10,6 @@ import Room from "./Room"
import styles from "./rooms.module.css" import styles from "./rooms.module.css"
import type { BookingConfirmationRoomsProps } from "@/types/components/hotelReservation/bookingConfirmation/rooms" import type { BookingConfirmationRoomsProps } from "@/types/components/hotelReservation/bookingConfirmation/rooms"
import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
import { getIntl } from "@/i18n"
export default async function Rooms({ export default async function Rooms({
booking, booking,
@@ -19,7 +20,7 @@ export default async function Rooms({
return ( return (
<section className={styles.rooms}> <section className={styles.rooms}>
<div className={styles.room}> <div className={styles.room}>
{linkedReservations.length ? ( {(linkedReservations?.length ?? 0 > 0) ? (
<Subtitle color="mainGrey60" type="two"> <Subtitle color="mainGrey60" type="two">
{intl.formatMessage({ id: "Room {roomIndex}" }, { roomIndex: 1 })} {intl.formatMessage({ id: "Room {roomIndex}" }, { roomIndex: 1 })}
</Subtitle> </Subtitle>
@@ -32,7 +33,7 @@ export default async function Rooms({
</div> </div>
{linkedReservations?.map((reservation, idx) => ( {linkedReservations?.map((reservation, idx) => (
<div className={styles.room}> <div key={idx} className={styles.room}>
<Subtitle color="mainGrey60" type="two"> <Subtitle color="mainGrey60" type="two">
{intl.formatMessage( {intl.formatMessage(
{ id: "Room {roomIndex}" }, { id: "Room {roomIndex}" },

1
apps/scandic-web/package.json
View File

@@ -3,7 +3,6 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"type": "module", "type": "module",
"packageManager": "yarn@4.0.0",
"scripts": { "scripts": {
"prebuild": "yarn lint && yarn test:unit", "prebuild": "yarn lint && yarn test:unit",
"build": "next build", "build": "next build",

34
package.json
View File

@@ -1,19 +1,19 @@
{ {
"name": "scandic", "name": "scandic",
"packageManager": "yarn@4.5.1", "packageManager": "yarn@4.6.0",
"scripts": { "scripts": {
"build": "yarn workspace @scandic-hotels/design-system build && yarn workspace @scandic-hotels/scandic-web build", "build": "yarn workspace @scandic-hotels/design-system build && yarn workspace @scandic-hotels/scandic-web build",
"lint": "yarn workspace @scandic-hotels/scandic-web lint", "lint": "yarn workspace @scandic-hotels/scandic-web lint",
"postinstall": "husky" "postinstall": "husky"
}, },
"workspaces": [ "workspaces": [
"apps/*", "apps/*",
"packages/*" "packages/*"
], ],
"devDependencies": { "devDependencies": {
"@types/react": "^18", "@types/react": "^18",
"@types/react-dom": "^18", "@types/react-dom": "^18",
"husky": "^9.1.7", "husky": "^9.1.7",
"lint-staged": "^15.2.2" "lint-staged": "^15.2.2"
} }
} }

4
yarn.lock
View File

@@ -21212,11 +21212,11 @@ __metadata:
"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>": "typescript@patch:typescript@npm%3A^5.2.2#optional!builtin<compat/typescript>":
version: 5.7.3 version: 5.7.3
resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=cef18b" resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
bin: bin:
tsc: bin/tsc tsc: bin/tsc
tsserver: bin/tsserver tsserver: bin/tsserver
checksum: 10c0/3b56d6afa03d9f6172d0b9cdb10e6b1efc9abc1608efd7a3d2f38773d5d8cfb9bbc68dfb72f0a7de5e8db04fc847f4e4baeddcd5ad9c9feda072234f0d788896 checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
languageName: node languageName: node
linkType: hard linkType: hard