Bump styled-jsx and remove manual types creation

packages/next/package.json

@@ -257,7 +257,7 @@
     "string-hash": "1.1.3",
     "string_decoder": "1.3.0",
     "strip-ansi": "6.0.0",
-    "styled-jsx": "5.0.3",
+    "styled-jsx": "5.0.4",
     "tar": "6.1.11",
     "taskr": "1.1.0",
     "terser": "5.14.1",

packages/next/taskfile.js

@@ -56,33 +56,13 @@ export async function copy_styled_jsx_assets(task, opts) {
   // Separate type files into different folders to avoid conflicts between
   // dev dep `styled-jsx` and `next/dist/styled-jsx` for duplicated declare modules
   const typesDir = join(outputDir, 'types')
-  let typeReferences = ''
-  let globalTypesContent = ''
-
-  await fs.ensureDir(outputDir)
   await fs.ensureDir(typesDir)
 
   for (const file of typeFiles) {
-    const fileNoExt = file.replace(/\.d\.ts/, '')
-    let content = await fs.readFile(join(styledJsxPath, file), 'utf8')
-
-    if (file === 'index.d.ts') {
-      const styledJsxIdx = content.indexOf(`declare module 'styled-jsx' {`)
-      globalTypesContent = content.substring(0, styledJsxIdx)
-      content = content
-        .substring(styledJsxIdx)
-        .replace('React.', `import('react').`)
-    }
-
+    const content = await fs.readFile(join(styledJsxPath, file), 'utf8')
     await fs.writeFile(join(typesDir, file), content)
-    typeReferences += `/// <reference types="./${fileNoExt}" />\n`
   }
 
-  await fs.writeFile(
-    join(typesDir, 'global.d.ts'),
-    `${typeReferences}\n${globalTypesContent}`
-  )
-
   for (const file of jsFiles) {
     const content = await fs.readFile(join(styledJsxPath, file), 'utf8')
     const distFile = join(outputDir, file)