Skip to content

Commit 65c3845

Browse files
committed
Merge branch 'next' into add-useslot-poppver
2 parents 93b32c4 + 384e5e4 commit 65c3845

File tree

447 files changed

+5848
-3478
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

447 files changed

+5848
-3478
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
22+
uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
2323
with:
2424
languages: typescript
2525
config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
3030
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
3131
# queries: security-extended,security-and-quality
3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
33+
uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343

4444
# Upload the results to GitHub's code scanning dashboard.
4545
- name: Upload to code-scanning
46-
uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
46+
uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
4747
with:
4848
sarif_file: results.sarif

.stylelintrc.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

apps/local-ui-lib/index.d.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
import * as React from 'react';
2+
13
export const bounceAnim: string;
24
export const Button: React.ComponentType<
3-
JSX.IntrinsicElements['button'] & {
5+
React.JSX.IntrinsicElements['button'] & {
46
isRed?: boolean;
57
sx?: unknown;
68
}

apps/pigment-css-next-app/next.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-env node */
22
// eslint-ignore-next-line import/no-unresolved
33
const { withPigment } = require('@pigment-css/nextjs-plugin');
4-
const { experimental_extendTheme: extendTheme } = require('@mui/material/styles');
4+
const { extendTheme } = require('@mui/material/styles');
55

66
/**
77
* @typedef {import('@pigment-css/nextjs-plugin').PigmentOptions} PigmentOptions

apps/pigment-css-vite-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"react-router-dom": "^6.23.1"
2626
},
2727
"devDependencies": {
28-
"@babel/preset-react": "^7.24.1",
29-
"@babel/preset-typescript": "^7.24.1",
28+
"@babel/preset-react": "^7.24.6",
29+
"@babel/preset-typescript": "^7.24.6",
3030
"@pigment-css/vite-plugin": "^0.0.9",
3131
"@types/react": "^18.2.55",
3232
"@types/react-dom": "^18.3.0",

apps/pigment-css-vite-app/src/augment.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { experimental_extendTheme } from '@mui/material/styles';
1+
import type { extendTheme } from '@mui/material/styles';
22
import '@pigment-css/react/theme';
33

44
declare module '@pigment-css/react/theme' {
55
export interface ThemeArgs {
6-
theme: ReturnType<typeof experimental_extendTheme> & {
6+
theme: ReturnType<typeof extendTheme> & {
77
applyDarkStyles<T>(obj: T): Record<string, T>;
88
};
99
}

apps/pigment-css-vite-app/src/extend-zero.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import type { experimental_extendTheme } from '@mui/material/styles';
1+
import type { extendTheme } from '@mui/material/styles';
22

33
declare module '@pigment-css/react/theme' {
44
interface ThemeArgs {
5-
theme: ReturnType<typeof experimental_extendTheme> & {
5+
theme: ReturnType<typeof extendTheme> & {
66
applyDarkStyles<T>(obj: T): Record<string, T>;
77
};
88
}

apps/pigment-css-vite-app/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { defineConfig, splitVendorChunkPlugin } from 'vite';
33
import reactPlugin from '@vitejs/plugin-react';
44
import Pages from 'vite-plugin-pages';
55
import { pigment } from '@pigment-css/vite-plugin';
6-
import { experimental_extendTheme as extendTheme } from '@mui/material/styles';
6+
import { extendTheme } from '@mui/material/styles';
77

88
const theme = extendTheme({
99
getSelector: function getSelector(colorScheme, css) {

docs/data/about/teamMembers.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,5 +315,13 @@
315315
"about": "Amateur cook, DIYer, and film photographer",
316316
"github": "KenanYusuf",
317317
"twitter": "KebabYusuf"
318+
},
319+
{
320+
"name": "Nikita Ossei",
321+
"title": "Customer Support",
322+
"location": "London, United Kingdom",
323+
"locationCountry": "uk",
324+
"about": "Astrology ♊️, learning 📚 and designing stuff 🎨",
325+
"github": "nikitaa24"
318326
}
319327
]

0 commit comments

Comments
 (0)