Commit Graph

132 Commits

Author SHA1 Message Date
Joakim Jäderberg
2410d887df Merged in chore/include-tags-when-syncing-2 (pull request #3431)
actively fetch and push tags when syncing master -> test

* actively fetch and push tags when syncing master -> test

* git fetch --all --tags


Approved-by: Anton Gunnarsson
2026-01-14 12:46:25 +00:00
Anton Gunnarsson
d371d45fd2 Merged in chore/configure-knip (pull request #3417)
Add knip configuration

* Add knip configuration


Approved-by: Joakim Jäderberg
2026-01-12 09:07:10 +00:00
Joakim Jäderberg
028c77c923 Merged in chore/check-types-before-build (pull request #3326)
chore: check types before build

* chore: check types before build

* remove unused package.json scripts

* merge


Approved-by: Linus Flood
2026-01-07 07:06:36 +00:00
Joakim Jäderberg
f27ba7ccb6 Merged in chore/release-pipeline (pull request #3352)
Add scripts for handling deployments

Approved-by: Linus Flood
2025-12-16 11:42:51 +00:00
Anton Gunnarsson
e5149846e5 Merged in chore/upgrade-to-next16 (pull request #3305)
chore(SW-3665): Upgrade to Next 16

* Upgrade partner-sas

* Upgrade scandic-web to next 16

* Update peerDep versions

* Fix revalidateTag

* Remove comment

* Merge branch 'master' into chore/upgrade-to-next16

* Update netlify adapter

* Build with webpack instead of turbopack

* Revert from proxy to middleware

* Merge branch 'master' into chore/upgrade-to-next16

* Revert proxy type

* Fix react types versions

* 16.0.9

* Bump to 16.0.10


Approved-by: Linus Flood
2025-12-12 09:17:15 +00:00
Matilda Haneling
7acfde7b49 Merged in fix/hamburger-menu-freezes (pull request #3276)
fix(BOOK-613): pinned react aria compnents and aria overlays versions

* fix(BOOK-613): pinned react aria compnents and aria overlays versions


Approved-by: Linus Flood
2025-12-03 07:46:01 +00:00
Linus Flood
aac10477a7 Merged in fix/lokalise-diff (pull request #3257)
feat(lokalise): fixed diff script

* feat(lokalise): fixed diff script

* formatting


Approved-by: Matilda Landström
2025-12-01 08:17:13 +00:00
Joakim Jäderberg
3a6abb73c2 Merged in fix/align-react-versions (pull request #3250)
fix: align react versions

* fix: align react versions


Approved-by: Anton Gunnarsson
2025-11-28 10:03:29 +00:00
Rasmus Langvad
c65091b36a Merged in feat/SW-3644-storybook-v10 (pull request #3240)
feat(SW-3644): Storybook v10

* Auto update to Storybook v10

* Add scandic theme and logo

* Update yarn.lock

* Update formatting of package.json

* Update vitest config and playwright plugin

* Remove vitest 4 update

* Re-added comment

* Update the Typography component to explicitly return React.ReactNode

* Add an explicit type assertion to the export

* Add an explicit type assertion to the export for Checkbox

* Explicit return type assertion

* Add an explicit type assertion to the export

* Update @types/react and fix ts warnings

* Updated typings


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-11-28 08:05:40 +00:00
Joakim Jäderberg
dc53ab9245 Merged in chore/upgrade-next (pull request #3124)
Upgrade next@15.5.6

* chore: upgrade next@15.5.6

* chore: upgrade turborepo@2.6.1

* fix typings for scandic-web

* fix: set correct type for pages

* cleanup

* fix more route.ts typing issues

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/upgrade-next

* explicitly import the types


Approved-by: Linus Flood
2025-11-13 07:33:56 +00:00
Joakim Jäderberg
bc5a606289 Merged in feature/turbopack (pull request #3117)
Feature/turbopack

* .

* .

* pin import-in-the-middle

* update marker

* revert back to using *.graphql.ts


Approved-by: Linus Flood
2025-11-11 09:51:40 +00:00
Joakim Jäderberg
ec511e2c8b Merged in feature/tsgo (pull request #3069)
Use tsgo for typechecking

* switch to tsgo for type-checking

* Merged in chore/remove-cypress (pull request #3066)

chore: remove unused dependencies

* chore: remove cypress

* remove unused deps

* update yarn.lock after removing unused deps


Approved-by: Anton Gunnarsson

* use tsgo for typechecking

* use tsgo for type-checking

* yarn install

* fix(BOOK-496): Slowed down the MarqueeText component animation

Approved-by: Matilda Landström

* switch to tsgo for type-checking

* use tsgo for typechecking

* use tsgo for type-checking

* yarn install

* Merge branch 'feature/tsgo' of bitbucket.org:scandic-swap/web into feature/tsgo

* switch to use yarn check-types in lint-staged

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/tsgo


Approved-by: Linus Flood
2025-11-06 12:34:23 +00:00
Joakim Jäderberg
59143b4023 Merged in chore/remove-cypress (pull request #3066)
chore: remove unused dependencies

* chore: remove cypress

* remove unused deps

* update yarn.lock after removing unused deps


Approved-by: Anton Gunnarsson
2025-11-04 10:20:06 +00:00
Joakim Jäderberg
bf6ed7778e Merged in feat/syncDefaultMessage (pull request #3022)
Sync defaultMessage from lokalise

* Enhance translation sync functionality and tests

- Added logging for found component files during sync.
- Introduced tests for handling complex components with replacements.
- Updated regex in syncIntlFormatMessage to support optional second arguments.
- Removed unused test files.

* feat(syncDefaultMessage): add script for syncing default message with lokalise

* feat(syncDefaultMessage): add script for syncing default message with lokalise


Approved-by: Matilda Landström
2025-10-30 08:38:50 +00:00
Joakim Jäderberg
8661e5c348 Merged in chore/icon-readme-update (pull request #2817)
Update icon generation script and remove unused font file

* Update icon generation script and remove unused font file


Approved-by: Matilda Landström
2025-09-17 12:58:23 +00:00
Joakim Jäderberg
48324ef935 Merged in feature/copy-static-files-via-build-scripts (pull request #2798)
SW-3467 Copy static files via build scripts

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* add file copy script and add all fonts to design-system

* remove fonts that will be copied via build scripts

* wip

* update paths to shared files

* update material-symbol script

* merge

* fix missing shared segment for path in fonts.css


Approved-by: Linus Flood
2025-09-16 10:59:33 +00:00
Anton Gunnarsson
f7ef58eafa Merged in feat/sw-2874-move-select-rate (pull request #2750)
Approved-by: Joakim Jäderberg
2025-09-03 08:30:05 +00:00
Joakim Jäderberg
f531c7a49f Merged in feature/storybook-tests (pull request #2623)
Feature/storybook tests

* feature: add interaction tests for storybook and upgrade storybook@9

* add a11y testing for storybook

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/storybook-tests

* Test and build only required packages

* .

* .

* .

* .

* .

* .

* .

* disable playwright tests in netlify ci

* .

* debug out process.env

* don't run playwright on CI

* remove unused netlify-plugin-playwright-cache

* .

* .

* .

* .

* .

* .

* remove turbo dependancy to design-system#test

* merge

* merge


Approved-by: Anton Gunnarsson
2025-08-14 06:25:08 +00:00
Anton Gunnarsson
800dc5c3c1 Merged in feat/sw-3225-move-parking-information-to-booking-flow (pull request #2614)
feat(SW-3225): Move ParkingInformation to design-system

* Inline ParkingInformation types to remove trpc dependency

* Move ParkingInformation to design-system

* Move numberFormatting to common package

* Add deps to external

* Fix imports and i18n script

* Add common as dependency

* Merge branch 'master' into feat/sw-3225-move-parking-information-to-booking-flow


Approved-by: Linus Flood
2025-08-12 12:36:31 +00:00
Anton Gunnarsson
233c685e52 Merged in feat/sw-2333-package-and-sas-i18n (pull request #2538)
feat(SW-2333): I18n for multiple apps and packages

* Set upp i18n in partner-sas

* Adapt lokalise workflow to monorepo

* Fix layout props


Approved-by: Linus Flood
2025-07-10 07:00:03 +00:00
Anton Gunnarsson
c41b2314bf Merged in fix/update-build-scripts (pull request #2488)
Update build scripts for apps

* Update build scripts for apps


Approved-by: Joakim Jäderberg
2025-07-01 07:20:06 +00:00
Anton Gunnarsson
c1daef39f2 Merged in chore/env-scripts (pull request #2481)
chore: Add script to show missing envs

* base

* Better output

* Add missing flag

* Add script to check env


Approved-by: Joakim Jäderberg
2025-06-30 13:54:24 +00:00
Christian Andolf
733281240f chore: add vitest project config and yarn constraints 2025-06-30 14:17:49 +02:00
Anton Gunnarsson
133f7b3d75 Merged in feat/sw-2781-partner-sas-site-setup (pull request #2432)
feat(SW-2781): Setup SAS partner site

* Add boilerplate for SAS partner site

* Fonts

* netlify.toml


Approved-by: Linus Flood
2025-06-26 13:45:15 +00:00
Anton Gunnarsson
048a477e52 Merged in feat/common-package (pull request #2333)
feat: Add common package

* Add isEdge, safeTry and dataCache to new common package

* Add eslint and move prettier config

* Fix yarn lock

* Clean up tests

* Add lint-staged config to common

* Add missing dependencies


Approved-by: Joakim Jäderberg
2025-06-11 13:08:39 +00:00
Anton Gunnarsson
dd4ef527df Merged in chore/eslint9 (pull request #2029)
chore: Update to ESLint 9

* wip: apply codemod and upgrade swc plugin

* Update eslint to 9 in scandic-web

apply code mod to config
fix existing lint issues

* Remove uneccessary fixupConfigRules

* Update eslint to 9 in design-system

* Add lint turbo dependency

* Move redis-api to eslint and prettier instead of biome

* Simplify eslint configs

* Clean up

* Apply linting


Approved-by: Linus Flood
2025-06-03 14:26:44 +00:00
Anton Gunnarsson
cbf9e7b7c2 Merged in chore/next15 (pull request #1999)
chore (SW-834): Upgrade to Next 15

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* wip: fix remaining issues from codemod

serverClient is now async because context use headers()
getLang is now async because it uses headers()

* Minor cleanup

* Inline react-material-symbols package

Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.

* Fix missing awaits

* Disable modal exit animations

Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563.
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html

* Remove unstable cache implementation and use in memory cache locally

* Fix ref type in SelectFilter

* Use cloneElement to add key prop to element


Approved-by: Linus Flood
2025-06-02 11:11:50 +00:00
Anton Gunnarsson
fead7be082 Update turbo 2025-05-22 14:00:37 +02:00
Michael Zetterberg
f31b374370 feat: optimize Material Symbols 2025-04-07 12:17:35 +02:00
Anton Gunnarsson
01740e3300 Merged in feat/turborepo (pull request #1451)
Turborepo

Approved-by: Linus Flood
2025-03-12 08:18:38 +00:00
Michael Zetterberg
56973888c9 feat(SW-375): new tokens
new asset generation logic

BREAKING CHANGE: New tokens.
2025-03-07 07:24:37 +00:00
Joakim Jäderberg
92b81ab8e7 Merged in fix/ci-build (pull request #1434)
Fix/ci build

* fix: use explicit ci:build command since pre-scripts don't work in yarn

* fix: don't remove .next-folder on dev

* revert change to netlify.toml


Approved-by: Anton Gunnarsson
2025-02-27 11:55:51 +00:00
Joakim Jäderberg
082a162257 Merged in fix/pinned-yarn-version (pull request #1428)
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
2025-02-27 08:41:34 +00:00
Anton Gunnarsson
80100e7631 Merged in monorepo-step-1 (pull request #1080)
Migrate to a monorepo setup - step 1

* Move web to subfolder /apps/scandic-web

* Yarn + transitive deps

- Move to yarn
- design-system package removed for now since yarn doesn't
support the parameter for token (ie project currently broken)
- Add missing transitive dependencies as Yarn otherwise
prevents these imports
- VS Code doesn't pick up TS path aliases unless you open
/apps/scandic-web instead of root (will be fixed with monorepo)

* Pin framer-motion to temporarily fix typing issue

https://github.com/adobe/react-spectrum/issues/7494

* Pin zod to avoid typ error

There seems to have been a breaking change in the types
returned by zod where error is now returned as undefined
instead of missing in the type. We should just handle this
but to avoid merge conflicts just pin the dependency for
now.

* Pin react-intl version

Pin version of react-intl to avoid tiny type issue where formatMessage
does not accept a generic any more. This will be fixed in a future
commit, but to avoid merge conflicts just pin for now.

* Pin typescript version

Temporarily pin version as newer versions as stricter and results in
a type error. Will be fixed in future commit after merge.

* Setup workspaces

* Add design-system as a monorepo package

* Remove unused env var DESIGN_SYSTEM_ACCESS_TOKEN

* Fix husky for monorepo setup

* Update netlify.toml

* Add lint script to root package.json

* Add stub readme

* Fix react-intl formatMessage types

* Test netlify.toml in root

* Remove root toml

* Update netlify.toml publish path

* Remove package-lock.json

* Update build for branch/preview builds


Approved-by: Linus Flood
2025-02-26 10:36:17 +00:00
Erik Tiekstra
3867baadd6 Merged in feat/SW-1452-city-page-filter-2 (pull request #1392)
feat(SW-1452): Added filtering and sorting to destination city pages

* feat(SW-1452): Added filtering and sorting to destination city pages

* feat(SW-1452): Added temporary component for country pages to avoid Context issues


Approved-by: Matilda Landström
2025-02-25 13:02:38 +00:00
Matilda Landström
59950678f3 Merged in feat/SW-1234-hotel-subpages (pull request #1387)
Feat(SW-1234): Prettify hotel subpages

Approved-by: Erik Tiekstra
Approved-by: Fredrik Thorsson
2025-02-24 12:44:00 +00:00
Erik Tiekstra
c93381ca80 Merged in feat/SW-550-sitemap (pull request #981)
feat(SW-550): added sync functionality and sitemap generation

* feat(SW-550): added sync functionality and sitemap generation

* feat(SW-550): Added support for splitting and saving multiple sitemaps when there are 50000+ urls

* feat(SW-550): Updates after PR

* feat(SW-550): Added locale to sitemap data

* feat(SW-550): Added support for locale based sitemapData

* feat(SW-550): Saving alternates of sitemap entries

* feat(SW-550): Refactoring to use sitemap utils file

* feat(SW-550): Using Netlify.env to get environment variables

* feat(SW-550): clarify use of functions


Approved-by: Michael Zetterberg
2025-02-17 10:35:11 +00:00
Simon.Emanuelsson
248473e8bf Merged in chore/refactor-booking-flow (pull request #1333)
chore: cleaning up select-rate

Approved-by: Arvid Norlin
Approved-by: Linus Flood
2025-02-14 13:51:37 +00:00
Simon Emanuelsson
051bc54e6c chore: cleaning up select-rate 2025-02-14 14:20:54 +01:00
Chuma Mcphoy (We Ahead)
38cce4b136 Merged in feat/SW-1542-carousel-functionality (pull request #1311)
feat(SW-1542): Carousel component

* feat(SW-1542): add Embla Carousel component and use in CarouselCards

* fix(SW-1542): remove max-width constraint for card on ipad

* fix(SW-1542): Add padding to start page content container

* refactor(SW-1542): Improve Embla Carousel type imports

* refactor(SW-1542): Remove unnecessary carousel wrapper div

* refactor(SW-1542): Modularize Carousel component structure

* refactor(SW-1542): Remove carousel dots display

* feat(SW-1542): Add carousel dots navigation

* refactor(SW-1542): Update Carousel component styling and types

* refactor(SW-1542): Remove uneeded useCallback from Carousel navigation methods

* refactor(SW-1542): Modify CarouselContextProps type to exclude className

* refactor(SW-1542): Optimize React imports in Carousel components

* refactor(SW-1542): Consolidate Carousel component and remove CarouselRoot

* refactor(SW-1542): Update Carousel navigation methods to use function-based scroll checks

* refactor(SW-1542): Add explicit children prop support to CarouselContent component

* refactor(SW-1542): Add children prop support to CarouselItem component


Approved-by: Christian Andolf
2025-02-14 10:53:14 +00:00
Erik Tiekstra
f9a03052b1 Merged in feat/SW-1616-clustering (pull request #1330)
feat(SW-1616): Added clustering on destination country/city pages

* feat(SW-1616): Added clustering on destination country/city pages


Approved-by: Fredrik Thorsson
Approved-by: Matilda Landström
2025-02-14 06:31:01 +00:00
Linus Flood
cd1ca159dc Merged in feat/sw-1637-netlify-runtime (pull request #1327)
feat/sw-1637 - Updated Netlify Runtime to latest version

* feat/sw-1637 - Updated Netlify Runtime to latest version


Approved-by: Michael Zetterberg
2025-02-13 10:40:10 +00:00
Joakim Jäderberg
46ebbbba8f Merged in feature/sas-login (pull request #1256)
First steps towards the SAS partnership

* otp flow now pretends to do the linking

* Update LinkAccountForm header

* Update redirect times

* Clean up comments

* Set maxAge on sas cookies

* make all SAS routes protected

* Merge remote-tracking branch 'refs/remotes/origin/feature/sas-login' into feature/sas-login

* Require auth for sas link flow

* Fix resend otp

* Add error support to OneTimePasswordForm

* Add Sentry to SAS error boundary

* Move SAS_REQUEST_OTP_STATE_STORAGE_COOKIE_NAME

* Add missing translations

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feature/sas-login

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* Add TooManyCodesError component

* Refactor GenericError to support new errors

* Add FailedAttemptsError

* remove removed component <VWOScript/>

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* remove local cookie-bot reference

* Fix sas campaign logo scaling

* feature toggle the SAS stuff

* Merge branch 'feature/sas-login' of bitbucket.org:scandic-swap/web into feature/sas-login

* fix: use env vars for SAS endpoints


Approved-by: Linus Flood
2025-02-05 14:43:14 +00:00
Linus Flood
b973882c5c fix: downgrade next-auth to v19 2025-01-09 10:17:48 +01:00
Linus Flood
3982b1ba56 Merged in feat/sentry (pull request #1089) 2024-12-19 10:35:20 +00:00
Linus Flood
742a2820d1 Merge remote-tracking branch 'origin' into feature/tracking 2024-12-13 09:02:37 +01:00
Christian Andolf
e08e960209 chore: add consistent type imports 2024-12-12 11:47:44 +01:00
Linus Flood
6a4364e1c4 Merge remote-tracking branch 'origin' into feature/tracking 2024-12-05 15:12:09 +01:00
Simon Emanuelsson
1d4a838860 feat(SW-866): download invoice 2024-12-05 11:21:20 +01:00
Linus Flood
bbadd3ac10 Use nanoid instead of uuid 2024-12-05 10:57:45 +01:00