Merge branch 'canary' into next-dynamic-swc-errors

vercel · Nov 26, 2021 · c70afd1 · c70afd1
2 parents 5c56281 + 77150da
commit c70afd1
Show file tree

Hide file tree

Showing 33 changed files with 22 additions and 39 deletions.
diff --git a/examples/blog-starter-typescript/next-env.d.ts b/examples/blog-starter-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/custom-server-typescript/next-env.d.ts b/examples/custom-server-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-aws-amplify-typescript/next-env.d.ts b/examples/with-aws-amplify-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-chakra-ui-typescript/next-env.d.ts b/examples/with-chakra-ui-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-expo-typescript/next-env.d.ts b/examples/with-expo-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-ionic-typescript/next-env.d.ts b/examples/with-ionic-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-iron-session/next-env.d.ts b/examples/with-iron-session/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-jotai/next-env.d.ts b/examples/with-jotai/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-mobx-state-tree-typescript/next-env.d.ts b/examples/with-mobx-state-tree-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-mysql/next-env.d.ts b/examples/with-mysql/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-next-sitemap/next-env.d.ts b/examples/with-next-sitemap/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-paste-typescript/next-env.d.ts b/examples/with-paste-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-react-intl/next-env.d.ts b/examples/with-react-intl/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-react-md-typescript/next-env.d.ts b/examples/with-react-md-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-redux/next-env.d.ts b/examples/with-redux/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-reflexjs/next-env.d.ts b/examples/with-reflexjs/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-storybook-styled-jsx-scss/next-env.d.ts b/examples/with-storybook-styled-jsx-scss/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-stripe-typescript/next-env.d.ts b/examples/with-stripe-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-temporal/next-env.d.ts b/examples/with-temporal/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-typescript-eslint-jest/next-env.d.ts b/examples/with-typescript-eslint-jest/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-typescript-graphql/next-env.d.ts b/examples/with-typescript-graphql/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-typescript-styled-components/next-env.d.ts b/examples/with-typescript-styled-components/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-typescript-types/next-env.d.ts b/examples/with-typescript-types/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-typescript/next-env.d.ts b/examples/with-typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/examples/with-unsplash/next-env.d.ts b/examples/with-unsplash/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/packages/create-next-app/templates/typescript/next-env.d.ts b/packages/create-next-app/templates/typescript/next-env.d.ts
@@ -1,5 +1,4 @@
 /// <reference types="next" />
-/// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited

diff --git a/packages/next/index.d.ts b/packages/next/index.d.ts
@@ -0,0 +1,16 @@
+/// <reference types="./types/global" />
+/// <reference path="./amp.d.ts" />
+/// <reference path="./app.d.ts" />
+/// <reference path="./config.d.ts" />
+/// <reference path="./document.d.ts" />
+/// <reference path="./dynamic.d.ts" />
+/// <reference path="./error.d.ts" />
+/// <reference path="./head.d.ts" />
+/// <reference path="./image.d.ts" />
+/// <reference path="./link.d.ts" />
+/// <reference path="./router.d.ts" />
+/// <reference path="./script.d.ts" />
+/// <reference path="./server.d.ts" />
+
+export { default } from './types'
+export * from './types'
diff --git a/packages/next/lib/typescript/writeAppTypeDeclarations.ts b/packages/next/lib/typescript/writeAppTypeDeclarations.ts
@@ -30,8 +30,6 @@ export async function writeAppTypeDeclarations(
   const content =
     '/// <reference types="next" />' +
     eol +
-    '/// <reference types="next/types/global" />' +
-    eol +
     (imageImportsEnabled
       ? '/// <reference types="next/image-types/global" />' + eol
       : '') +

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -7,7 +7,7 @@
   "repository": "vercel/next.js",
   "bugs": "https://github.com/vercel/next.js/issues",
   "homepage": "https://nextjs.org",
-  "types": "types/index.d.ts",
+  "types": "index.d.ts",
   "files": [
     "dist",
     "app.js",
@@ -44,6 +44,7 @@
     "jest.d.ts",
     "amp.js",
     "amp.d.ts",
+    "index.d.ts",
     "types/index.d.ts",
     "types/global.d.ts",
     "image-types/global.d.ts"

diff --git a/test/lib/next-modes/next-dev.ts b/test/lib/next-modes/next-dev.ts
@@ -32,7 +32,7 @@ export class NextDevInstance extends NextInstance {
       shell: false,
       env: {
         ...process.env,
-        NODE_ENV: '',
+        NODE_ENV: '' as any,
         __NEXT_TEST_MODE: '1',
         __NEXT_RAND_PORT: '1',
         __NEXT_TEST_WITH_DEVTOOL: '1',

diff --git a/test/lib/next-modes/next-start.ts b/test/lib/next-modes/next-start.ts
@@ -30,7 +30,7 @@ export class NextStartInstance extends NextInstance {
       shell: false,
       env: {
         ...process.env,
-        NODE_ENV: '',
+        NODE_ENV: '' as any,
         __NEXT_TEST_MODE: '1',
         __NEXT_RAND_PORT: '1',
       },

diff --git a/test/unit/babel-plugin-next-ssg-transform.test.ts b/test/unit/babel-plugin-next-ssg-transform.test.ts
@@ -5,9 +5,9 @@ const trim = (s) => s.join('\n').trim().replace(/^\s+/gm, '')
 
 // avoid generating __source annotations in JSX during testing:
 const NODE_ENV = process.env.NODE_ENV
-process.env.NODE_ENV = 'production'
+;(process.env as any).NODE_ENV = 'production'
 const plugin = require('next/dist/build/babel/plugins/next-ssg-transform')
-process.env.NODE_ENV = NODE_ENV
+;(process.env as any).NODE_ENV = NODE_ENV
 
 const babel = (code, esm = true, pluginOptions = {}) =>
   transform(code, {

diff --git a/test/unit/write-app-declarations.test.ts b/test/unit/write-app-declarations.test.ts
@@ -16,8 +16,6 @@ describe('find config', () => {
     const content =
       '/// <reference types="next" />' +
       eol +
-      '/// <reference types="next/types/global" />' +
-      eol +
       (imageImportsEnabled
         ? '/// <reference types="next/image-types/global" />' + eol
         : '') +
@@ -39,8 +37,6 @@ describe('find config', () => {
     const content =
       '/// <reference types="next" />' +
       eol +
-      '/// <reference types="next/types/global" />' +
-      eol +
       (imageImportsEnabled
         ? '/// <reference types="next/image-types/global" />' + eol
         : '') +
@@ -62,8 +58,6 @@ describe('find config', () => {
     const content =
       '/// <reference types="next" />' +
       eol +
-      '/// <reference types="next/types/global" />' +
-      eol +
       (imageImportsEnabled
         ? '/// <reference types="next/image-types/global" />' + eol
         : '') +