mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
3ef5f62abf
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.
94 lines
1.8 KiB
YAML
94 lines
1.8 KiB
YAML
# Note: You must restart bin/webpack-dev-server for changes to take effect
|
|
|
|
default: &default
|
|
source_path: app/javascript
|
|
source_entry_path: packs
|
|
public_root_path: public
|
|
public_output_path: packs
|
|
cache_path: tmp/cache/webpacker
|
|
check_yarn_integrity: false
|
|
webpack_compile_output: false
|
|
|
|
# Additional paths webpack should lookup modules
|
|
# ['app/assets', 'engine/foo/app/assets']
|
|
resolved_paths: []
|
|
|
|
# Reload manifest.json on all requests so we reload latest compiled packs
|
|
cache_manifest: false
|
|
|
|
# Extract and emit a css file
|
|
extract_css: true
|
|
|
|
static_assets_extensions:
|
|
- .jpg
|
|
- .jpeg
|
|
- .png
|
|
- .tiff
|
|
- .ico
|
|
- .svg
|
|
- .gif
|
|
- .eot
|
|
- .otf
|
|
- .ttf
|
|
- .woff
|
|
- .woff2
|
|
|
|
extensions:
|
|
- .mjs
|
|
- .js
|
|
- .jsx
|
|
- .sass
|
|
- .scss
|
|
- .css
|
|
- .module.sass
|
|
- .module.scss
|
|
- .module.css
|
|
- .png
|
|
- .svg
|
|
- .gif
|
|
- .jpeg
|
|
- .jpg
|
|
|
|
development:
|
|
<<: *default
|
|
|
|
compile: true
|
|
|
|
# Reference: https://webpack.js.org/configuration/dev-server/
|
|
dev_server:
|
|
https: false
|
|
host: localhost
|
|
port: 3035
|
|
public: localhost:3035
|
|
hmr: false
|
|
# Inline should be set to true if using HMR
|
|
inline: true
|
|
overlay: true
|
|
compress: true
|
|
disable_host_check: true
|
|
use_local_ip: false
|
|
quiet: false
|
|
headers:
|
|
'Access-Control-Allow-Origin': '*'
|
|
watch_options:
|
|
ignored: '**/node_modules/**'
|
|
|
|
test:
|
|
<<: *default
|
|
|
|
# CI precompiles packs prior to running the tests.
|
|
# Also avoids race conditions in parallel_tests.
|
|
compile: false
|
|
|
|
# Compile test packs to a separate directory
|
|
public_output_path: packs-test
|
|
|
|
production:
|
|
<<: *default
|
|
|
|
# Production depends on precompilation of packs prior to booting for performance.
|
|
compile: false
|
|
|
|
# Cache manifest.json for performance
|
|
cache_manifest: true
|