Commit graph

4379 commits

Author SHA1 Message Date
Eric Eastwood 2b4a7f05a6 Fix Vite not being able analyze dynamic CSS styles import in dev
Fix:
```
$ yarn start
[vite] warning:
@theme/default
1  |  import "C:\Users\MLM\Documents\GitHub\element\hydrogen-web\src\platform\web\ui\css\themes\element\theme.css";import "@theme/element/light/variables.css"
   |          ^
The above dynamic import cannot be analyzed by vite.
See https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations for supported dynamic import formats. If this is intended to be left as-is, you can use the /* @vite-ignore */ comment inside the import() call to suppress this warning.

  Plugin: vite:import-analysis
  File: @theme/default
```

And in the browser, it results in none of the styles loading because of the following error:
```
Uncaught SyntaxError: Invalid Unicode escape sequence (at default:formatted:1:163)
```

---

Before:
```
import { injectQuery as __vite__injectQuery } from "/@vite/client";import "__vite__injectQuery(C:\Users\MLM\Documents\GitHub\element\hydrogen-web\src\platform\web\ui\css\themes\element\theme.css, 'import')";import "/@id/__x00__@theme/element/light/variables.css"
```

After:
```
import "/ui/css/themes/element/theme.css";import "/@id/__x00__@theme/element/light/variables.css"
```
2022-06-07 23:41:45 -05:00
RMidhunSuresh d08cfe3a29 Add more logging 2022-06-07 11:57:57 +05:30
RMidhunSuresh 51a837d459 Remove unuseed import 2022-06-06 17:26:39 +05:30
RMidhunSuresh 2f0f7143b5 Simplify code 2022-06-06 17:20:36 +05:30
RMidhunSuresh 0dac00f327 themeVariant is optional 2022-06-06 17:20:16 +05:30
RMidhunSuresh a639fc5467 Rever to sensisble defaults 2022-06-06 12:20:06 +05:30
RMidhunSuresh 258a604cc6 Don't make defaultTheme compulsory 2022-06-06 12:19:48 +05:30
RMidhunSuresh a2cbac9e0c Move code into method 2022-06-06 11:53:13 +05:30
RMidhunSuresh 71c3fb39a2 store theme-name and variant in settings 2022-06-05 20:52:47 +05:30
RMidhunSuresh 43244fa026 Add explaining comment 2022-06-05 20:52:47 +05:30
RMidhunSuresh 9e88bc3098 Fix bugs 2022-06-05 20:52:47 +05:30
RMidhunSuresh b74f4b612b Change UI 2022-06-05 20:52:47 +05:30
RMidhunSuresh 8de91291dd Add more methods to ThemeLoader 2022-06-05 20:52:47 +05:30
RMidhunSuresh dc2d1ce700 Remove id 2022-06-05 20:52:47 +05:30
RMidhunSuresh 12a8e94243 Move code into ThemeLoader 2022-06-05 20:52:47 +05:30
RMidhunSuresh 9e79b632a8 Extract variable 2022-06-05 20:52:47 +05:30
RMidhunSuresh efb1a67470 Make method name a verb 2022-06-05 20:52:47 +05:30
RMidhunSuresh e3235ea3eb Rename themeName --> themeId 2022-06-05 20:52:47 +05:30
RMidhunSuresh 46d2792dac Modify comment 2022-06-05 20:52:47 +05:30
RMidhunSuresh 8ad0b8a726 rename themeName --> variantName 2022-06-05 20:52:47 +05:30
RMidhunSuresh e8e4c33bae Rephrase comment 2022-06-05 20:52:47 +05:30
RMidhunSuresh cb03e97e78 Use default theme intially 2022-06-05 20:52:47 +05:30
RMidhunSuresh f6cec938a7 Add default theme to mapping 2022-06-05 20:52:47 +05:30
RMidhunSuresh bbec2effe5 Add typing 2022-06-05 20:52:47 +05:30
RMidhunSuresh d4084da299 Extract code into function 2022-06-05 20:52:47 +05:30
RMidhunSuresh 1f00c8f635 Add a temporary theme to test this PR 2022-06-05 20:52:47 +05:30
RMidhunSuresh 0b98473e85 Render a radio button for default variants 2022-06-05 20:52:47 +05:30
RMidhunSuresh 3afbe1148e Use the new built-asset format in ThemeLoader 2022-06-05 20:52:47 +05:30
RMidhunSuresh 809c522571 Change the format of built-asset 2022-06-05 20:52:47 +05:30
RMidhunSuresh 4474458f4b getActiveTheme should never return undefined
Instead it should throw an error.

This is useful for when we do setTheme(await getActiveTheme()) because
setTheme expects a string.
2022-06-05 20:52:47 +05:30
Eric Eastwood 9d8a578dce Better comment 2022-05-31 15:35:48 -05:00
Eric Eastwood 38c3774869 Import assets from the assets/ directory
> Will be easier towards the future when adding more assets. Probably best to keep style.css for now for backwards compat though.
>
> *-- https://github.com/vector-im/hydrogen-web/pull/693#discussion_r853844282*
2022-05-31 15:30:56 -05:00
Bruno Windels 8b2299852e
Merge pull request #744 from vector-im/bwindels/fix-tracker-changed-key-check
Fix: device with changed key not being properly ignored
2022-05-31 13:51:17 +02:00
Bruno Windels c62c8da10b fix changed key not being ignored 2022-05-31 13:39:35 +02:00
Bruno Windels bc51644868 reassignment is not used later on, remove 2022-05-31 13:39:23 +02:00
Bruno Windels 3d3d590334 add failing test for device with changed key being returned 2022-05-31 13:39:05 +02:00
Bruno Windels 11d7535c23 add some basic tests (with mock utils) for DeviceTracker 2022-05-31 13:38:34 +02:00
Bruno Windels a49d7eae5d
Merge pull request #693 from vector-im/madlittlemods/686-682-local-friendly-development-and-commonjs
Make the SDK friendly to locally link and develop on
2022-05-30 14:45:16 +02:00
Bruno Windels 1b2a6b5d0e
Merge branch 'master' into madlittlemods/686-682-local-friendly-development-and-commonjs 2022-05-30 14:15:19 +02:00
Bruno Windels ed8c98558d release v0.2.29 2022-05-18 21:45:45 +02:00
Bruno Windels 514d5c0a50
add notes about client side caching 2022-05-18 19:44:39 +00:00
Bruno Windels 13428bd03c allow updating cache of unhashed assets (like config) in service worker 2022-05-18 21:41:47 +02:00
Bruno Windels 1555b0f4bc put a message in container node when config file is not found 2022-05-18 21:41:31 +02:00
Bruno Windels 0e46aed0df rename config file to config.sample.json when packaging 2022-05-18 20:52:18 +02:00
Bruno Windels 7b0591be46 explain that push section of config usually doesn't need to be touched 2022-05-18 20:51:50 +02:00
Bruno Windels f21e103270 add newlines to config file when rewriting with theme stuff 2022-05-18 20:46:38 +02:00
Bruno Windels 7a197c0a1a add deployment instruction now that we have a config file 2022-05-18 20:44:04 +02:00
Bruno Windels 8a5f1ed9cd Merge remote-tracking branch 'origin/move-config-root' 2022-05-18 20:40:12 +02:00
Bruno Windels 36ddd61318
Merge pull request #724 from vector-im/theme-chooser
Implement theme chooser in settings
2022-05-18 20:22:38 +02:00
Bruno Windels 03ab1ee2c7 log theme being loaded 2022-05-18 17:48:03 +02:00