Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release-3.0.0' into docs/38-boot…
Browse files Browse the repository at this point in the history
…strap-util-classes
  • Loading branch information
danielleroux committed Feb 27, 2025
2 parents 2da9dc4 + 732341e commit 8f9a26b
Show file tree
Hide file tree
Showing 18 changed files with 50 additions and 58 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ packages/documentation/docs/auto-generated/
packages/documentation/.build-temp
packages/documentation/scripts/.typedoc/
packages/documentation/static/auto-generated/
packages/documentation/static/ix-icon-svg/
packages/documentation/static/svg/
packages/documentation/static/figma/
packages/documentation/static/webcomponent-examples/*
packages/documentation/static/ionic-preview
Expand Down
2 changes: 1 addition & 1 deletion packages/aggrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"devDependencies": {
"@playwright/test": "^1.49.1",
"@siemens/ix": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"@types/gulp": "^4.0.14",
"@types/gulp-postcss": "^8.0.4",
"@types/gulp-sass": "^5.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-standalone-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@siemens/ix-angular": "workspace:*",
"@siemens/ix-echarts": "workspace:*",
"@siemens/ix-aggrid": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"ag-grid-angular": "^32.0.2",
"ag-grid-community": "^32.0.2",
"echarts": "5.4.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@siemens/ix": "workspace:*",
"@siemens/ix-angular": "workspace:*",
"@siemens/ix-echarts": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"@siemens/ix-aggrid": "workspace:*",
"ag-grid-angular": "^32.0.2",
"ag-grid-community": "^32.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"peerDependencies": {
"@angular/core": ">=17.3.0",
"@angular/forms": ">=17.3.0",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847"
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449"
},
"devDependencies": {
"@angular/animations": "^17.3.12",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"devDependencies": {
"@playwright/test": "^1.49.1",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"@stencil-community/eslint-plugin": "^0.7.2",
"@stencil-community/postcss": "^2.2.0",
"@stencil/angular-output-target": "^0.9.0",
Expand Down Expand Up @@ -88,7 +88,7 @@
"typescript": "~5.4.5"
},
"peerDependencies": {
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847"
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449"
},
"config": {
"commitizen": {
Expand Down
5 changes: 0 additions & 5 deletions packages/documentation/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,6 @@ const config: Config = {
name: 'description',
content:
'Siemens Industrial Experience is an open-source design system for designers and developers to consistently create the perfect digital experience for partners and customers',
},
{
//meta[name='ix-icons:path']
name: 'ix-icons:path',
content: '/ix-icon-svg',
}
],
colorMode: {
Expand Down
2 changes: 1 addition & 1 deletion packages/documentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@mdx-js/react": "^3.0.0",
"@siemens/ix": "workspace:*",
"@siemens/ix-echarts": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"@siemens/ix-react": "workspace:*",
"@stackblitz/sdk": "^1.11.0",
"angular-test-app": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/documentation/scripts/generate-markdown.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const tasks = new Listr<Context>(
{
title: "Copy ix-icons to documentation's static folder",
task: async () => {
const iconsPath = path.join(staticPath, 'ix-icon-svg');
const iconsPath = path.join(staticPath, 'svg');

if (!fs.existsSync(iconsPath)) {
await fs.mkdir(iconsPath);
Expand Down
4 changes: 4 additions & 0 deletions packages/documentation/src/theme/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,9 @@ export default function Root({ children }) {
}
}, []);

useEffect(() => {
setAssetPath_(location.origin);
}, []);

return <>{children}</>;
}
2 changes: 1 addition & 1 deletion packages/html-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@siemens/ix": "workspace:*",
"@siemens/ix-aggrid": "workspace:*",
"@siemens/ix-echarts": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"vite": "^3.2.10"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ionic-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@ionic/react": "^8.0.0",
"@ionic/react-router": "^8.0.0",
"@siemens/ix": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"@siemens/ix-react": "workspace:*",
"@types/react-router": "^5.1.20",
"@types/react-router-dom": "^5.3.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@siemens/ix": "workspace:*",
"@siemens/ix-aggrid": "workspace:*",
"@siemens/ix-echarts": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"@siemens/ix-react": "workspace:*",
"ag-grid-community": "^30.2.1",
"ag-grid-react": "^29.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"vitest": "^2.1.3"
},
"peerDependencies": {
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"react": ">=18.3.1",
"react-dom": ">=18.3.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"devDependencies": {
"@chromatic-com/storybook": "^3.2.2",
"@siemens/ix": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"@stencil/core": "~4.17.0",
"@storybook/addon-a11y": "^8.4.2",
"@storybook/addon-actions": "^8.4.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@siemens/ix": "workspace:*",
"@siemens/ix-aggrid": "workspace:*",
"@siemens/ix-echarts": "workspace:*",
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"@siemens/ix-vue": "workspace:*",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"vue": "^3.4.34"
},
"peerDependencies": {
"@siemens/ix-icons": "0.0.0-pr-69-20250203134847",
"@siemens/ix-icons": "0.0.0-pr-72-20250227071449",
"vue": ">=3.2.45"
}
}
67 changes: 30 additions & 37 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8f9a26b

Please sign in to comment.