Merge remote-tracking branch 'upstream/canary' into add/rewrite-proxying

lerna.json

@@ -12,5 +12,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.1.8-canary.11"
+  "version": "9.1.8-canary.12"
 }

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.1.8-canary.11",
+  "version": "9.1.8-canary.12",
   "keywords": [
     "react",
     "next",

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.1.8-canary.11",
+  "version": "9.1.8-canary.12",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.1.8-canary.11",
+  "version": "9.1.8-canary.12",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-plugin-google-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "9.1.8-canary.11",
+  "version": "9.1.8-canary.12",
   "nextjs": {
     "name": "Google Analytics",
     "required-env": [

packages/next-plugin-material-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-material-ui",
-  "version": "9.1.8-canary.11",
+  "version": "9.1.8-canary.12",
   "nextjs": {
     "name": "Material UI",
     "required-env": []

packages/next-plugin-sentry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "9.1.8-canary.11",
+  "version": "9.1.8-canary.12",
   "nextjs": {
     "name": "Sentry",
     "required-env": [

packages/next/build/webpack-config.ts

@@ -865,18 +865,31 @@ export default async function getBaseWebpackConfig(
       return false
     }
 
-    const fileName = '/tmp/test.css'
-
-    if (rule instanceof RegExp && rule.test(fileName)) {
+    const fileNames = [
+      '/tmp/test.css',
+      '/tmp/test.scss',
+      '/tmp/test.sass',
+      '/tmp/test.less',
+      '/tmp/test.styl',
+    ]
+
+    if (rule instanceof RegExp && fileNames.some(input => rule.test(input))) {
       return true
     }
 
     if (typeof rule === 'function') {
-      try {
-        if (rule(fileName)) {
-          return true
-        }
-      } catch (_) {}
+      if (
+        fileNames.some(input => {
+          try {
+            if (rule(input)) {
+              return true
+            }
+          } catch (_) {}
+          return false
+        })
+      ) {
+        return true
+      }
     }
 
     if (Array.isArray(rule) && rule.some(canMatchCss)) {
@@ -888,10 +901,9 @@ export default async function getBaseWebpackConfig(
 
   if (config.experimental.css) {
     const hasUserCssConfig =
-      webpackConfig.module &&
-      webpackConfig.module.rules.some(
+      webpackConfig.module?.rules.some(
         rule => canMatchCss(rule.test) || canMatchCss(rule.include)
-      )
+      ) ?? false
 
     if (hasUserCssConfig) {
       if (webpackConfig.module?.rules.length) {

packages/next/next-server/server/next-server.ts

@@ -496,6 +496,13 @@ export default class Server {
                 res.setHeader('Location', updatedDestination)
                 res.statusCode =
                   (route as Redirect).statusCode || DEFAULT_REDIRECT_STATUS
+
+                // Since IE11 doesn't support the 308 header add backwards
+                // compatibility using refresh header
+                if (res.statusCode === 308) {
+                  res.setHeader('Refresh', `0;url=${updatedDestination}`)
+                }
+
                 res.end()
                 return {
                   finished: true,
@@ -510,7 +517,7 @@ export default class Server {
                   })
                   proxy.web(req, res)
 
-                  proxy.on('error', err => {
+                  proxy.on('error', (err: Error) => {
                     console.error(
                       `Error occurred proxying ${updatedDestination}`,
                       err

packages/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.1.8-canary.11",
+  "version": "9.1.8-canary.12",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",

test/integration/custom-routes/test/index.test.js

@@ -235,6 +235,14 @@ const runTests = (isDev = false) => {
     expect(await res.text()).toContain('ZEIT, Inc')
   })
 
+  it('should add refresh header for 308 redirect', async () => {
+    const res = await fetchViaHTTP(appPort, '/redirect4', undefined, {
+      redirect: 'manual',
+    })
+    expect(res.status).toBe(308)
+    expect(res.headers.get('refresh')).toBe(`0;url=/`)
+  })
+
   if (!isDev) {
     it('should output routes-manifest successfully', async () => {
       const manifest = await fs.readJSON(

test/integration/legacy-sass/next.config.js

@@ -0,0 +1,2 @@
+const withSass = require('@zeit/next-sass')
+module.exports = withSass({})

test/integration/legacy-sass/pages/index.js

@@ -0,0 +1,3 @@
+import '../styles/style.scss'
+
+export default () => <div className="example">Hello World!</div>

test/integration/legacy-sass/styles/style.scss

@@ -0,0 +1,4 @@
+$color: #2ecc71;
+.example {
+  background-color: $color;
+}

test/integration/legacy-sass/test/index.test.js

@@ -0,0 +1,26 @@
+/* eslint-env jest */
+/* global jasmine */
+import { remove } from 'fs-extra'
+import { nextBuild } from 'next-test-utils'
+import { recursiveReadDir } from 'next/dist/lib/recursive-readdir'
+import { join } from 'path'
+
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 1
+
+const appDir = join(__dirname, '../')
+
+describe('Legacy Sass Support Should Disable New CSS', () => {
+  beforeAll(async () => {
+    await remove(join(appDir, '.next'))
+    await nextBuild(appDir)
+  })
+
+  it(`should've emitted a single CSS file`, async () => {
+    const cssFiles = await recursiveReadDir(
+      join(appDir, '.next', 'static'),
+      /\.css$/
+    )
+
+    expect(cssFiles.length).toBe(1)
+  })
+})