Release 10.10.5

CHANGELOG.md

@@ -1,3 +1,19 @@
+# 10.10.5
+
+#### :bug: Bug Fix
+* [#650](https://github.com/primer/primer/pull/650) Fix border radius edge utility specificity. ([@shawnbot](https://github.com/shawnbot))
+
+#### :memo: Documentation
+* [#649](https://github.com/primer/primer/pull/649) Sandboxed code examples. ([@shawnbot](https://github.com/shawnbot))
+
+#### :house: Internal
+- Only check links on Travis if `[check-links]` is included in the commit message
+- a5658d3 Run `now alias` without the branch name on merge to `master`
+
+#### Committers: 1
+- Shawn Allen ([shawnbot](https://github.com/shawnbot))
+
+
 # 10.10.4
 
 #### :memo: Documentation

docs/lib/config.js

@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 const sync = require('./sync')
+const cssLoaderConfig = require('@zeit/next-css/css-loader-config')
 const {CI, NODE_ENV, NOW_URL} = process.env
 
-const PRIMER_SCSS = 'primer/index.scss$'
-const PRIMER_STATIC_CSS = require.resolve('primer/build/build.css')
-
 module.exports = (nextConfig = {}) => {
   const {assetPrefix = NOW_URL || ''} = nextConfig
 
@@ -26,13 +24,29 @@ module.exports = (nextConfig = {}) => {
         )
       }
 
-      const {dev} = options
+      const {dev, isServer} = options
 
       // only attempt to sync locally and in CI
       if (dev && !configured) {
         sync({watch: !CI})
       }
 
+      // in production, we don't need to compile Primer from SCSS; just inline
+      // the CSS build!
+      if (!dev) {
+        config.resolve.alias['primer/index.scss$'] = require.resolve('primer/build/build.css')
+
+        const cssLoader = cssLoaderConfig(config, {
+          dev,
+          isServer
+        })
+        options.defaultLoaders.css = cssLoader
+        config.module.rules.push({
+          test: /\.css$/,
+          loader: cssLoader
+        })
+      }
+
       config.module.rules.push({
         test: /\.svg$/,
         use: '@svgr/webpack'
@@ -46,18 +60,6 @@ module.exports = (nextConfig = {}) => {
         ]
       })
 
-      /**
-       * in production we don't have access to ../modules, so we need to
-       * rewrite the 'primer/index.scss' import to the static CSS build
-       */
-      if (!dev) {
-        config.resolve.alias[PRIMER_SCSS] = PRIMER_STATIC_CSS
-        // only log the aliasing once
-        if (!configured) {
-          console.warn(`*** rewriting ${PRIMER_SCSS} to ${PRIMER_STATIC_CSS}`)
-        }
-      }
-
       configured = true
       if (typeof nextConfig.webpack === 'function') {
         return nextConfig.webpack(config, options)

docs/next.config.js

@@ -1,16 +1,14 @@
 const {join, resolve} = require('path')
-const css = require('@zeit/next-css')
-const sass = require('@zeit/next-sass')
+const withSass = require('@zeit/next-sass')
 const configure = require('./lib/config')
 
 module.exports = configure(
-  css(
-    sass({
-      sassLoaderOptions: {
-        includePaths: [
-          resolve(__dirname, '../modules')
-        ]
-      }
-    })
-  )
+  withSass({
+    sassLoaderOptions: {
+      includePaths: [
+        resolve(__dirname, '../modules'),
+        resolve(__dirname, 'node_modules')
+      ]
+    }
+  })
 )