fix: cherry pick the main lang-specific config fix + webpack lang c…

…onfig fix when building multiple languages at the same time via #1265
boltdesignsystem · Jul 12, 2019 · 318c9f9 · 318c9f9
1 parent 6067276
commit 318c9f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/build-tools/create-webpack-config.js b/packages/build-tools/create-webpack-config.js
@@ -102,7 +102,7 @@ async function createWebpackConfig(buildConfig) {
       ),
       config: {
         prod: config.prod ? true : false,
-        lang: config.lang,
+        lang: JSON.stringify(config.lang),
       },
     },
   };

diff --git a/packages/core/styles/01-settings/00-settings-lang/_settings.lang-ja.scss b/packages/core/styles/01-settings/00-settings-lang/_settings.lang-ja.scss
@@ -2,6 +2,9 @@
 /// @group Settings: Typography
 ////
 
+// so the recursive map merge used below works as expected
+@import '../../02-tools/tools-map-recursive-merge/tools-map-recursive-merge';
+
 /* ------------------------------------ *\
    Japanese Specific Typography Styles
 \* ------------------------------------ */
@@ -53,4 +56,11 @@
     'xlarge':  2.8,
     'xxlarge': 5.6
   ) !global;
+
+  // reference back to the "medium" size value (whatever it's currently set to)
+  // NOTE: this is how "sizeless" utility classes like `u-bolt-margin-bottom` get generated
+  $bolt-spacing-values: bolt-recursive-map-merge(
+    $bolt-spacing-values,
+    ('': map-get($bolt-spacing-values, 'medium'))
+  ) !global;
 }