moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'subdir-fixes' into 'develop' 

Subdirectory fixes: sounds, publicPath

See merge request soapbox-pub/soapbox-fe!711
This commit is contained in:
Alex Gleason 2021-09-04 18:01:30 +00:00
parent f27fbc1c38 ecb2c1de25
commit 57e1fec66a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/soapbox/middleware/sounds.js
View File

@ -1,5 +1,8 @@
'use strict'; 'use strict';
import { join } from 'path';
import { FE_BASE_PATH } from 'soapbox/build_config';
const createAudio = sources => { const createAudio = sources => {
const audio = new Audio(); const audio = new Audio();
sources.forEach(({ type, src }) => { sources.forEach(({ type, src }) => {
@ -28,21 +31,21 @@ export default function soundsMiddleware() {
const soundCache = { const soundCache = {
boop: createAudio([ boop: createAudio([
{ {
src: '/sounds/boop.ogg', src: join(FE_BASE_PATH, '/sounds/boop.ogg'),
type: 'audio/ogg', type: 'audio/ogg',
}, },
{ {
src: '/sounds/boop.mp3', src: join(FE_BASE_PATH, '/sounds/boop.mp3'),
type: 'audio/mpeg', type: 'audio/mpeg',
}, },
]), ]),
chat: createAudio([ chat: createAudio([
{ {
src: '/sounds/chat.oga', src: join(FE_BASE_PATH, '/sounds/chat.oga'),
type: 'audio/ogg', type: 'audio/ogg',
}, },
{ {
src: '/sounds/chat.mp3', src: join(FE_BASE_PATH, '/sounds/chat.mp3'),
type: 'audio/mpeg', type: 'audio/mpeg',
}, },
]), ]),

2
webpack/shared.js
View File

@ -39,7 +39,7 @@ module.exports = {
chunkFilename: 'packs/js/[name]-[chunkhash].chunk.js', chunkFilename: 'packs/js/[name]-[chunkhash].chunk.js',
hotUpdateChunkFilename: 'packs/js/[id]-[hash].hot-update.js', hotUpdateChunkFilename: 'packs/js/[id]-[hash].hot-update.js',
path: output.path, path: output.path,
publicPath: FE_BASE_PATH, publicPath: join(FE_BASE_PATH, '/'),
}, },
optimization: { optimization: {