diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-15 18:17:37 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-16 14:50:42 +0200 |
| commit | f26f1145ac0fab4a657ee1fc784e824858601bd3 (patch) | |
| tree | 3980b53a1440a8e6d4ee8c539668c3c190363017 /app/javascript/packs | |
| parent | 8e8491e1dab5e2ed98770710e0a32484de8530b3 (diff) | |
| parent | 7a686082370ad6d1c7a7d0ad331c22bf3e1fbede (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
Diffstat (limited to 'app/javascript/packs')
| -rw-r--r-- | app/javascript/packs/about.js | 3 | ||||
| -rw-r--r-- | app/javascript/packs/application.js | 3 | ||||
| -rw-r--r-- | app/javascript/packs/public.js | 3 | ||||
| -rw-r--r-- | app/javascript/packs/share.js | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/app/javascript/packs/about.js b/app/javascript/packs/about.js index 63e12da42..843cb2c87 100644 --- a/app/javascript/packs/about.js +++ b/app/javascript/packs/about.js @@ -1,4 +1,7 @@ import loadPolyfills from '../mastodon/load_polyfills'; +import { start } from '../mastodon/common'; + +start(); function loaded() { const TimelineContainer = require('../mastodon/containers/timeline_container').default; diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 116632dea..c65ebed74 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -1,4 +1,7 @@ import loadPolyfills from '../mastodon/load_polyfills'; +import { start } from '../mastodon/common'; + +start(); loadPolyfills().then(() => { require('../mastodon/main').default(); diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js index d273231bd..0d37c34c8 100644 --- a/app/javascript/packs/public.js +++ b/app/javascript/packs/public.js @@ -1,5 +1,8 @@ import loadPolyfills from '../mastodon/load_polyfills'; import ready from '../mastodon/ready'; +import { start } from '../mastodon/common'; + +start(); function main() { const IntlRelativeFormat = require('intl-relativeformat').default; diff --git a/app/javascript/packs/share.js b/app/javascript/packs/share.js index e9580f648..4ef23e1b2 100644 --- a/app/javascript/packs/share.js +++ b/app/javascript/packs/share.js @@ -1,4 +1,7 @@ import loadPolyfills from '../mastodon/load_polyfills'; +import { start } from '../mastodon/common'; + +start(); function loaded() { const ComposeContainer = require('../mastodon/containers/compose_container').default; |