Skip to content

Commit 0ea4f96

Browse files
authored
Merge branch 'main' into fix/at-scale-width-perf
2 parents f65562c + 85f66b4 commit 0ea4f96

32 files changed

Lines changed: 585 additions & 586 deletions

.github/workflows/chromatic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
run: yarn install --immutable
2424

2525
- name: Publish to Chromatic
26-
uses: chromaui/action@0794e6939fe40ce46a88963f818092afc427da5b # v15.3.0
26+
uses: chromaui/action@f191a0224b10e1a38b2091cefb7b7a2337009116 # v16.0.0
2727
with:
2828
token: ${{ secrets.GITHUB_TOKEN }}
2929
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
# Initializes the CodeQL tools for scanning.
4545
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
46+
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
4747
with:
4848
languages: ${{ matrix.language }}
4949
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
5454
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5555
# If this step fails, then you should remove it and run the build manually (see below)
5656
- name: Autobuild
57-
uses: github/codeql-action/autobuild@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
57+
uses: github/codeql-action/autobuild@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
5858

5959
# ℹ️ Command-line programs to run using the OS shell.
6060
# 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
6868
# make release
6969

7070
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
71+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3131

32-
- uses: preactjs/compressed-size-action@8518045ed95e94e971b83333085e1cb99aa18aa8 # 2.9.0
32+
- uses: preactjs/compressed-size-action@66325aad6443cb7cf89c4bfcd414aea2367cda94 # 2.9.1
3333
with:
3434
repo-token: '${{ secrets.GITHUB_TOKEN }}'
3535
pattern: 'packages/**/dist/**/*.{js,css}'

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.14.0
1+
24.14.1

.storybook/main.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ const config: StorybookConfig = {
7777
reactDocgen: 'react-docgen-typescript',
7878
reactDocgenTypescriptOptions: {
7979
tsconfigPath: fileURLToPath(new URL('../tsconfig.json', import.meta.url)),
80+
shouldExtractLiteralValuesFromEnum: true,
81+
shouldRemoveUndefinedFromOptional: true,
8082
},
8183
},
8284
staticDirs: isDevMode ? ['images-dev'] : ['images'],

config/merge-css-modules.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { glob } from 'glob';
44

55
const cssDir = resolve(process.cwd(), 'dist', 'css');
66
const cssIndexFile = resolve(cssDir, 'index.css');
7+
const cssIndexTypes = resolve(cssDir, 'index.d.css.ts');
78

89
const cssModules = await glob(`${cssDir}/**/*.module.css`);
910

@@ -25,3 +26,10 @@ for (const cssModule of cssModules) {
2526
}
2627

2728
writeFileSync(cssIndexFile, fileContent.join('\n'));
29+
writeFileSync(
30+
cssIndexTypes,
31+
`declare const css: string;
32+
33+
export default css;
34+
`,
35+
);

examples/nextjs-app/package-lock.json

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

examples/nextjs-pages/package-lock.json

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

0 commit comments

Comments
 (0)