Fix theme-related Vite errors even when theme_tokens feature flag is disabled (#36936)
Some checks are pending
Bundler Audit / security (push) Waiting to run
Check i18n / check-i18n (push) Waiting to run
Chromatic / Run Chromatic (push) Waiting to run
CodeQL / Analyze (actions) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
CodeQL / Analyze (ruby) (push) Waiting to run
Check formatting / lint (push) Waiting to run
Haml Linting / lint (push) Waiting to run
JavaScript Linting / lint (push) Waiting to run
Ruby Linting / lint (push) Waiting to run
JavaScript Testing / test (push) Waiting to run
Historical data migration test / test (14-alpine) (push) Waiting to run
Historical data migration test / test (15-alpine) (push) Waiting to run
Historical data migration test / test (16-alpine) (push) Waiting to run
Historical data migration test / test (17-alpine) (push) Waiting to run
Ruby Testing / build (production) (push) Waiting to run
Ruby Testing / build (test) (push) Waiting to run
Ruby Testing / test (.ruby-version) (push) Blocked by required conditions
Ruby Testing / test (3.2) (push) Blocked by required conditions
Ruby Testing / test (3.3) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions
Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions
Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions
Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions
Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions
Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions

This commit is contained in:
diondiondion 2025-11-19 13:37:15 +01:00 committed by GitHub
parent 4d0aab4a31
commit 366856f3bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -40,13 +40,15 @@ export function MastodonThemes(): Plugin {
// Get all files mentioned in the themes.yml file. // Get all files mentioned in the themes.yml file.
const themes = await loadThemesFromConfig(projectRoot); const themes = await loadThemesFromConfig(projectRoot);
const allThemes = {
...themes,
default_theme_tokens: 'styles_new/application.scss',
'mastodon-light_theme_tokens': 'styles_new/mastodon-light.scss',
contrast_theme_tokens: 'styles_new/contrast.scss',
};
for (const [themeName, themePath] of Object.entries(themes)) { for (const [themeName, themePath] of Object.entries(allThemes)) {
entrypoints[`themes/${themeName}`] = path.resolve(jsRoot, themePath); entrypoints[`themes/${themeName}`] = path.resolve(jsRoot, themePath);
entrypoints[`themes/${themeName}_theme_tokens`] = path.resolve(
jsRoot,
themePath.replace('styles/', 'styles_new/'),
);
} }
return { return {