Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Restore Lerna
id: yarn-cache
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Restore Lerna
id: yarn-cache
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Restore Lerna
id: yarn-cache
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Restore Lerna
id: yarn-cache
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24
- name: Set up Docker Compose alias
run: |
sudo touch /usr/bin/docker-compose
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Restore Lerna
id: yarn-cache
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Restore Lerna
id: yarn-cache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Configure CI Git User
run: |
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Authenticate with Registry
run: |
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Configure CI Git User
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 22
node-version: 24

- name: Restore Lerna
id: yarn-cache
Expand Down
1 change: 0 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"npmClientArgs": [
"--pure-lockfile"
],
"useWorkspaces": true,
"version": "3.0.0-beta.160",
"command": {
"version": {
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@
"build": "./scripts/build.sh",
"build:storybook:staging": "./scripts/build-storybook.sh",
"build:components": "yarn workspace @telekom/scale-components build",
"bootstrap": "lerna bootstrap",
"bootstrap": "yarn install --check-files",
"postbootstrap": "lerna run generate",
"new-version": "lerna version --conventional-commits --no-push",
"force-version": "lerna version --conventional-commits --force-publish",
"format": "lerna run format",
"publish-telekom": "lerna publish -y from-package --no-verify-access --no-git-tag-version --no-push --force-publish @telekom/scale-components,@telekom/scale-components-react,@telekom/scale-components-angular,@telekom/scale-components-vue --dist-tag latest",
"publish-telekom": "lerna publish -y from-package --no-git-tag-version --no-push --force-publish @telekom/scale-components,@telekom/scale-components-react,@telekom/scale-components-angular,@telekom/scale-components-vue --dist-tag latest",
"prepare-neutral": "node scripts/prepare-neutral-release.js && git commit . -m 'chore: temp commit'",
"publish-neutral": "lerna publish -y from-package --no-verify-access --no-git-tag-version --no-push --force-publish @telekom/scale-components-neutral,@telekom/scale-components-react-neutral,@telekom/scale-components-angular-neutral,@telekom/scale-components-vue-neutral --dist-tag next"
"publish-neutral": "lerna publish -y from-package --no-git-tag-version --no-push --force-publish @telekom/scale-components-neutral,@telekom/scale-components-react-neutral,@telekom/scale-components-angular-neutral,@telekom/scale-components-vue-neutral --dist-tag next"
},
"devDependencies": {
"@commitlint/cli": "^12.1.1",
"@commitlint/config-conventional": "^12.1.1",
"husky": "^9.1.7",
"lerna": "3.22.1",
"lerna": "^9.0.7",
"prettier": "3.8.4",
"replace-in-file": "^6.2.0",
"rimraf": "2.6.3"
"replace-in-file": "^8.4.0",
"rimraf": "^6.1.3"
},
"husky": {
"hooks": {
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
},
"engines": {
"node": "22.x",
"node": "24.x",
"npm": "please-use-yarn",
"yarn": "1.x"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@rollup/plugin-node-resolve": "^16.0.3",
"@rollup/plugin-typescript": "^11.1.1",
"@types/react-dom": "^18.3.1",
"rimraf": "^3.0.2",
"rimraf": "^6.1.3",
"rollup": "2.80.0",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-peer-deps-external": "^2.2.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/components-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@types/node": "^25.9.2",
"@vue/test-utils": "^1.2.0",
"jest": "^26.1.0",
"rimraf": "^2.6.3",
"rimraf": "^6.1.3",
"ts-jest": "^26.2.0",
"typescript": "^5.8.3"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"jsx-dom": "^6.4.17",
"postcss-custom-media": "^12.0.1",
"puppeteer": "^23.6.1",
"rimraf": "^3.0.2",
"rimraf": "^6.1.3",
"svg-parser": "^2.0.4",
"svgo": "^1.3.2",
"tslint": "^5.20.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/visual-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"copy": "rimraf ./storybook-static && cp -R ../storybook-vue/storybook-static ./",
"test": "PUPPETEER_CHROMIUM_REVISION=1055161 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true jest --forceExit",
"test:ci": "JEST_IMAGE_SNAPSHOT_TRACK_OBSOLETE=1 PUPPETEER_CHROMIUM_REVISION=1055161 jest --forceExit",
"test:m1": "DOCKER_DEFAULT_PLATFORM=linux/amd64 PUPPETEER_CHROMIUM_REVISION=1055161 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true jest --forceExit",
"test:m1": "DOCKER_DEFAULT_PLATFORM=linux/amd64 PUPPETEER_CHROMIUM_REVISION=1055161 PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true jest --forceExit --runInBand",
"format": "prettier --write \"package.json\" \"src/**/*.js\" \"./*.js\""
},
"dependencies": {
Expand All @@ -21,6 +21,6 @@
"jest-puppeteer-docker": "^1.4.2",
"puppeteer": "^13.0.0",
"puppeteer-extensions": "^1.0.3",
"rimraf": "^3.0.2"
"rimraf": "^6.1.3"
}
}
3 changes: 2 additions & 1 deletion packages/visual-tests/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ module.exports = async (jestConfig) => {
res.sendFile('index.html');
});

global.__SERVER__ = app.listen(3123);
// Bind to all interfaces so the Docker Chromium container can reach Storybook via host.docker.internal.
global.__SERVER__ = app.listen(3123, '0.0.0.0');
Comment thread
amir-ba marked this conversation as resolved.

await setupPuppeteer(jestConfig);
};
21 changes: 19 additions & 2 deletions packages/visual-tests/test-environment-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const path = require('path');
const initExtensions = require('puppeteer-extensions');
const { configureToMatchImageSnapshot } = require('jest-image-snapshot');

jest.setTimeout(10000);
jest.setTimeout(60000);

const testFileName = global.jasmine.testPath;
const testPath = path.dirname(testFileName);
Expand All @@ -24,8 +24,21 @@ const toMatchImageSnapshot = configureToMatchImageSnapshot({

expect.extend({ toMatchImageSnapshot });

const ensureLegacyRootSelector = async () => {
await global.page.evaluate(() => {
const hasLegacyRoot = document.querySelector('#root');
if (hasLegacyRoot) return;

const storybookRoot = document.querySelector('#storybook-root');
if (storybookRoot) {
storybookRoot.id = 'root';
}
});
};

global.visualCheck = async (options) => {
await global.page.waitForSelector('#root');
await global.page.waitForSelector('#root, #storybook-root');
await ensureLegacyRootSelector();
const previewHtml = await global.page.$('body');
expect(await previewHtml.screenshot()).toMatchImageSnapshot(options);
};
Expand All @@ -36,6 +49,8 @@ global.runSetup = async (id) => {
await global.page.goto(
`http://host.docker.internal:3123/iframe.html?id=${id}&viewMode=story`
);
await global.page.waitForSelector('#root, #storybook-root');
await ensureLegacyRootSelector();
await global.extensions.turnOffAnimations();
await global.page.evaluate(() => {
[
Expand All @@ -60,6 +75,8 @@ global.runColorSetup = async (id, mode) => {
await global.page.goto(
`http://host.docker.internal:3123/iframe.html?id=${id}&viewMode=story`
);
await global.page.waitForSelector('#root, #storybook-root');
await ensureLegacyRootSelector();
await global.page.evaluate((colorMode) => {
localStorage.setItem('persistedColorMode', JSON.stringify(colorMode));
}, mode);
Expand Down
Loading
Loading