From 3132dc696e51f328c7af11b030ad31d5ba57ab94 Mon Sep 17 00:00:00 2001
From: BryceLTaylor <brycet@media.mit.edu>
Date: Tue, 5 Mar 2019 15:29:07 -0500
Subject: [PATCH 1/4] Update the integration test for the Scratch Conference
 link in the footer

---
 test/integration/smoke-testing/test_footer_links.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/smoke-testing/test_footer_links.js b/test/integration/smoke-testing/test_footer_links.js
index 1888034c6..fcdc62ab6 100644
--- a/test/integration/smoke-testing/test_footer_links.js
+++ b/test/integration/smoke-testing/test_footer_links.js
@@ -281,7 +281,7 @@ tap.test('clickScratchDayLink', options, t => {
 // SCRATCH CONFERENCE
 tap.test('clickScratchConferenceLink', options, t => {
     const linkText = 'Scratch Conference';
-    const expectedHref = '/conference';
+    const expectedHref = '/conference/2019';
     clickFooterLinks(linkText).then(url => {
         t.equal(url.substr(-expectedHref.length), expectedHref);
         t.end();

From 8df59a1c6a9d755e01bda762d9bd29bfd30d3ebe Mon Sep 17 00:00:00 2001
From: Ray Schamp <rschamp@users.noreply.github.com>
Date: Thu, 7 Mar 2019 09:22:53 -0500
Subject: [PATCH 2/4] Run pify package through babel loader

---
 webpack.config.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/webpack.config.js b/webpack.config.js
index 476359ba1..a44f1b64f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -78,7 +78,11 @@ module.exports = {
             {
                 test: /\.jsx?$/,
                 loader: 'babel-loader',
-                include: [path.resolve(__dirname, 'src'), /node_modules[\\/]scratch-[^\\/]+[\\/]src/]
+                include: [
+                    path.resolve(__dirname, 'src'),
+                    /node_modules[\\/]scratch-[^\\/]+[\\/]src/,
+                    /node_modules[\\/]pify/
+                ]
             },
             {
                 test: /\.scss$/,

From 37ecc177eff93949ca5b64992a45259d4b8ed4f9 Mon Sep 17 00:00:00 2001
From: chrisgarrity <chrisg@media.mit.edu>
Date: Thu, 7 Mar 2019 16:21:47 +0100
Subject: [PATCH 3/4] Copy the gui localized image chunks to static

Support for dynamically loading translated images.
---
 webpack.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webpack.config.js b/webpack.config.js
index 476359ba1..853cea6a4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -144,6 +144,10 @@ module.exports = {
             from: 'node_modules/scratch-gui/dist/static/blocks-media',
             to: 'static/blocks-media'
         }]),
+        new CopyWebpackPlugin([{
+            from: 'node_modules/scratch-gui/dist/chunks',
+            to: 'static/chunks'
+        }]),
         new CopyWebpackPlugin([{
             from: 'node_modules/scratch-gui/dist/extension-worker.js'
         }]),

From 3f120ad830db076d1bad8a7dbce5284b7b778b63 Mon Sep 17 00:00:00 2001
From: BryceLTaylor <brycet@media.mit.edu>
Date: Thu, 7 Mar 2019 11:41:50 -0500
Subject: [PATCH 4/4] futureproof test for conference link

---
 test/integration/smoke-testing/test_footer_links.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/smoke-testing/test_footer_links.js b/test/integration/smoke-testing/test_footer_links.js
index fcdc62ab6..8b1903446 100644
--- a/test/integration/smoke-testing/test_footer_links.js
+++ b/test/integration/smoke-testing/test_footer_links.js
@@ -281,9 +281,9 @@ tap.test('clickScratchDayLink', options, t => {
 // SCRATCH CONFERENCE
 tap.test('clickScratchConferenceLink', options, t => {
     const linkText = 'Scratch Conference';
-    const expectedHref = '/conference/2019';
+    const expectedHref = '/conference/20';
     clickFooterLinks(linkText).then(url => {
-        t.equal(url.substr(-expectedHref.length), expectedHref);
+        t.match(url.substr(-(expectedHref.length + 2)), expectedHref);
         t.end();
     });
 });