commit a68ab61

Author: Dominik Schmidt <[email protected]> Date: Mon Jan 23 09:39:26 2023 +0100 [full-ci] TypeScript almost everything (#8289) * Rename .js files to .ts This renames most of the actively used .js files to .ts. Notable exceptions: acceptance tests, docs, a few legacy (config) files for design system or web-app-skeleton * Fix imports * Fix global variables usage * fixup! Fix imports * Fix exports * Fix non-isolated modules * Fix types in clientRegistration * Fix breadcrumbs unit test * Fix jest config * Fix remaining type issues * Fix textUtils.naturalSortCompare
owncloud · Jan 23, 2023 · 6c934b0 · 6c934b0
1 parent 3e143a9
commit 6c934b0
Show file tree

Hide file tree

Showing 2 changed files with 126 additions and 106 deletions.
diff --git a/testing/testing.md b/testing/testing.md
@@ -88,13 +88,13 @@ and make sure there are no conflicting ports and everything runs smoothly. You c
 Depending on the backend you want to run the tests on, you can either run
 
 ```shell
-$ pnpm test:e2e:cucumber tests/e2e/cucumber/**/*[!.ocis].feature
+$ pnpm test:e2e:cucumber 'tests/e2e/cucumber/**/*[!.ocis].feature'
 ```
 
 for an **ownCloud 10** backend (filenames including `.ocis` are excluded) or
 
 ```shell
-$ OCIS=true pnpm test:e2e:cucumber tests/e2e/cucumber/**/*[!.oc10].feature
+$ OCIS=true pnpm test:e2e:cucumber 'tests/e2e/cucumber/**/*[!.oc10].feature'
 ```
 
 for an **oCIS** backend (filenames including `.oc10` are excluded).

diff --git a/theming/_index.md b/theming/_index.md
@@ -35,24 +35,32 @@ You can use the snippet below as a base for writing your own theme by replacing
 
 ```json
 {
-  "default": {
-    "general": {
-      "name": "ownCloud",
-      "slogan": "ownCloud – A safe home for all your data"
-    },
-    "logo": {
-      "topbar": "https://externalurl.example.com/url/for/remote/theme/assets/logo.svg",
-      "favicon": "https://externalurl.example.com/url/for/remote/theme/assets/favicon.jpg",
-      "login": "relative/path/for/local/theme/logo.svg"
-    },
-    "loginPage": {
-      "autoRedirect": true,
-      "backgroundImg": "relative/path/for/local/theme/background.jpg"
-    },
-    "designTokens": {}
+  "common": {
+    "name": "ownCloud",
+    "slogan": "ownCloud – A safe home for all your data",
+    "logo": "themes/owncloud/assets/logo.svg"
   },
-  "alternative": {},
-  "dark": {}
+  "ios": {},
+  "web": {
+    "default": {
+      "general": {
+        "name": "ownCloud",
+        "slogan": "ownCloud – A safe home for all your data"
+      },
+      "logo": {
+        "topbar": "https://externalurl.example.com/url/for/remote/theme/assets/logo.svg",
+        "favicon": "https://externalurl.example.com/url/for/remote/theme/assets/favicon.jpg",
+        "login": "relative/path/for/local/theme/logo.svg"
+      },
+      "loginPage": {
+        "autoRedirect": true,
+        "backgroundImg": "relative/path/for/local/theme/background.jpg"
+      },
+      "designTokens": {}
+    },
+    "alternative": {},
+    "dark": {}
+  }
 }
 ```
 
@@ -81,14 +89,18 @@ In general, the theme loader looks for a `designTokens` key inside your theme co
 
 ```json
 {
-  "default": {
-    "general": {},
-    "designTokens": {
-      "breakpoints": {},
-      "colorPalette": {},
-      "fontSizes": {},
-      "sizes": {},
-      "spacing": {}
+  "common": {},
+  "ios": {},
+  "web": {
+    "default": {
+      "general": {},
+      "designTokens": {
+        "breakpoints": {},
+        "colorPalette": {},
+        "fontSizes": {},
+        "sizes": {},
+        "spacing": {}
+      }
     }
   }
 }
@@ -232,88 +244,96 @@ An empty template for your custom theme is provided below, and you can use the i
 
 ```json
 {
-  "default": {
-    "general": {
-      "name": "",
-      "slogan": ""
-    },
-    "logo": {
-      "topbar": "",
-      "favicon": "",
-      "login": "",
-      "notFound": ""
-    },
-    "loginPage": {
-      "autoRedirect": true,
-      "backgroundImg": ""
-    },
-    "designTokens": {
-      "breakpoints": {
-        "xsmall-max": "",
-        "small-default": "",
-        "small-max": "",
-        "medium-default": "",
-        "medium-max": "",
-        "large-default": "",
-        "large-max": "",
-        "xlarge": ""
-      },
-      "colorPalette": {
-        "background-accentuate": "",
-        "background-default": "",
-        "background-highlight": "",
-        "background-muted": "",
-        "border": "",
-        "input-bg": "",
-        "input-border": "",
-        "input-text-default": "",
-        "input-text-muted": "",
-        "swatch-brand-default": "",
-        "swatch-brand-hover": "",
-        "swatch-danger-default": "",
-        "swatch-danger-hover": "",
-        "swatch-danger-muted": "",
-        "swatch-inverse-default": "",
-        "swatch-inverse-hover": "",
-        "swatch-inverse-muted": "",
-        "swatch-passive-default": "",
-        "swatch-passive-hover": "",
-        "swatch-passive-muted": "",
-        "swatch-primary-default": "",
-        "swatch-primary-hover": "",
-        "swatch-primary-muted": "",
-        "swatch-primary-gradient": "",
-        "swatch-success-default": "",
-        "swatch-success-hover": "",
-        "swatch-success-muted": "",
-        "swatch-warning-default": "",
-        "swatch-warning-hover": "",
-        "swatch-warning-muted": "",
-        "text-default": "",
-        "text-inverse": "",
-        "text-muted": ""
+   "common": {
+    "name": "",
+    "slogan": "",
+    "logo": ""
+  },
+  "ios": {},
+  "web": {
+    "default": {
+      "general": {
+        "name": "",
+        "slogan": ""
       },
-      "fontSizes": {
-        "default": "",
-        "large": "",
-        "medium": ""
+      "logo": {
+        "topbar": "",
+        "favicon": "",
+        "login": "",
+        "notFound": ""
       },
-      "sizes": {
-        "form-check-default": "",
-        "height-small": "",
-        "height-table-row": "",
-        "icon-default": "",
-        "max-height-logo": "",
-        "max-width-logo": "",
-        "width-medium": ""
+      "loginPage": {
+        "autoRedirect": true,
+        "backgroundImg": ""
       },
-      "spacing": {
-        "xsmall": "",
-        "small": "",
-        "medium": "",
-        "large": "",
-        "xlarge": "",
-        "xxlarge": ""
+      "designTokens": {
+        "breakpoints": {
+          "xsmall-max": "",
+          "small-default": "",
+          "small-max": "",
+          "medium-default": "",
+          "medium-max": "",
+          "large-default": "",
+          "large-max": "",
+          "xlarge": ""
+        },
+        "colorPalette": {
+          "background-accentuate": "",
+          "background-default": "",
+          "background-highlight": "",
+          "background-muted": "",
+          "border": "",
+          "input-bg": "",
+          "input-border": "",
+          "input-text-default": "",
+          "input-text-muted": "",
+          "swatch-brand-default": "",
+          "swatch-brand-hover": "",
+          "swatch-danger-default": "",
+          "swatch-danger-hover": "",
+          "swatch-danger-muted": "",
+          "swatch-inverse-default": "",
+          "swatch-inverse-hover": "",
+          "swatch-inverse-muted": "",
+          "swatch-passive-default": "",
+          "swatch-passive-hover": "",
+          "swatch-passive-muted": "",
+          "swatch-primary-default": "",
+          "swatch-primary-hover": "",
+          "swatch-primary-muted": "",
+          "swatch-primary-gradient": "",
+          "swatch-success-default": "",
+          "swatch-success-hover": "",
+          "swatch-success-muted": "",
+          "swatch-warning-default": "",
+          "swatch-warning-hover": "",
+          "swatch-warning-muted": "",
+          "text-default": "",
+          "text-inverse": "",
+          "text-muted": ""
+        },
+        "fontSizes": {
+          "default": "",
+          "large": "",
+          "medium": ""
+        },
+        "sizes": {
+          "form-check-default": "",
+          "height-small": "",
+          "height-table-row": "",
+          "icon-default": "",
+          "max-height-logo": "",
+          "max-width-logo": "",
+          "width-medium": ""
+        },
+        "spacing": {
+          "xsmall": "",
+          "small": "",
+          "medium": "",
+          "large": "",
+          "xlarge": "",
+          "xxlarge": ""
+        }
       }
     }
   }