From d9c28d12d3cfe1e403d9be47dc574c0fe771670e Mon Sep 17 00:00:00 2001 From: Eric Rosenbaum Date: Tue, 14 Nov 2017 13:52:18 -0500 Subject: [PATCH 1/2] Copy extension assets from VM --- webpack.config.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webpack.config.js b/webpack.config.js index e9b97f9ef..5a654cfcd 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -107,6 +107,10 @@ module.exports = { from: 'node_modules/scratch-blocks/media', to: 'static/blocks-media' }]), + new CopyWebpackPlugin([{ + from: 'node_modules/scratch-vm/dist/node/assets', + to: 'static/extension-assets' + }]), new CopyWebpackPlugin([{ from: 'extensions/**', to: 'static', From b97d5e0efaa142ccbcc595ade2722c662a8264ff Mon Sep 17 00:00:00 2001 From: Eric Rosenbaum Date: Tue, 14 Nov 2017 13:52:41 -0500 Subject: [PATCH 2/2] Register music extension assets --- src/lib/storage.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/storage.js b/src/lib/storage.js index 6d858e6c2..b2094c118 100644 --- a/src/lib/storage.js +++ b/src/lib/storage.js @@ -25,6 +25,10 @@ class Storage extends ScratchStorage { [this.AssetType.ImageVector, this.AssetType.ImageBitmap, this.AssetType.Sound], asset => `${ASSET_SERVER}/internalapi/asset/${asset.assetId}.${asset.dataFormat}/get/` ); + this.addWebSource( + [this.AssetType.Sound], + asset => `/static/extension-assets/scratch3_music/${asset.assetId}.${asset.dataFormat}` + ); defaultProjectAssets.forEach(asset => this.cache( this.AssetType[asset.assetType], this.DataFormat[asset.dataFormat],