[docs] Revert upgrade to next 9 (#16755)

* [docs] Revert upgrade to next 9 * dedupliate deps * Fix babel deps * Resolve babel/runtime-corejs2
mui · Jul 26, 2019 · cfedbcb · cfedbcb
1 parent 599e38f
commit cfedbcb
Show file tree

Hide file tree

Showing 10 changed files with 519 additions and 303 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -48,11 +48,8 @@ steps:
       artifactName: 'canaries'
       targetPath: 'material-ui-core.tgz'
 
-  - bash: |
-      set -o pipefail
-      mkdir -p scripts/sizeSnapshot/build
-      yarn docs:build | tee scripts/sizeSnapshot/build/docs.next
-      set +o pipefail
+  - script: |
+      yarn docs:build
     displayName: 'build docs'
 
   - script: |

diff --git a/docs/babel.config.js b/docs/babel.config.js
@@ -23,7 +23,7 @@ const alias = {
 };
 
 module.exports = {
-  presets: ['next/babel'],
+  presets: ['next/babel', '@zeit/next-typescript/babel'],
   plugins: [
     'babel-plugin-optimize-clsx',
     // for IE 11 support

diff --git a/docs/next-env.d.ts b/docs/next-env.d.ts
diff --git a/docs/next.config.js b/docs/next.config.js
@@ -2,13 +2,14 @@ const webpack = require('webpack');
 const pkg = require('../package.json');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const { findPages } = require('./src/modules/utils/find');
+const withTypescript = require('@zeit/next-typescript');
 const path = require('path');
 
 const LANGUAGES = ['en', 'zh', 'ru', 'pt', 'fr', 'es', 'de'];
 
 const workspaceRoot = path.join(__dirname, '../');
 
-module.exports = {
+module.exports = withTypescript({
   webpack: (config, options) => {
     const plugins = config.plugins.concat([
       new webpack.DefinePlugin({
@@ -150,4 +151,10 @@ module.exports = {
 
     return map;
   },
-};
+  onDemandEntries: {
+    // Period (in ms) where the server will keep pages in the buffer
+    maxInactiveAge: 120 * 1e3, // default 25s
+    // Number of pages that should be kept simultaneously without being disposed
+    pagesBufferLength: 3, // default 2
+  },
+});
diff --git a/docs/package.json b/docs/package.json
@@ -38,6 +38,7 @@
     "@types/react-virtualized": "^9.21.4",
     "@types/react-window": "^1.7.0",
     "@types/styled-components": "4.1.12",
+    "@zeit/next-typescript": "^1.1.1",
     "address": "^1.0.3",
     "ast-types": "^0.13.2",
     "autoprefixer": "^9.6.1",
@@ -61,7 +62,7 @@
     "markdown-to-jsx": "^6.10.2",
     "material-table": "^1.40.1",
     "material-ui-popup-state": "^1.4.0",
-    "next": "^9.0.2",
+    "next": "8.1.0",
     "notistack": "^0.8.9",
     "postcss": "^7.0.0",
     "raw-loader": "^1.0.0",

diff --git a/docs/tsconfig.json b/docs/tsconfig.json
@@ -3,9 +3,6 @@
   "include": ["types", "src/pages/**/*"],
   "compilerOptions": {
     "allowJs": false,
-    "isolatedModules": true,
-    "noUnusedLocals": true,
-    "resolveJsonModule": true,
-    "skipLibCheck": false
+    "noUnusedLocals": true
   }
 }
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "@babel/core": "^7.5.5",
     "@babel/node": "^7.5.5",
     "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+    "@babel/plugin-proposal-object-rest-spread": "^7.5.5",
     "@babel/plugin-transform-object-assign": "^7.2.0",
     "@babel/plugin-transform-runtime": "~7.5.5",
     "@babel/preset-env": "^7.5.5",
@@ -135,10 +135,12 @@
   "resolutions": {
     "**/@babel/core": "^7.5.5",
     "**/@babel/plugin-proposal-class-properties": "^7.5.5",
-    "**/@babel/plugin-proposal-object-rest-spread": "^7.4.4",
+    "**/@babel/plugin-proposal-object-rest-spread": "^7.5.5",
     "**/@babel/plugin-transform-runtime": "~7.5.5",
     "**/@babel/preset-env": "^7.5.5",
     "**/@babel/preset-react": "^7.0.0",
+    "**/@babel/runtime-corejs2": "^7.4.4",
+    "**/@babel/runtime": "^7.4.4",
     "**/hoist-non-react-statics": "^3.2.1",
     "**/next/terser": "^4.1.2"
   },

diff --git a/scripts/sizeSnapshot/create.js b/scripts/sizeSnapshot/create.js
@@ -48,73 +48,12 @@ async function getWebpackSizes() {
   });
 }
 
-// waiting for String.prototype.matchAll in node 10
-function* matchAll(string, regex) {
-  let match = null;
-  do {
-    match = regex.exec(string);
-    if (match !== null) {
-      yield match;
-    }
-  } while (match !== null);
-}
-
-/**
- * Inverse to `pretty-bytes`
- *
- * @param {string} n
- * @param {'B', 'kB' | 'mB' | 'gB' | 'tB' | 'pB'} unit
- * @returns {number}
- */
-function prettyBytesInverse(n, unit) {
-  const metrixPrefix = unit.length < 2 ? '' : unit[0];
-  const metricPrefixes = ['', 'k', 'm', 'g', 't', 'p'];
-  const metrixPrefixIndex = metricPrefixes.indexOf(metrixPrefix);
-  if (metrixPrefixIndex === -1) {
-    throw new TypeError(
-      `unrecognized metric prefix '${metrixPrefix}' in unit '${unit}'. only '${metricPrefixes.join(
-        "', '",
-      )}' are allowed`,
-    );
-  }
-
-  const power = metrixPrefixIndex * 3;
-  return n * 10 ** power;
-}
-
-/**
- * parses output from next build to size snapshot format
- * @returns {[string, { gzip: number, files: number, packages: number }][]}
- */
-async function getNextPagesSize() {
-  const consoleOutput = await fse.readFile(path.join(__dirname, 'build/docs.next'), {
-    encoding: 'utf8',
-  });
-  const pageRegex = /^(?<treeViewPresentation>┌|├|└)\s*(?<fileType>σ|⚡|)\s*(?<pageUrl>[^\s]+)\s*(?<sizeFormatted>[0-9.]+)\s*(?<sizeUnit>\w+)\s*(?<files>\d+)\s*(?<packages>\d+)/gm;
-
-  return Array.from(matchAll(consoleOutput, pageRegex), match => {
-    const { pageUrl, sizeFormatted, sizeUnit, files, packages } = match.groups;
-
-    const snapshotId = `docs: ${pageUrl}`;
-    return [
-      snapshotId,
-      {
-        parsed: prettyBytesInverse(sizeFormatted, sizeUnit),
-        gzip: -1,
-        files: +files,
-        packages: +packages,
-      },
-    ];
-  });
-}
-
 async function run() {
   const rollupBundles = [path.join(workspaceRoot, 'packages/material-ui/size-snapshot.json')];
 
   const bundleSizes = lodash.fromPairs([
     ...(await getWebpackSizes()),
     ...lodash.flatten(await Promise.all(rollupBundles.map(getRollupSize))),
-    ...(await getNextPagesSize()),
   ]);
 
   await fse.writeJSON(snapshotDestPath, bundleSizes, { spaces: 2 });

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,17 +1,16 @@
 {
   "compilerOptions": {
-    "module": "esnext",
+    "module": "commonjs",
     "target": "es5",
     "lib": ["es6", "dom"],
-    "jsx": "preserve",
+    "jsx": "react",
     "moduleResolution": "node",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noEmit": true,
     "experimentalDecorators": true,
     "baseUrl": "./",
     "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
     "noErrorTruncation": true,
     "allowJs": true,
     "paths": {