Move code

scripts/postcss/svg-builder.mjs

@@ -17,7 +17,7 @@ limitations under the License.
 import {readFileSync, mkdirSync, writeFileSync} from "fs";
 import {resolve} from "path";
 import {h32} from "xxhashjs";
-import {getColoredSvgString} from "./svg-colorizer.mjs";
+import {getColoredSvgString} from "../../src/platform/web/theming/actions/svg-colorizer.mjs";
 
 function createHash(content) {
     const hasher = new h32(0);

src/platform/web/Platform.js

@@ -38,7 +38,7 @@ import {downloadInIframe} from "./dom/download.js";
 import {Disposables} from "../../utils/Disposables";
 import {parseHTML} from "./parsehtml.js";
 import {handleAvatarError} from "./ui/avatar";
-import {ThemeLoader} from "./ThemeLoader";
+import {ThemeLoader} from "./theming/ThemeLoader";
 
 function addScript(src) {
     return new Promise(function (resolve, reject) {

src/platform/web/theming/DerivedVariables.ts

@@ -1,6 +1,6 @@
 /*
 Copyright 2020 The Matrix.org Foundation C.I.C.
-
+ 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import {derive} from "../../../scripts/postcss/color.mjs";
+import {derive} from "./actions/color.mjs";
 
 export class DerivedVariables {
     private _baseVariables: Record<string, string>;

src/platform/web/theming/IconColorizer.ts

@@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import type {Platform} from "./Platform.js";
+import type {Platform} from "../Platform.js";
-import {getColoredSvgString} from "../../../scripts/postcss/svg-colorizer.mjs";
+import {getColoredSvgString} from "./actions/svg-colorizer.mjs";
 
 type ParsedStructure = {
     [variableName: string]: {

src/platform/web/theming/ThemeBuilder.ts

@@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import type {ThemeInformation} from "./ThemeLoader";
-import type {Platform} from "./Platform.js";
+import type {Platform} from "../Platform.js";
-import type {ThemeManifest} from "../types/theme";
+import type {ThemeManifest} from "../../types/theme";
 import {ColorSchemePreference} from "./ThemeLoader";
 import {IconColorizer} from "./IconColorizer";
 import {DerivedVariables} from "./DerivedVariables";
-import {ILogItem} from "../../logging/types";
+import {ILogItem} from "../../../logging/types";
 
 export class ThemeBuilder {
     private _themeMapping: Record<string, ThemeInformation> = {};

vite.common-config.js

@@ -9,7 +9,7 @@ const manifest = require("./package.json");
 const version = manifest.version;
 const compiledVariables = new Map();
 import {buildColorizedSVG as replacer} from "./scripts/postcss/svg-builder.mjs";
-import {derive} from "./scripts/postcss/color.mjs";
+import {derive} from "./src/platform/web/theming/actions/color.mjs";
 
 const commonOptions = {
     logLevel: "warn",