Skip to content

Commit 48bfe08

Browse files
PelayoFelguerosoPelayoFelgueroso
authored
Merge branch 'master' into Mil4n0r/halstack-16-migration
2 parents e584ae7 + 4d69b87 commit 48bfe08

File tree

24 files changed

+354
-71
lines changed

24 files changed

+354
-71
lines changed

‎LOCAL.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<a href="https://developer.dxc.com/halstack/">
2+
<a href="https://developer.assure.dxc.com/halstack/">
33
<img src="apps/website/screens/common/images/halstack_logo.svg" alt="Halstack Design System logo" />
44
</a>
55
</p>
@@ -12,7 +12,7 @@ These instructions will get you a copy of the project up and running on your loc
1212

1313
## Before start working
1414

15-
Remember to read [the documentation site](https://developer.dxc.com/halstack/) carefully before trying to modify any Halstack implementation, documentation or examples.
15+
Remember to read [the documentation site](https://developer.assure.dxc.com/halstack/) carefully before trying to modify any Halstack implementation, documentation or examples.
1616

1717
## Monorepo structure
1818

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<a href="https://developer.dxc.com/halstack/">
2+
<a href="https://developer.assure.dxc.com/halstack/">
33
<img src="apps/website/screens/common/images/halstack_logo.svg" alt="Halstack Design System logo" />
44
</a>
55
</p>
@@ -31,7 +31,7 @@ const App = () => (
3131

3232
## Where to start
3333

34-
Learn everything you need to know about Halstack principles and components on the [official documentation site](https://developer.dxc.com/halstack/).
34+
Learn everything you need to know about Halstack principles and components on the [official documentation site](https://developer.assure.dxc.com/halstack/).
3535

3636
## Contributing
3737

‎apps/website/screens/components/container/code/ContainerCodePage.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,14 @@ const sections = [
361361
<TableCode>'static'</TableCode>
362362
</td>
363363
</tr>
364+
<tr>
365+
<td>ref</td>
366+
<td>
367+
<TableCode>{"React.Ref<HTMLDivElement>"}</TableCode>
368+
</td>
369+
<td>Reference to the component.</td>
370+
<td>-</td>
371+
</tr>
364372
<tr>
365373
<td>width</td>
366374
<td>

‎apps/website/screens/components/flex/code/FlexCodePage.tsx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,16 @@ const sections = [
135135
<TableCode>'row'</TableCode>
136136
</td>
137137
</tr>
138+
<tr>
139+
<td>fullHeight</td>
140+
<td>
141+
<TableCode>boolean</TableCode>
142+
</td>
143+
<td>If true, the component will take the full height of its parent container.</td>
144+
<td>
145+
<TableCode>false</TableCode>
146+
</td>
147+
</tr>
138148
<tr>
139149
<td>gap</td>
140150
<td>

‎apps/website/screens/overview/introduction/IntroductionPage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,12 @@ const sections = [
203203
</DxcParagraph>
204204
<DxcBulletedList>
205205
<DxcBulletedList.Item>
206-
<DxcLink href="https://developer.dxc.com/tools/react" newWindow>
206+
<DxcLink href="https://developer.assure.dxc.com/tools/react" newWindow>
207207
Previous React documentation
208208
</DxcLink>
209209
</DxcBulletedList.Item>
210210
<DxcBulletedList.Item>
211-
<DxcLink href="https://developer.dxc.com/tools/angular" newWindow>
211+
<DxcLink href="https://developer.assure.dxc.com/tools/angular" newWindow>
212212
Previous Angular documentation
213213
</DxcLink>
214214
</DxcBulletedList.Item>

‎apps/website/screens/overview/releases/ReleasesPage.tsx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,34 @@ const sections = [
2828
<DxcParagraph>Every major release of Halstack is collected below:</DxcParagraph>
2929
<DxcBulletedList>
3030
<DxcBulletedList.Item>
31-
<DxcLink href="https://developer.dxc.com/halstack/15/overview/introduction/">Halstack 15</DxcLink>
31+
<DxcLink href="https://developer.assure.dxc.com/halstack/15/overview/introduction/">Halstack 15</DxcLink>
3232
</DxcBulletedList.Item>
3333
<DxcBulletedList.Item>
34-
<DxcLink href="https://developer.dxc.com/halstack/14/overview/introduction/">Halstack 14</DxcLink>
34+
<DxcLink href="https://developer.assure.dxc.com/halstack/14/overview/introduction/">Halstack 14</DxcLink>
3535
</DxcBulletedList.Item>
3636
<DxcBulletedList.Item>
37-
<DxcLink href="https://developer.dxc.com/halstack/13/overview/introduction/">Halstack 13</DxcLink>
37+
<DxcLink href="https://developer.assure.dxc.com/halstack/13/overview/introduction/">Halstack 13</DxcLink>
3838
</DxcBulletedList.Item>
3939
<DxcBulletedList.Item>
40-
<DxcLink href="https://developer.dxc.com/halstack/12/overview/introduction/">Halstack 12</DxcLink>
40+
<DxcLink href="https://developer.assure.dxc.com/halstack/12/overview/introduction/">Halstack 12</DxcLink>
4141
</DxcBulletedList.Item>
4242
<DxcBulletedList.Item>
43-
<DxcLink href="https://developer.dxc.com/halstack/11/overview/introduction/">Halstack 11</DxcLink>
43+
<DxcLink href="https://developer.assure.dxc.com/halstack/11/overview/introduction/">Halstack 11</DxcLink>
4444
</DxcBulletedList.Item>
4545
<DxcBulletedList.Item>
46-
<DxcLink href="https://developer.dxc.com/halstack/10/overview/introduction/">Halstack 10</DxcLink>
46+
<DxcLink href="https://developer.assure.dxc.com/halstack/10/overview/introduction/">Halstack 10</DxcLink>
4747
</DxcBulletedList.Item>
4848
<DxcBulletedList.Item>
49-
<DxcLink href="https://developer.dxc.com/halstack/9/overview/introduction/">Halstack 9</DxcLink>
49+
<DxcLink href="https://developer.assure.dxc.com/halstack/9/overview/introduction/">Halstack 9</DxcLink>
5050
</DxcBulletedList.Item>
5151
<DxcBulletedList.Item>
52-
<DxcLink href="https://developer.dxc.com/halstack/8/overview/introduction/">Halstack 8</DxcLink>
52+
<DxcLink href="https://developer.assure.dxc.com/halstack/8/overview/introduction/">Halstack 8</DxcLink>
5353
</DxcBulletedList.Item>
5454
<DxcBulletedList.Item>
55-
<DxcLink href="https://developer.dxc.com/halstack/7/overview/introduction/">Halstack 7</DxcLink>
55+
<DxcLink href="https://developer.assure.dxc.com/halstack/7/overview/introduction/">Halstack 7</DxcLink>
5656
</DxcBulletedList.Item>
5757
<DxcBulletedList.Item>
58-
<DxcLink href="https://developer.dxc.com/halstack/6/overview/introduction/">Halstack 6</DxcLink>
58+
<DxcLink href="https://developer.assure.dxc.com/halstack/6/overview/introduction/">Halstack 6</DxcLink>
5959
</DxcBulletedList.Item>
6060
</DxcBulletedList>
6161
<DxcParagraph>
@@ -75,7 +75,7 @@ const sections = [
7575
<DxcParagraph>
7676
To check the latest features under development by the Halstack team, you can access the <Code>next</Code>{" "}
7777
version of the documentation through this{" "}
78-
<DxcLink href="https://developer.dxc.com/halstack/next/">link</DxcLink>. Please note that this version is
78+
<DxcLink href="https://developer.assure.dxc.com/halstack/next/">link</DxcLink>. Please note that this version is
7979
unstable and may contain minor bugs. For a better experience with Halstack, we recommend, if possible,
8080
always using the latest release available.
8181
</DxcParagraph>

‎package-lock.json‎

Lines changed: 145 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/lib/eslint.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ const __dirname = dirname(__filename);
77

88
/** @type {import("eslint").Config[]} */
99
export default [
10-
{ ignores: ["dist/**", "coverage/**", "eslint.config.mjs"] },
10+
{ ignores: ["dist/**", "coverage/**", "eslint.config.mjs", "storybook-static/**"] },
1111
...libraryConfig({ tsconfigRootDir: __dirname }),
1212
];

‎packages/lib/jest.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const config: Config = {
55
coveragePathIgnorePatterns: [
66
"utils.ts",
77
"index.ts",
8+
"test/mocks",
89
".*Context\\.tsx$", // Is deprecated and will be removed in the future
910
],
1011
moduleNameMapper: {

‎packages/lib/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
"playwright": "^1.54.1",
9595
"storybook": "^9.1.10",
9696
"storybook-addon-pseudo-states": "^9.1.10",
97+
"ts-node": "^10.9.2",
9798
"tsup": "^8.1.0",
9899
"typescript": "^5.6.3",
99100
"vitest": "^3.2.4",

0 commit comments

Comments
 (0)