Merge remote-tracking branch 'origin/develop' into fe-basename

.gitignore

@@ -8,20 +8,6 @@
 /.vs/
 yarn-error.log*
 
-/static/packs
-/static/packs-test
-/static/emoji
-/static/index.html
-/static/index.html.gz
-/static/404.html
-/static/404.html.gz
-/static/manifest.json
-/static/manifest.json.gz
-/static/report.html
-/static/sw.js
-/static/instance/**
-!/static/instance/**.example
-!/static/instance/**.example.*
-!/static/instance/**.example/**
-/static-test
-/public
+/static/
+/static-test/
+/public/

webpack/configuration.js

@@ -9,7 +9,7 @@ const settings = {
   test_root_path: 'static-test',
   cache_path: 'tmp/cache/webpacker',
   resolved_paths: [],
-  static_assets_extensions: [ '.jpg', '.jpeg', '.png', '.tiff', '.ico', '.svg', '.gif', '.eot', '.otf', '.ttf', '.woff', '.woff2' ],
+  static_assets_extensions: [ '.jpg', '.jpeg', '.png', '.tiff', '.ico', '.svg', '.gif', '.eot', '.otf', '.ttf', '.woff', '.woff2', '.mp3', '.ogg', '.oga' ],
   extensions: [ '.mjs', '.js', '.sass', '.scss', '.css', '.module.sass', '.module.scss', '.module.css', '.png', '.svg', '.gif', '.jpeg', '.jpg' ],
 };
 

webpack/production.js

@@ -36,7 +36,10 @@ module.exports = merge(sharedConfig, {
 
   plugins: [
     new CompressionPlugin({
-      test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map)$/,
+      test: /\.(js|css|html|json|ico|svg|eot|otf|ttf|map|mp3|ogg|oga)$/,
+      exclude: [
+        'instance',
+      ],
     }),
     new BundleAnalyzerPlugin({ // generates report.html
       analyzerMode: 'static',

webpack/shared.js

@@ -101,6 +101,12 @@ module.exports = {
       }, {
         from: join(__dirname, '../node_modules/emoji-datasource/img/twitter/sheets/32.png'),
         to: join(output.path, 'emoji/sheet_13.png'),
+      }, {
+        from: join(__dirname, '../app/sounds'),
+        to: join(output.path, 'sounds'),
+      }, {
+        from: join(__dirname, '../app/instance'),
+        to: join(output.path, 'instance'),
       }],
       options: {
         concurrency: 100,