vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace to shakapacker from webpacker

Browse source
This commit is contained in:
Yamagishi Kazutoshi 2022-05-09 17:57:57 +00:00
parent 0aacf00f5b
commit 64ee565b33
80 changed files with 1737 additions and 3956 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/mascot_helper.rb
View file

@ -2,7 +2,7 @@
module MascotHelper
def mascot_url
full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'))
full_asset_url(instance_presenter.mascot&.file&.url || asset_pack_path('static/elephant_ui_plane.svg'))
end
private

10
app/javascript/packs/about.js → app/javascript/about.js
View file

@ -1,11 +1,11 @@
import './public-path';
import loadPolyfills from '../mastodon/load_polyfills';
import { start } from '../mastodon/common';
import 'mastodon/public-path';
import loadPolyfills from 'mastodon/load_polyfills';
import { start } from 'mastodon/common';
start();
function loaded() {
const TimelineContainer = require('../mastodon/containers/timeline_container').default;
const TimelineContainer = require('mastodon/containers/timeline_container').default;
const React = require('react');
const ReactDOM = require('react-dom');
const mountNode = document.getElementById('mastodon-timeline');
@ -17,7 +17,7 @@ function loaded() {
}
function main() {
const ready = require('../mastodon/ready').default;
const ready = require('mastodon/ready').default;
ready(loaded);
}

8
app/javascript/packs/admin.js → app/javascript/admin.js
View file

@ -1,6 +1,6 @@
import './public-path';
import 'mastodon/public-path';
import { delegate } from '@rails/ujs';
import ready from '../mastodon/ready';
import ready from 'mastodon/ready';
const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
@ -170,8 +170,8 @@ ready(() => {
const componentName = element.getAttribute('data-admin-component');
const { locale, ...componentProps } = JSON.parse(element.getAttribute('data-props'));
import('../mastodon/containers/admin_component').then(({ default: AdminComponent }) => {
return import('../mastodon/components/admin/' + componentName).then(({ default: Component }) => {
import('mastodon/containers/admin_component').then(({ default: AdminComponent }) => {
return import('mastodon/components/admin/' + componentName).then(({ default: Component }) => {
ReactDOM.render((
<AdminComponent locale={locale}>
<Component {...componentProps} />

11
app/javascript/application.js Normal file
View file

@ -0,0 +1,11 @@
import 'mastodon/public-path';
import loadPolyfills from 'mastodon/load_polyfills';
import { start } from 'mastodon/common';
start();
loadPolyfills().then(() => {
require('mastodon/main').default();
}).catch(e => {
console.error(e);
});

4
app/javascript/packs/error.js → app/javascript/error.js
View file

@ -1,5 +1,5 @@
import './public-path';
import ready from '../mastodon/ready';
import 'mastodon/public-path';
import ready from 'mastodon/ready';
ready(() => {
const image = document.querySelector('img');

3
app/javascript/mailer.js Normal file
View file

@ -0,0 +1,3 @@
require('./styles/mailer.scss');
require.context('./icons');

2
app/javascript/mastodon/common.js
View file

@ -1,4 +1,4 @@
import Rails from '@rails/ujs';
import * as Rails from '@rails/ujs';
export function start() {
require('font-awesome/css/font-awesome.css');

1
app/javascript/mastodon/main.js
View file

@ -39,6 +39,7 @@ function main() {
console.error(err);
});
}
perf.stop('main()');
});
}

0
app/javascript/packs/public-path.js → app/javascript/mastodon/public-path.js
View file

2
app/javascript/mastodon/service_worker/web_push_notifications.js
View file

@ -1,6 +1,6 @@
import IntlMessageFormat from 'intl-messageformat';
import locales from './web_push_locales';
import { unescape } from 'lodash';
import locales from './web_push_locales';
const MAX_NOTIFICATIONS = 5;
const GROUP_TAG = 'tag';

11
app/javascript/packs/application.js
View file

@ -1,11 +0,0 @@
import './public-path';
import loadPolyfills from '../mastodon/load_polyfills';
import { start } from '../mastodon/common';
start();
loadPolyfills().then(() => {
require('../mastodon/main').default();
}).catch(e => {
console.error(e);
});

3
app/javascript/packs/mailer.js
View file

@ -1,3 +0,0 @@
require('../styles/mailer.scss');
require.context('../icons');

20
app/javascript/packs/public.js → app/javascript/public.js
View file

@ -1,10 +1,10 @@
import './public-path';
import escapeTextContentForBrowser from 'escape-html';
import loadPolyfills from '../mastodon/load_polyfills';
import ready from '../mastodon/ready';
import { start } from '../mastodon/common';
import loadKeyboardExtensions from '../mastodon/load_keyboard_extensions';
import 'mastodon/public-path';
import 'cocoon-js-vanilla';
import escapeTextContentForBrowser from 'escape-html';
import loadPolyfills from 'mastodon/load_polyfills';
import ready from 'mastodon/ready';
import { start } from 'mastodon/common';
import loadKeyboardExtensions from 'mastodon/load_keyboard_extensions';
start();
@ -26,10 +26,10 @@ window.addEventListener('message', e => {
function main() {
const IntlMessageFormat = require('intl-messageformat').default;
const { timeAgoString } = require('../mastodon/components/relative_timestamp');
const { timeAgoString } = require('mastodon/components/relative_timestamp');
const { delegate } = require('@rails/ujs');
const emojify = require('../mastodon/features/emoji/emoji').default;
const { getLocale } = require('../mastodon/locales');
const emojify = require('mastodon/features/emoji/emoji').default;
const { getLocale } = require('mastodon/locales');
const { messages } = getLocale();
const React = require('react');
const ReactDOM = require('react-dom');
@ -90,7 +90,7 @@ function main() {
const reactComponents = document.querySelectorAll('[data-component]');
if (reactComponents.length > 0) {
import(/* webpackChunkName: "containers/media_container" */ '../mastodon/containers/media_container')
import(/* webpackChunkName: "containers/media_container" */ 'mastodon/containers/media_container')
.then(({ default: MediaContainer }) => {
[].forEach.call(reactComponents, (component) => {
[].forEach.call(component.children, (child) => {

10
app/javascript/packs/share.js → app/javascript/share.js
View file

@ -1,11 +1,11 @@
import './public-path';
import loadPolyfills from '../mastodon/load_polyfills';
import { start } from '../mastodon/common';
import 'mastodon/public-path';
import loadPolyfills from 'mastodon/load_polyfills';
import { start } from 'mastodon/common';
start();
function loaded() {
const ComposeContainer = require('../mastodon/containers/compose_container').default;
const ComposeContainer = require('mastodon/containers/compose_container').default;
const React = require('react');
const ReactDOM = require('react-dom');
const mountNode = document.getElementById('mastodon-compose');
@ -17,7 +17,7 @@ function loaded() {
}
function main() {
const ready = require('../mastodon/ready').default;
const ready = require('mastodon/ready').default;
ready(loaded);
}

2
app/javascript/styles/mastodon/about.scss
View file

@ -164,7 +164,7 @@ $small-breakpoint: 960px;
td {
padding: 8px;
align-self: start;
align-items: start;
align-items: flex-start;
word-break: break-all;
&.nowrap {

4
app/javascript/styles/mastodon/components.scss
View file

@ -1758,7 +1758,7 @@ a.account__display-name {
width: 100%;
height: 100%;
display: flex;
align-items: center;
align-items: flex-center;
justify-content: center;
flex-direction: column;
scrollbar-width: none; /* Firefox */
@ -2619,7 +2619,7 @@ a.account__display-name {
.column-actions {
display: flex;
align-items: start;
align-items: flex-start;
justify-content: center;
padding: 40px;
padding-top: 40px;

6
app/javascript/packs/two_factor_authentication.js → app/javascript/two_factor_authentication.js
View file

@ -1,7 +1,7 @@
import axios from 'axios';
import * as WebAuthnJSON from '@github/webauthn-json';
import ready from '../mastodon/ready';
import 'regenerator-runtime/runtime';
import * as WebAuthnJSON from '@github/webauthn-json';
import axios from 'axios';
import ready from 'mastodon/ready';
function getCSRFToken() {
var CSRFSelector = document.querySelector('meta[name="csrf-token"]');

2
app/serializers/manifest_serializer.rb
View file

@ -32,7 +32,7 @@ class ManifestSerializer < ActiveModel::Serializer
def icons
ICON_SIZES.map do |size|
{
src: full_pack_url("media/icons/android-chrome-#{size}x#{size}.png"),
src: full_pack_url("static/android-chrome-#{size}x#{size}.png"),
sizes: "#{size}x#{size}",
type: 'image/png',
}

2
app/serializers/rest/instance_serializer.rb
View file

@ -39,7 +39,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
end
def thumbnail
instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url) : full_pack_url('media/images/preview.png')
instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url) : full_pack_url('static/preview.png')
end
def stats

4
app/views/about/more.html.haml
View file

@ -9,7 +9,7 @@
.column-0
.public-account-header.public-account-header--no-bar
.public-account-header__image
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.site_title, class: 'parallax'
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('static/preview.png'), alt: @instance_presenter.site_title, class: 'parallax'
.column-1
.landing-page__call-to-action{ dir: 'ltr' }
@ -25,7 +25,7 @@
%span= t 'about.status_count_after', count: @instance_presenter.status_count
.row__mascot
.landing-page__mascot
= image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('media/images/elephant_ui_plane.svg'), alt: ''
= image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('static/elephant_ui_plane.svg'), alt: ''
.column-2
.contact-widget

2
app/views/about/show.html.haml
View file

@ -53,7 +53,7 @@
.hero-widget
.hero-widget__img
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.site_title
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('static/preview.png'), alt: @instance_presenter.site_title
.hero-widget__text
%p

2
app/views/application/_sidebar.html.haml
View file

@ -1,6 +1,6 @@
.hero-widget
.hero-widget__img
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.site_title
= image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('static/preview.png'), alt: @instance_presenter.site_title
.hero-widget__text
%p= @instance_presenter.site_short_description.html_safe.presence || t('about.about_mastodon_html')

6
app/views/layouts/application.html.haml
View file

@ -14,12 +14,12 @@
%link{ rel: 'icon', href: '/favicon.ico', type: 'image/x-icon' }/
- %w(16 32 48).each do |size|
%link{ rel: 'icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/
%link{ rel: 'icon', sizes: "#{size}x#{size}", href: asset_pack_path("static/favicon-#{size}x#{size}.png"), type: 'image/png' }/
- %w(57 60 72 76 114 120 144 152 167 180 1024).each do |size|
%link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: asset_pack_path("media/icons/apple-touch-icon-#{size}x#{size}.png") }/
%link{ rel: 'apple-touch-icon', sizes: "#{size}x#{size}", href: asset_pack_path("static/apple-touch-icon-#{size}x#{size}.png") }/
%link{ rel: 'mask-icon', href: asset_pack_path('media/images/logo-symbol-icon.svg'), color: '#6364FF' }/
%link{ rel: 'mask-icon', href: asset_pack_path('static/logo-symbol-icon.svg'), color: '#6364FF' }/
%link{ rel: 'manifest', href: manifest_path(format: :json) }/
%meta{ name: 'theme-color', content: '#6364FF' }/
%meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/

4
app/views/layouts/mailer.html.haml
View file

@ -24,7 +24,7 @@
%tr
%td.column-cell
= link_to root_url do
= image_tag full_pack_url('media/images/mailer/wordmark.png'), alt: 'Mastodon', height: 34, class: 'logo'
= image_tag full_pack_url('static/mailer/wordmark.png'), alt: 'Mastodon', height: 34, class: 'logo'
= yield
@ -49,4 +49,4 @@
%p= link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
%td.column-cell.text-right
= link_to root_url do
= image_tag full_pack_url('media/images/mailer/logo.png'), alt: 'Mastodon', height: 24
= image_tag full_pack_url('static/mailer/logo.png'), alt: 'Mastodon', height: 24

2
app/views/notification_mailer/favourite.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_grade.png'), alt:''
= image_tag full_pack_url('static/mailer/icon_grade.png'), alt:''
%h1= t 'notification_mailer.favourite.title'
%p.lead= t('notification_mailer.favourite.body', name: @account.pretty_acct)

2
app/views/notification_mailer/follow.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_person_add.png'), alt: ''
%h1= t 'notification_mailer.follow.title'
%p.lead= t('notification_mailer.follow.body', name: @account.pretty_acct)

2
app/views/notification_mailer/follow_request.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_person_add.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_person_add.png'), alt: ''
%h1= t 'notification_mailer.follow_request.title'
%p.lead= t('notification_mailer.follow_request.body', name: @account.pretty_acct)

2
app/views/notification_mailer/mention.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_reply.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_reply.png'), alt: ''
%h1= t 'notification_mailer.mention.title'
%p.lead= t('notification_mailer.mention.body', name: @status.account.pretty_acct)

2
app/views/notification_mailer/reblog.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_cached.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_cached.png'), alt: ''
%h1= t 'notification_mailer.reblog.title'
%p.lead= t('notification_mailer.reblog.body', name: @account.pretty_acct)

2
app/views/shared/_og.html.haml
View file

@ -8,7 +8,7 @@
= opengraph 'og:type', 'website'
= opengraph 'og:title', @instance_presenter.site_title
= opengraph 'og:description', description
= opengraph 'og:image', full_asset_url(thumbnail&.file&.url || asset_pack_path('media/images/preview.png', protocol: :request))
= opengraph 'og:image', full_asset_url(thumbnail&.file&.url || asset_pack_path('static/preview.png', protocol: :request))
= opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
= opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630'
= opengraph 'twitter:card', 'summary_large_image'

2
app/views/user_mailer/appeal_approved.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_done.png'), alt: ''
%h1= t 'user_mailer.appeal_approved.title'

2
app/views/user_mailer/appeal_rejected.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_warning.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_warning.png'), alt: ''
%h1= t 'user_mailer.appeal_rejected.title'

2
app/views/user_mailer/backup_ready.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_file_download.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_file_download.png'), alt: ''
%h1= t 'user_mailer.backup_ready.title'

2
app/views/user_mailer/confirmation_instructions.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_email.png'), alt: ''
%h1= t 'devise.mailer.confirmation_instructions.title'

2
app/views/user_mailer/email_changed.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_email.png'), alt: ''
%h1= t 'devise.mailer.email_changed.title'
%p.lead= t 'devise.mailer.email_changed.explanation'

2
app/views/user_mailer/password_change.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.password_change.title'
%p.lead= t 'devise.mailer.password_change.explanation'

2
app/views/user_mailer/reconfirmation_instructions.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_email.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_email.png'), alt: ''
%h1= t 'devise.mailer.reconfirmation_instructions.title'
%p.lead= t 'devise.mailer.reconfirmation_instructions.explanation'

2
app/views/user_mailer/reset_password_instructions.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.reset_password_instructions.title'
%p.lead= t 'devise.mailer.reset_password_instructions.explanation'

2
app/views/user_mailer/suspicious_sign_in.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'user_mailer.suspicious_sign_in.title'
%p= t 'user_mailer.suspicious_sign_in.explanation'

2
app/views/user_mailer/two_factor_disabled.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.two_factor_disabled.title'
%p.lead= t 'devise.mailer.two_factor_disabled.explanation'

2
app/views/user_mailer/two_factor_enabled.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.two_factor_enabled.title'
%p.lead= t 'devise.mailer.two_factor_enabled.explanation'

2
app/views/user_mailer/two_factor_recovery_codes_changed.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.two_factor_recovery_codes_changed.title'
%p.lead= t 'devise.mailer.two_factor_recovery_codes_changed.explanation'

2
app/views/user_mailer/warning.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_flag.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_flag.png'), alt: ''
%h1= t "user_mailer.warning.title.#{@warning.action}"

2
app/views/user_mailer/webauthn_credential_added.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.webauthn_credential.added.title'
%p.lead= "#{t 'devise.mailer.webauthn_credential.added.explanation' }:"

2
app/views/user_mailer/webauthn_credential_deleted.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.webauthn_credential.deleted.title'
%p.lead= "#{t 'devise.mailer.webauthn_credential.deleted.explanation' }:"

2
app/views/user_mailer/webauthn_disabled.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.webauthn_disabled.title'
%p.lead= t 'devise.mailer.webauthn_disabled.explanation'

2
app/views/user_mailer/webauthn_enabled.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_lock_open.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_lock_open.png'), alt: ''
%h1= t 'devise.mailer.webauthn_enabled.title'
%p.lead= t 'devise.mailer.webauthn_enabled.explanation'

2
app/views/user_mailer/welcome.html.haml
View file

@ -17,7 +17,7 @@
%tbody
%tr
%td
= image_tag full_pack_url('media/images/mailer/icon_done.png'), alt: ''
= image_tag full_pack_url('static/mailer/icon_done.png'), alt: ''
%h1= t 'user_mailer.welcome.title', name: @resource.account.username
%p.lead= t 'user_mailer.welcome.explanation'