Merge branch 'canary' into fix-catch-all-routes-example-link

vercel · Jul 18, 2020 · e287964 · e287964
2 parents 9f7f9fc + f5b186c
commit e287964
Show file tree

Hide file tree

Showing 5 changed files with 115 additions and 5 deletions.
diff --git a/packages/next/client/dev/error-overlay/format-webpack-messages.js b/packages/next/client/dev/error-overlay/format-webpack-messages.js
@@ -34,7 +34,10 @@ function isLikelyASyntaxError(message) {
 function formatMessage(message) {
   // TODO: Replace this once webpack 5 is stable
   if (typeof message === 'object' && message.message) {
-    message = (message.file ? message.file + '\n' : '') + message.message
+    message =
+      (message.moduleName ? message.moduleName + '\n' : '') +
+      (message.file ? message.file + '\n' : '') +
+      message.message
   }
   let lines = message.split('\n')
 

diff --git a/packages/next/lib/typescript/writeConfigurationDefaults.ts b/packages/next/lib/typescript/writeConfigurationDefaults.ts
@@ -7,7 +7,12 @@ import { getTypeScriptConfiguration } from './getTypeScriptConfiguration'
 type DesiredCompilerOptionsShape = {
   [key: string]:
     | { suggested: any }
-    | { parsedValue?: any; value: any; reason: string }
+    | {
+        parsedValue?: any
+        parsedValues?: Array<any>
+        value: any
+        reason: string
+      }
 }
 
 function getDesiredCompilerOptions(
@@ -33,6 +38,13 @@ function getDesiredCompilerOptions(
     },
     module: {
       parsedValue: ts.ModuleKind.ESNext,
+      // All of these values work:
+      parsedValues: [
+        ts.ModuleKind.ES2020,
+        ts.ModuleKind.ESNext,
+        ts.ModuleKind.CommonJS,
+        ts.ModuleKind.AMD,
+      ],
       value: 'esnext',
       reason: 'for dynamic import() support',
     },
@@ -111,7 +123,9 @@ export async function writeConfigurationDefaults(
     } else if ('value' in check) {
       const ev = effectiveConfiguration.options[optionKey]
       if (
-        !('parsedValue' in check
+        !('parsedValues' in check
+          ? check.parsedValues?.includes(ev)
+          : 'parsedValue' in check
           ? check.parsedValue === ev
           : check.value === ev)
       ) {

diff --git a/test/integration/tsconfig-verifier/pages/index.tsx b/test/integration/tsconfig-verifier/pages/index.tsx
@@ -1,4 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const blah: boolean = false
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const blah2 = import('../value').then((r) => r.default)
 
 export default () => <h3>Hello TypeScript</h3>
diff --git a/test/integration/tsconfig-verifier/test/index.test.js b/test/integration/tsconfig-verifier/test/index.test.js
@@ -113,7 +113,7 @@ describe('tsconfig.json verifier', () => {
         "compilerOptions": {
           // in-object comment
           "esModuleInterop": false, // this should be true
-          "module": "commonjs" // should not be commonjs
+          "module": "umd" // should not be umd
           // end-object comment
         }
         // in-object comment 2
@@ -134,7 +134,7 @@ describe('tsconfig.json verifier', () => {
         \\"compilerOptions\\": {
           // in-object comment
           \\"esModuleInterop\\": true, // this should be true
-          \\"module\\": \\"esnext\\" // should not be commonjs
+          \\"module\\": \\"esnext\\" // should not be umd
           // end-object comment
           ,
           \\"target\\": \\"es5\\",
@@ -168,4 +168,94 @@ describe('tsconfig.json verifier', () => {
       "
     `)
   })
+
+  it('allows you to set commonjs module mode', async () => {
+    expect(await exists(tsConfig)).toBe(false)
+
+    await writeFile(
+      tsConfig,
+      `{ "compilerOptions": { "esModuleInterop": false, "module": "commonjs" } }`
+    )
+    await new Promise((resolve) => setTimeout(resolve, 500))
+    const { code } = await nextBuild(appDir)
+    expect(code).toBe(0)
+
+    expect(await readFile(tsConfig, 'utf8')).toMatchInlineSnapshot(`
+      "{
+        \\"compilerOptions\\": {
+          \\"esModuleInterop\\": true,
+          \\"module\\": \\"commonjs\\",
+          \\"target\\": \\"es5\\",
+          \\"lib\\": [
+            \\"dom\\",
+            \\"dom.iterable\\",
+            \\"esnext\\"
+          ],
+          \\"allowJs\\": true,
+          \\"skipLibCheck\\": true,
+          \\"strict\\": false,
+          \\"forceConsistentCasingInFileNames\\": true,
+          \\"noEmit\\": true,
+          \\"moduleResolution\\": \\"node\\",
+          \\"resolveJsonModule\\": true,
+          \\"isolatedModules\\": true,
+          \\"jsx\\": \\"preserve\\"
+        },
+        \\"include\\": [
+          \\"next-env.d.ts\\",
+          \\"**/*.ts\\",
+          \\"**/*.tsx\\"
+        ],
+        \\"exclude\\": [
+          \\"node_modules\\"
+        ]
+      }
+      "
+    `)
+  })
+
+  it('allows you to set es2020 module mode', async () => {
+    expect(await exists(tsConfig)).toBe(false)
+
+    await writeFile(
+      tsConfig,
+      `{ "compilerOptions": { "esModuleInterop": false, "module": "es2020" } }`
+    )
+    await new Promise((resolve) => setTimeout(resolve, 500))
+    const { code } = await nextBuild(appDir)
+    expect(code).toBe(0)
+
+    expect(await readFile(tsConfig, 'utf8')).toMatchInlineSnapshot(`
+      "{
+        \\"compilerOptions\\": {
+          \\"esModuleInterop\\": true,
+          \\"module\\": \\"es2020\\",
+          \\"target\\": \\"es5\\",
+          \\"lib\\": [
+            \\"dom\\",
+            \\"dom.iterable\\",
+            \\"esnext\\"
+          ],
+          \\"allowJs\\": true,
+          \\"skipLibCheck\\": true,
+          \\"strict\\": false,
+          \\"forceConsistentCasingInFileNames\\": true,
+          \\"noEmit\\": true,
+          \\"moduleResolution\\": \\"node\\",
+          \\"resolveJsonModule\\": true,
+          \\"isolatedModules\\": true,
+          \\"jsx\\": \\"preserve\\"
+        },
+        \\"include\\": [
+          \\"next-env.d.ts\\",
+          \\"**/*.ts\\",
+          \\"**/*.tsx\\"
+        ],
+        \\"exclude\\": [
+          \\"node_modules\\"
+        ]
+      }
+      "
+    `)
+  })
 })
diff --git a/test/integration/tsconfig-verifier/value.ts b/test/integration/tsconfig-verifier/value.ts
@@ -0,0 +1 @@
+export default false