Skip to content

chore(deps): update fundamental-styles to 0.39 #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2025
Merged

chore(deps): update fundamental-styles to 0.39 #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b06d969
chore(deps): update fundamental-styles to 0.39
droshev Mar 11, 2025
5d02e85
fix: update common-css package name
droshev Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/angular-generator/src/lib/schematics/common-schematics/add-dependencies/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {addPackageToPackageJson, getPackageVersionFromPackageJson} from '../util
// @ts-ignore is needed because the package.json is not available at build time
import packageJson from "../../package.json";

const commonCssPackageName = '@fundamental-styles/common-css';
const commonCssPackageName = '@sap-ui/common-css';
const themingNgxPackageName = '@ui5/theming-ngx';

export function addDependencies(options: Schema): Rule {
Expand Down
6 changes: 3 additions & 3 deletions libs/angular-generator/src/lib/schematics/common-schematics/add-styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ export function addStyles(options: Schema): Rule {

let styles = (buildTargetOptions['styles'] || []) as (string | { input: string })[];

styles = styles.filter(style => (typeof style === 'string' && !style.startsWith('node_modules/@fundamental-styles/common-css') ||
typeof style !== 'string' && !style.input.startsWith('node_modules/@fundamental-styles/common-css')));
styles = styles.filter(style => (typeof style === 'string' && !style.startsWith('node_modules/@sap-ui/common-css') ||
typeof style !== 'string' && !style.input.startsWith('node_modules/@sap-ui/common-css')));

options.commonCss.forEach((style) => {
styles.push(`node_modules/@fundamental-styles/common-css/dist/${style}.css`);
styles.push(`node_modules/@sap-ui/common-css/dist/${style}.css`);
});

buildTargetOptions['styles'] = styles;
Expand Down
2 changes: 1 addition & 1 deletion libs/fundamental-styles/schematics/add-dependencies/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {addPackageToPackageJson, getPackageVersionFromPackageJson} from '../util
// @ts-ignore is needed because the package.json is not available at build time
import packageJson from "../../package.json";

const commonCssPackageName = '@fundamental-styles/common-css';
const commonCssPackageName = '@sap-ui/common-css';
const themingNgxPackageName = '@ui5/theming-ngx';

export function addDependencies(options: Schema): Rule {
Expand Down
6 changes: 3 additions & 3 deletions libs/fundamental-styles/schematics/add-styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ export function addStyles(options: Schema): Rule {

let styles = (buildTargetOptions['styles'] || []) as (string | { input: string })[];

styles = styles.filter(style => (typeof style === 'string' && !style.startsWith('node_modules/@fundamental-styles/common-css') ||
typeof style !== 'string' && !style.input.startsWith('node_modules/@fundamental-styles/common-css')));
styles = styles.filter(style => (typeof style === 'string' && !style.startsWith('node_modules/@sap-ui/common-css') ||
typeof style !== 'string' && !style.input.startsWith('node_modules/@sap-ui/common-css')));

options.commonCss.forEach((style) => {
styles.push(`node_modules/@fundamental-styles/common-css/dist/${style}.css`);
styles.push(`node_modules/@sap-ui/common-css/dist/${style}.css`);
});

buildTargetOptions['styles'] = styles;
Expand Down
2 changes: 1 addition & 1 deletion libs/fundamental-styles/schematics/collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"private": true
},
"add-styles": {
"description": "Adds @fundamental-styles/common-css packages to the angular application.",
"description": "Adds @sap-ui/common-css packages to the angular application.",
"factory": "./add-styles/index#addStyles",
"schema": "./add-styles/schema.json",
"private": true
Expand Down
2 changes: 1 addition & 1 deletion libs/ui5-angular/schematics/add-dependencies/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {addPackageToPackageJson, getPackageVersionFromPackageJson} from '../util
// @ts-ignore is needed because the package.json is not available at build time
import packageJson from "../../package.json";

const commonCssPackageName = '@fundamental-styles/common-css';
const commonCssPackageName = '@sap-ui/common-css';
const themingNgxPackageName = '@ui5/theming-ngx';

export function addDependencies(options: Schema): Rule {
Expand Down
6 changes: 3 additions & 3 deletions libs/ui5-angular/schematics/add-styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ export function addStyles(options: Schema): Rule {

let styles = (buildTargetOptions['styles'] || []) as (string | { input: string })[];

styles = styles.filter(style => (typeof style === 'string' && !style.startsWith('node_modules/@fundamental-styles/common-css') ||
typeof style !== 'string' && !style.input.startsWith('node_modules/@fundamental-styles/common-css')));
styles = styles.filter(style => (typeof style === 'string' && !style.startsWith('node_modules/@sap-ui/common-css') ||
typeof style !== 'string' && !style.input.startsWith('node_modules/@sap-ui/common-css')));

options.commonCss.forEach((style) => {
styles.push(`node_modules/@fundamental-styles/common-css/dist/${style}.css`);
styles.push(`node_modules/@sap-ui/common-css/dist/${style}.css`);
});

buildTargetOptions['styles'] = styles;
Expand Down
2 changes: 1 addition & 1 deletion libs/ui5-angular/schematics/collection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"private": true
},
"add-styles": {
"description": "Adds @fundamental-styles/common-css packages to the angular application.",
"description": "Adds @sap-ui/common-css packages to the angular application.",
"factory": "./add-styles/index#addStyles",
"schema": "./add-styles/schema.json",
"private": true
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"@angular/platform-browser": "19.1.3",
"@angular/platform-browser-dynamic": "19.1.3",
"@angular/router": "19.1.3",
"@fundamental-styles/common-css": "^0.30.1",
"@nx/angular": "20.4.6",
"@sap-ui/common-css": "^0.39.0",
"@storybook/addon-docs": "^8.6.4",
"@storybook/blocks": "^8.6.4",
"@storybook/manager-api": "^8.6.4",
Expand Down Expand Up @@ -101,7 +101,7 @@
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "2.15.1",
"eslint-plugin-storybook": "^0.11.2",
"fundamental-styles": "^0.30.1",
"fundamental-styles": "^0.39.0",
"git-semver-tags": "^4.1.1",
"html-webpack-plugin": "^5.5.0",
"husky": "8.0.2",
Expand Down
36 changes: 18 additions & 18 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3162,15 +3162,6 @@ __metadata:
languageName: node
linkType: hard

"@fundamental-styles/common-css@npm:^0.30.1":
version: 0.30.2
resolution: "@fundamental-styles/common-css@npm:0.30.2"
dependencies:
"@sap-theming/theming-base-content": "npm:^11.7.0"
checksum: 10/4eb24487634b6112f85c85e0481622bb1c2cab3d7e26f6db22733e1e1c90a6cec81157744312b229ffe2e377d875258e3433b71ea905eeab3ccdc5161519db9a
languageName: node
linkType: hard

"@github/catalyst@npm:^1.6.0":
version: 1.7.0
resolution: "@github/catalyst@npm:1.7.0"
Expand Down Expand Up @@ -6404,13 +6395,22 @@ __metadata:
languageName: node
linkType: hard

"@sap-theming/theming-base-content@npm:^11.7.0":
"@sap-theming/theming-base-content@npm:^11.26.0":
version: 11.26.0
resolution: "@sap-theming/theming-base-content@npm:11.26.0"
checksum: 10/963db2058c149cbe4e280e2e52a53aac24e3eebc95dea8dd0fb41f02b652777e288098f31f506e764840e96ba8413bf5a2334f91f7ec65d12ad3a8e1fbb32ab8
languageName: node
linkType: hard

"@sap-ui/common-css@npm:^0.39.0":
version: 0.39.0
resolution: "@sap-ui/common-css@npm:0.39.0"
dependencies:
"@sap-theming/theming-base-content": "npm:^11.26.0"
checksum: 10/eb8a4d0503f75695fc959171311457908d0c1983c5b0a6b50eca526f17399601dd0d8cd53f217b848396e3f61e9967993009072f19850642cbce861457568b93
languageName: node
linkType: hard

"@schematics/angular@npm:19.1.4":
version: 19.1.4
resolution: "@schematics/angular@npm:19.1.4"
Expand Down Expand Up @@ -15059,13 +15059,13 @@ __metadata:
languageName: node
linkType: hard

"fundamental-styles@npm:^0.30.1":
version: 0.30.2
resolution: "fundamental-styles@npm:0.30.2"
"fundamental-styles@npm:^0.39.0":
version: 0.39.0
resolution: "fundamental-styles@npm:0.39.0"
peerDependencies:
"@fundamental-styles/common-css": 0.30.2
"@sap-theming/theming-base-content": ^11.7.0
checksum: 10/d63f8359f3bfcd227fa6ad868461da3a615f0b24a10fb7b19136508283ba1379f50a9fee0cb23a38f885e5f4196619f52e0da65d669cda7f8c2d7af8e2566a84
"@sap-theming/theming-base-content": ^11.26.0
"@sap-ui/common-css": 0.39.0
checksum: 10/755bafafea67f5a4a7318e7212334337a874e8b3f7cfe95484dbd23c4f8878a7ffa9cd34e909afddf7c40d11dd4f6844facb4db14b97d3572afcb30042fb1c10
languageName: node
linkType: hard

Expand Down Expand Up @@ -26949,7 +26949,6 @@ __metadata:
"@commitlint/cli": "npm:17.3.0"
"@commitlint/config-angular": "npm:17.3.0"
"@commitlint/config-conventional": "npm:17.3.0"
"@fundamental-styles/common-css": "npm:^0.30.1"
"@nx/angular": "npm:20.4.6"
"@nx/cypress": "npm:20.4.6"
"@nx/devkit": "npm:20.4.6"
Expand All @@ -26960,6 +26959,7 @@ __metadata:
"@nx/plugin": "npm:20.4.6"
"@nx/storybook": "npm:^20.5.0"
"@nx/workspace": "npm:20.4.6"
"@sap-ui/common-css": "npm:^0.39.0"
"@schematics/angular": "npm:19.1.4"
"@storybook/addon-docs": "npm:^8.6.4"
"@storybook/addon-essentials": "npm:^8.6.4"
Expand Down Expand Up @@ -27001,7 +27001,7 @@ __metadata:
fast-deep-equal: "npm:3.1.3"
fast-glob: "npm:3.2.12"
flatted: "npm:^3.2.7"
fundamental-styles: "npm:^0.30.1"
fundamental-styles: "npm:^0.39.0"
git-semver-tags: "npm:^4.1.1"
html-webpack-plugin: "npm:^5.5.0"
husky: "npm:8.0.2"
Expand Down