~cytrogen/masto-fe

ref: 0f77cb593c2cfd851f1ca73bd1cfb5e36d2d0bd1 masto-fe/package.json -rw-r--r-- 8.3 KiB
0f77cb59 — Thiago 'Jedi' Cerqueira 1 year, 1 month ago
[chore] Add dev script for easier development loop (#16)

This PR adds a npm "dev" script. Upon executing `npm run dev`, the project will be served (default port 3035) in "watch" mode, every local change of the files will refresh the page.

This change should enable faster development loop.

Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/16
Co-authored-by: Thiago 'Jedi' Cerqueira <thiagoa7@gmail.com>
Co-committed-by: Thiago 'Jedi' Cerqueira <thiagoa7@gmail.com>
weeeeeeeee
6ac4848f — Laura Hausmann 2 years ago
Merge remote-tracking branch 'upstream' into glitch
9af24835 — Claire 2 years ago
Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f
90789170 — Laura Hausmann 2 years ago
Update build commands
702d1629 — Claire 2 years ago
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
9b785877 — renovate[bot] 2 years ago
Update DefinitelyTyped types (non-major) (#27212)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
743fede5 — Claire 2 years ago
Merge pull request #2406 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df
08b495d9 — Claire 2 years ago
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
e9b528ea — Renaud Chaput 2 years ago
Use NodeJS v20 by default (#26830)

e80b36d8 — Claire 2 years ago
Merge pull request #2396 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
e66f961e — Claire 2 years ago
Merge branch 'main' into glitch-soc/merge-upstream
3e6a6439 — renovate[bot] 2 years ago
Update dependency stylelint-config-standard-scss to v11 (#26780)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
ee02b10e — Claire 2 years ago
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes into glitch-soc
4ed629cd — Claire 2 years ago
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream

Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
c8aa3d6d — Claire 2 years ago
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
be991f1d — Gabriel Simmer 2 years ago
Move to ioredis for streaming (#26581)

Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
9d9de8d2 — renovate[bot] 2 years ago
Update dependency @testing-library/jest-dom to v6 (#26479)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
d847c206 — Claire 2 years ago
Merge pull request #2383 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes
296b3d15 — Claire 2 years ago
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
Next