Skip to content
Snippets Groups Projects
Commit cbca3c76 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-7021-static-sites-app

# Conflicts:
#	alfa-client/package-lock.json
#	alfa-client/package.json
parents cc496452 4fbd21db
Branches
Tags
No related merge requests found
pipeline {
agent {
node {
label 'ozgcloud-jenkins-build-agent'
label 'ozgcloud-jenkins-build-agent-jdk21-node20'
}
}
......@@ -11,7 +11,8 @@ pipeline {
SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
FAILED_STAGE = ""
SH_SUCCESS_STATUS_CODE = 0
FORCE_COLOR = 0
NO_COLOR = 1
}
options {
......
This diff is collapsed.
......@@ -48,7 +48,7 @@
"cypress:open-admin": "npx cypress open --project apps/admin-e2e",
"workspace-generator": "nx workspace-generator",
"storybook": "nx storybook design-system",
"ci-storybook": "nx storybook build design-system && nx container design-system"
"ci-storybook": "nx build-storybook design-system && nx container design-system"
},
"private": true,
"dependencies": {
......@@ -115,10 +115,10 @@
"@nx/web": "19.8.8",
"@nx/workspace": "19.8.8",
"@schematics/angular": "18.2.8",
"@storybook/addon-essentials": "^8.3.5",
"@storybook/addon-interactions": "^8.3.5",
"@storybook/angular": "^8.3.5",
"@storybook/core-server": "^8.3.5",
"@storybook/addon-essentials": "^8.4.2",
"@storybook/addon-interactions": "^8.4.2",
"@storybook/angular": "^8.4.2",
"@storybook/core-server": "^8.4.2",
"@tailwindcss/typography": "^0.5.15",
"@testing-library/jest-dom": "^6.4.5",
"@types/file-saver": "2.0.7",
......@@ -156,7 +156,7 @@
"prettier-plugin-organize-imports": "^4.1.0",
"prettier-plugin-tailwindcss": "^0.6.8",
"sonarqube-scanner": "^4.2.5",
"storybook": "^8.3.5",
"storybook": "^8.4.2",
"tailwind-merge": "^2.5.4",
"tailwindcss": "^3.4.14",
"ts-jest": "^29.1.0",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment