Skip to content

Commit 257039e

Browse files
droshevdroshev
authored
chore(deps): update fundamental-styles to 0.39 (#202)
* chore(deps): update fundamental-styles to 0.39 * fix: update common-css package name
1 parent 8d3c87c commit 257039e

File tree

10 files changed

+34
-34
lines changed

10 files changed

+34
-34
lines changed

‎libs/angular-generator/src/lib/schematics/common-schematics/add-dependencies/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {addPackageToPackageJson, getPackageVersionFromPackageJson} from '../util
77
// @ts-ignore is needed because the package.json is not available at build time
88
import packageJson from "../../package.json";
99

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

1313
export function addDependencies(options: Schema): Rule {

‎libs/angular-generator/src/lib/schematics/common-schematics/add-styles/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ export function addStyles(options: Schema): Rule {
1919

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

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

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

2929
buildTargetOptions['styles'] = styles;

‎libs/fundamental-styles/schematics/add-dependencies/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {addPackageToPackageJson, getPackageVersionFromPackageJson} from '../util
77
// @ts-ignore is needed because the package.json is not available at build time
88
import packageJson from "../../package.json";
99

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

1313
export function addDependencies(options: Schema): Rule {

‎libs/fundamental-styles/schematics/add-styles/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ export function addStyles(options: Schema): Rule {
1919

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

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

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

2929
buildTargetOptions['styles'] = styles;

‎libs/fundamental-styles/schematics/collection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"private": true
2020
},
2121
"add-styles": {
22-
"description": "Adds @fundamental-styles/common-css packages to the angular application.",
22+
"description": "Adds @sap-ui/common-css packages to the angular application.",
2323
"factory": "./add-styles/index#addStyles",
2424
"schema": "./add-styles/schema.json",
2525
"private": true

‎libs/ui5-angular/schematics/add-dependencies/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {addPackageToPackageJson, getPackageVersionFromPackageJson} from '../util
77
// @ts-ignore is needed because the package.json is not available at build time
88
import packageJson from "../../package.json";
99

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

1313
export function addDependencies(options: Schema): Rule {

‎libs/ui5-angular/schematics/add-styles/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ export function addStyles(options: Schema): Rule {
1919

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

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

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

2929
buildTargetOptions['styles'] = styles;

‎libs/ui5-angular/schematics/collection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"private": true
2020
},
2121
"add-styles": {
22-
"description": "Adds @fundamental-styles/common-css packages to the angular application.",
22+
"description": "Adds @sap-ui/common-css packages to the angular application.",
2323
"factory": "./add-styles/index#addStyles",
2424
"schema": "./add-styles/schema.json",
2525
"private": true

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"@angular/platform-browser": "19.1.3",
2828
"@angular/platform-browser-dynamic": "19.1.3",
2929
"@angular/router": "19.1.3",
30-
"@fundamental-styles/common-css": "^0.30.1",
3130
"@nx/angular": "20.4.6",
31+
"@sap-ui/common-css": "^0.39.0",
3232
"@storybook/addon-docs": "^8.6.4",
3333
"@storybook/blocks": "^8.6.4",
3434
"@storybook/manager-api": "^8.6.4",
@@ -101,7 +101,7 @@
101101
"eslint-config-prettier": "9.1.0",
102102
"eslint-plugin-cypress": "2.15.1",
103103
"eslint-plugin-storybook": "^0.11.2",
104-
"fundamental-styles": "^0.30.1",
104+
"fundamental-styles": "^0.39.0",
105105
"git-semver-tags": "^4.1.1",
106106
"html-webpack-plugin": "^5.5.0",
107107
"husky": "8.0.2",

‎yarn.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3162,15 +3162,6 @@ __metadata:
31623162
languageName: node
31633163
linkType: hard
31643164

3165-
"@fundamental-styles/common-css@npm:^0.30.1":
3166-
version: 0.30.2
3167-
resolution: "@fundamental-styles/common-css@npm:0.30.2"
3168-
dependencies:
3169-
"@sap-theming/theming-base-content": "npm:^11.7.0"
3170-
checksum: 10/4eb24487634b6112f85c85e0481622bb1c2cab3d7e26f6db22733e1e1c90a6cec81157744312b229ffe2e377d875258e3433b71ea905eeab3ccdc5161519db9a
3171-
languageName: node
3172-
linkType: hard
3173-
31743165
"@github/catalyst@npm:^1.6.0":
31753166
version: 1.7.0
31763167
resolution: "@github/catalyst@npm:1.7.0"
@@ -6404,13 +6395,22 @@ __metadata:
64046395
languageName: node
64056396
linkType: hard
64066397

6407-
"@sap-theming/theming-base-content@npm:^11.7.0":
6398+
"@sap-theming/theming-base-content@npm:^11.26.0":
64086399
version: 11.26.0
64096400
resolution: "@sap-theming/theming-base-content@npm:11.26.0"
64106401
checksum: 10/963db2058c149cbe4e280e2e52a53aac24e3eebc95dea8dd0fb41f02b652777e288098f31f506e764840e96ba8413bf5a2334f91f7ec65d12ad3a8e1fbb32ab8
64116402
languageName: node
64126403
linkType: hard
64136404

6405+
"@sap-ui/common-css@npm:^0.39.0":
6406+
version: 0.39.0
6407+
resolution: "@sap-ui/common-css@npm:0.39.0"
6408+
dependencies:
6409+
"@sap-theming/theming-base-content": "npm:^11.26.0"
6410+
checksum: 10/eb8a4d0503f75695fc959171311457908d0c1983c5b0a6b50eca526f17399601dd0d8cd53f217b848396e3f61e9967993009072f19850642cbce861457568b93
6411+
languageName: node
6412+
linkType: hard
6413+
64146414
"@schematics/angular@npm:19.1.4":
64156415
version: 19.1.4
64166416
resolution: "@schematics/angular@npm:19.1.4"
@@ -15059,13 +15059,13 @@ __metadata:
1505915059
languageName: node
1506015060
linkType: hard
1506115061

15062-
"fundamental-styles@npm:^0.30.1":
15063-
version: 0.30.2
15064-
resolution: "fundamental-styles@npm:0.30.2"
15062+
"fundamental-styles@npm:^0.39.0":
15063+
version: 0.39.0
15064+
resolution: "fundamental-styles@npm:0.39.0"
1506515065
peerDependencies:
15066-
"@fundamental-styles/common-css": 0.30.2
15067-
"@sap-theming/theming-base-content": ^11.7.0
15068-
checksum: 10/d63f8359f3bfcd227fa6ad868461da3a615f0b24a10fb7b19136508283ba1379f50a9fee0cb23a38f885e5f4196619f52e0da65d669cda7f8c2d7af8e2566a84
15066+
"@sap-theming/theming-base-content": ^11.26.0
15067+
"@sap-ui/common-css": 0.39.0
15068+
checksum: 10/755bafafea67f5a4a7318e7212334337a874e8b3f7cfe95484dbd23c4f8878a7ffa9cd34e909afddf7c40d11dd4f6844facb4db14b97d3572afcb30042fb1c10
1506915069
languageName: node
1507015070
linkType: hard
1507115071

@@ -26949,7 +26949,6 @@ __metadata:
2694926949
"@commitlint/cli": "npm:17.3.0"
2695026950
"@commitlint/config-angular": "npm:17.3.0"
2695126951
"@commitlint/config-conventional": "npm:17.3.0"
26952-
"@fundamental-styles/common-css": "npm:^0.30.1"
2695326952
"@nx/angular": "npm:20.4.6"
2695426953
"@nx/cypress": "npm:20.4.6"
2695526954
"@nx/devkit": "npm:20.4.6"
@@ -26960,6 +26959,7 @@ __metadata:
2696026959
"@nx/plugin": "npm:20.4.6"
2696126960
"@nx/storybook": "npm:^20.5.0"
2696226961
"@nx/workspace": "npm:20.4.6"
26962+
"@sap-ui/common-css": "npm:^0.39.0"
2696326963
"@schematics/angular": "npm:19.1.4"
2696426964
"@storybook/addon-docs": "npm:^8.6.4"
2696526965
"@storybook/addon-essentials": "npm:^8.6.4"
@@ -27001,7 +27001,7 @@ __metadata:
2700127001
fast-deep-equal: "npm:3.1.3"
2700227002
fast-glob: "npm:3.2.12"
2700327003
flatted: "npm:^3.2.7"
27004-
fundamental-styles: "npm:^0.30.1"
27004+
fundamental-styles: "npm:^0.39.0"
2700527005
git-semver-tags: "npm:^4.1.1"
2700627006
html-webpack-plugin: "npm:^5.5.0"
2700727007
husky: "npm:8.0.2"

0 commit comments

Comments
 (0)