chore: dissociate the code that wraps Next.js calls of the Next.js co…

…debase itself

.eslintrc.js

@@ -9,7 +9,13 @@ module.exports = {
     sourceType: "module",
     project: "./tsconfig.json"
   },
-  ignorePatterns: ["**/*.js", "**/*.d.ts", "dist", "node_modules"],
+  ignorePatterns: [
+    "**/*.js",
+    "**/*.d.ts",
+    "**/*.stories.tsx", // temporary disabled
+    "dist",
+    "node_modules"
+  ],
   plugins: ["jest", "sonarjs", "promise", "@typescript-eslint", "react"],
   extends: [
     "eslint:recommended",
@@ -57,14 +63,15 @@ module.exports = {
         "@typescript-eslint/explicit-module-boundary-types": "off" // @adr web/20200927-avoid-react-fc-type
       }
     },
-    {
-      files: ["src/**/*.stories.tsx"], // Storybook
-      rules: {
-        "import/no-extraneous-dependencies": "off",
-        "import/no-default-export": "off",
-        "react/function-component-definition": "off"
-      }
-    },
+    // Temporary disabled
+    // {
+    //   files: ["src/**/*.stories.tsx"], // Storybook
+    //   rules: {
+    //     "import/no-extraneous-dependencies": "off",
+    //     "import/no-default-export": "off",
+    //     "react/function-component-definition": "off"
+    //   }
+    // },
     {
       files: "*", // All non-React files
       excludedFiles: "*.tsx",

.gitignore

@@ -77,6 +77,7 @@ typings/
 
 # Next.js build output
 .next
+.next-export
 
 # Nuxt.js build / generate output
 .nuxt

packages/web/.eslintrc.js

@@ -2,22 +2,10 @@ const path = require("path");
 
 module.exports = {
   env: {
-    browser: true,
     node: true
   },
   parserOptions: {
-    ecmaFeatures: {
-      jsx: true
-    },
-    project: path.join(__dirname, "tsconfig.dev.json")
+    project: path.join(__dirname, "tsconfig.json")
   },
-  extends: ["../../.eslintrc"],
-  overrides: [
-    {
-      files: ["src/pages/**/*.tsx", "src/pages/api/**/*.ts"], // Next.js pages and api routes
-      rules: {
-        "import/no-default-export": "off"
-      }
-    }
-  ]
+  extends: ["../../.eslintrc"]
 };

packages/web/src/cli/commands/build.ts → packages/web/cli/commands/build.ts

@@ -8,10 +8,9 @@ import mkdirp from "mkdirp";
 import { makeBadge } from "badge-maker";
 import { promises as fsP } from "fs";
 import type { AppConsole } from "@log4brains/cli-common";
-import { getNextJsDir } from "../../lib/next";
-import { Search } from "../../lib/search";
-import { toAdrLight } from "../../types";
-import { execNext, getL4bInstance } from "../utils";
+import { Search } from "@lib-shared/search";
+import { toAdrLight } from "@lib-shared/types";
+import { execNext, getL4bInstance, getNextJsDir } from "../utils";
 
 type Deps = {
   appConsole: AppConsole;

packages/web/src/cli/commands/preview.ts → packages/web/cli/commands/preview.ts

@@ -4,8 +4,7 @@ import SocketIO from "socket.io";
 import chalk from "chalk";
 import open from "open";
 import type { AppConsole } from "@log4brains/cli-common";
-import { getNextJsDir } from "../../lib/next";
-import { execNext, getL4bInstance } from "../utils";
+import { execNext, getL4bInstance, getNextJsDir } from "../utils";
 
 type Deps = {
   appConsole: AppConsole;

packages/web/src/cli/utils.ts → packages/web/cli/utils.ts

@@ -1,6 +1,7 @@
 import chalk from "chalk";
 import { ConsoleCapturer } from "@log4brains/cli-common";
 import { Log4brains } from "@log4brains/core";
+import path from "path";
 
 let l4bInstance: Log4brains;
 export function getL4bInstance(): Log4brains {
@@ -10,6 +11,10 @@ export function getL4bInstance(): Log4brains {
   return l4bInstance;
 }
 
+export function getNextJsDir(): string {
+  return path.resolve(path.join(__dirname, "../nextjs")); // only one level up because bundled with microbundle
+}
+
 /**
  * #NEXTJS-HACK
  * We want to hide the output of Next.js when we execute CLI commands.

packages/web/index.ts

@@ -0,0 +1 @@
+export * from "./cli";

packages/web/nextjs/.eslintrc.js

@@ -0,0 +1,23 @@
+const path = require("path");
+
+module.exports = {
+  env: {
+    browser: true,
+    node: true
+  },
+  parserOptions: {
+    ecmaFeatures: {
+      jsx: true
+    },
+    project: path.join(__dirname, "tsconfig.dev.json")
+  },
+  extends: ["../../../.eslintrc"],
+  overrides: [
+    {
+      files: ["src/pages/**/*.tsx", "src/pages/api/**/*.ts"], // Next.js pages and api routes
+      rules: {
+        "import/no-default-export": "off"
+      }
+    }
+  ]
+};

packages/web/nextjs/.npmignore

@@ -0,0 +1,4 @@
+.next-export
+.storybook
+jest.config.js
+tsconfig.dev.json

packages/web/.storybook/mocks/adrs.ts → packages/web/nextjs/.storybook/mocks/adrs.ts

@@ -1,5 +1,5 @@
 import { AdrDtoStatus } from "@log4brains/core";
-import { Adr } from "../../src/types";
+import { Adr } from "../../src/lib-shared/types";
 
 export const adrMocks = [
   {

packages/web/jest.config.js → packages/web/nextjs/jest.config.js

@@ -1,4 +1,4 @@
-const base = require("../../jest.config.base");
+const base = require("../../../jest.config.base");
 const packageJson = require("./package");
 
 module.exports = {

packages/web/next.config.js → packages/web/nextjs/next.config.js

@@ -44,5 +44,10 @@ module.exports = withBundleAnalyzer({
   },
   future: {
     excludeDefaultMomentLocales: true
+  },
+  typescript: {
+    // We check typescript errors only during the first build, not during "log4brains build",
+    // for performance purpose and to avoid importing @types/* packages as dependencies
+    ignoreBuildErrors: process.env.LOG4BRAINS_PHASE !== "initial-build"
   }
 });

packages/web/src/components/SearchBox/SearchBox.tsx → packages/web/nextjs/src/components/SearchBox/SearchBox.tsx

@@ -12,7 +12,7 @@ import { createStyles, makeStyles, Theme } from "@material-ui/core/styles";
 import { GrDocumentText as AdrIcon } from "react-icons/gr";
 import { useRouter } from "next/router";
 import { SearchBar } from "./components/SearchBar";
-import { SearchResult } from "../../lib/search";
+import { SearchResult } from "../../lib-shared/search";
 
 const useStyles = makeStyles((theme: Theme) => {
   return createStyles({

packages/web/src/contexts/AdrNavContext/AdrNavContext.ts → packages/web/nextjs/src/contexts/AdrNavContext/AdrNavContext.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { AdrLight } from "../../types";
+import { AdrLight } from "../../lib-shared/types";
 
 export type AdrNav = {
   previousAdr?: AdrLight;

packages/web/src/layouts/AdrBrowserLayout/AdrBrowserLayout.stories.tsx → packages/web/nextjs/src/layouts/AdrBrowserLayout/AdrBrowserLayout.stories.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import { Meta, Story } from "@storybook/react";
 import { AdrBrowserLayout, AdrBrowserLayoutProps } from "..";
 import { adrMocks } from "../../../.storybook/mocks";
-import { toAdrLight } from "../../types";
+import { toAdrLight } from "../../lib-shared/types";
 
 const Template: Story<AdrBrowserLayoutProps> = (args) => (
   <AdrBrowserLayout {...args} />

packages/web/src/layouts/AdrBrowserLayout/AdrBrowserLayout.tsx → packages/web/nextjs/src/layouts/AdrBrowserLayout/AdrBrowserLayout.tsx

@@ -30,7 +30,7 @@ import clsx from "clsx";
 import { AdrMenu } from "./components/AdrMenu";
 import { CustomTheme } from "../../mui";
 import { ConnectedSearchBox } from "./components/ConnectedSearchBox/ConnectedSearchBox";
-import { AdrLight } from "../../types";
+import { AdrLight } from "../../lib-shared/types";
 import { AdrNav, AdrNavContext } from "../../contexts";
 import { RoutingProgress } from "./components/RoutingProgress";
 

packages/web/src/layouts/AdrBrowserLayout/ConnectedAdrBrowserLayout.tsx → packages/web/nextjs/src/layouts/AdrBrowserLayout/ConnectedAdrBrowserLayout.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import Router, { useRouter } from "next/router";
 // import io from "socket.io-client"; // loaded by _document.tsx so that we don't add this lib in the static mode bundle
 import type { FileWatcherEvent } from "@log4brains/core";
-import { Adr, AdrLight } from "../../types";
+import { Adr, AdrLight } from "../../lib-shared/types";
 import { Log4brainsMode, Log4brainsModeContext } from "../../contexts";
 import { AdrBrowserLayout, AdrBrowserLayoutProps } from "./AdrBrowserLayout";
 // eslint-disable-next-line import/no-cycle

packages/web/src/layouts/AdrBrowserLayout/components/AdrMenu/AdrMenu.tsx → packages/web/nextjs/src/layouts/AdrBrowserLayout/components/AdrMenu/AdrMenu.tsx

@@ -31,7 +31,7 @@ import Link from "next/link";
 import clsx from "clsx";
 import { Log4brainsMode, Log4brainsModeContext } from "../../../../contexts";
 import { AdrStatusChip } from "../../../../components";
-import { AdrLight } from "../../../../types";
+import { AdrLight } from "../../../../lib-shared/types";
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({

packages/web/src/layouts/AdrBrowserLayout/components/ConnectedSearchBox/ConnectedSearchBox.tsx → packages/web/nextjs/src/layouts/AdrBrowserLayout/components/ConnectedSearchBox/ConnectedSearchBox.tsx

@@ -1,10 +1,7 @@
 import React from "react";
 import { SearchBox, SearchBoxProps } from "../../../../components/SearchBox";
-import {
-  createSearchInstance,
-  Search,
-  SearchResult
-} from "../../../../lib/search";
+import { createSearchInstance } from "../../../../lib/search";
+import { Search, SearchResult } from "../../../../lib-shared/search";
 import { Log4brainsMode, Log4brainsModeContext } from "../../../../contexts";
 
 export type ConnectedSearchBoxProps = Omit<

packages/web/nextjs/src/lib-shared/search/index.ts

@@ -0,0 +1 @@
+export * from "./Search";

packages/web/src/lib/adr-utils.ts → packages/web/nextjs/src/lib/adr-utils.ts

@@ -1,4 +1,4 @@
-import { Adr, AdrLight } from "../types";
+import { Adr, AdrLight } from "../lib-shared/types";
 
 export function buildAdrUrl(adr: AdrLight | Adr): string {
   return `/adr/${adr.slug}`;

packages/web/src/lib/next.ts → packages/web/nextjs/src/lib/next.ts

@@ -1,11 +1,5 @@
-import path from "path";
 import getNextConfig from "next/config";
 
-export function getNextJsDir(): string {
-  // When built, there is no more "src/" directory
-  return path.resolve(path.join(__dirname, ".."));
-}
-
 export type L4bNextConfig = {
   serverRuntimeConfig: {
     PROJECT_ROOT: string;

packages/web/src/lib/search/index.ts → packages/web/nextjs/src/lib/search/index.ts

@@ -1,2 +1 @@
-export * from "./Search";
 export * from "./instance";

packages/web/src/lib/search/instance.ts → packages/web/nextjs/src/lib/search/instance.ts

@@ -1,6 +1,6 @@
 import Router from "next/router";
 import { Log4brainsMode } from "../../contexts";
-import { Search, SerializedIndex } from "./Search";
+import { Search, SerializedIndex } from "../../lib-shared/search";
 
 function isSerializedIndex(obj: unknown): obj is SerializedIndex {
   return (

packages/web/src/pages/adr/[...slug].tsx → packages/web/nextjs/src/pages/adr/[...slug].tsx

@@ -2,7 +2,7 @@ import { GetStaticProps, GetStaticPaths } from "next";
 import { getLog4brainsInstance } from "../../lib/core-api";
 import { getConfig } from "../../lib/next";
 import { AdrScene, AdrSceneProps } from "../../scenes";
-import { toAdr } from "../../types";
+import { toAdr } from "../../lib-shared/types";
 
 export default AdrScene;
 

packages/web/src/pages/api/adr.ts → packages/web/nextjs/src/pages/api/adr.ts

@@ -1,6 +1,6 @@
 import { NextApiRequest, NextApiResponse } from "next";
 import { getLog4brainsInstance } from "../../lib/core-api";
-import { toAdrLight } from "../../types";
+import { toAdrLight } from "../../lib-shared/types";
 
 export default async (
   req: NextApiRequest,

packages/web/src/pages/api/search-index.ts → packages/web/nextjs/src/pages/api/search-index.ts

@@ -1,6 +1,6 @@
 import { NextApiRequest, NextApiResponse } from "next";
 import { getLog4brainsInstance } from "../../lib/core-api";
-import { Search } from "../../lib/search";
+import { Search } from "../../lib-shared/search";
 
 export default async (
   req: NextApiRequest,

packages/web/src/pages/index.tsx → packages/web/nextjs/src/pages/index.tsx

@@ -2,7 +2,7 @@ import { GetStaticProps } from "next";
 import { getIndexPageMarkdown, getLog4brainsInstance } from "../lib/core-api";
 import { getConfig } from "../lib/next";
 import { IndexScene, IndexSceneProps } from "../scenes";
-import { toAdrLight } from "../types";
+import { toAdrLight } from "../lib-shared/types";
 
 export default IndexScene;
 

packages/web/src/scenes/AdrScene/AdrScene.stories.tsx → packages/web/nextjs/src/scenes/AdrScene/AdrScene.stories.tsx

@@ -3,7 +3,7 @@ import { Meta, Story } from "@storybook/react";
 import { AdrScene, AdrSceneProps } from "./AdrScene";
 import { adrMocks, getMockedAdrBySlug } from "../../../.storybook/mocks";
 import { Log4brainsMode, Log4brainsModeContext } from "../../contexts";
-import { toAdrLight } from "../../types";
+import { toAdrLight } from "../../lib-shared/types";
 import { AdrBrowserLayout } from "../../layouts";
 
 const Template: Story<AdrSceneProps> = (args) => (

packages/web/src/scenes/AdrScene/AdrScene.tsx → packages/web/nextjs/src/scenes/AdrScene/AdrScene.tsx

@@ -26,7 +26,7 @@ import {
   Log4brainsMode,
   Log4brainsModeContext
 } from "../../contexts";
-import { Adr } from "../../types";
+import { Adr } from "../../lib-shared/types";
 import { buildAdrUrl } from "../../lib/adr-utils";
 
 const useStyles = makeStyles((theme: CustomTheme) =>

packages/web/src/scenes/AdrScene/components/AdrHeader/AdrHeader.tsx → packages/web/nextjs/src/scenes/AdrScene/components/AdrHeader/AdrHeader.tsx

@@ -31,7 +31,7 @@ import {
 import { FiLink as LinkRIcon } from "react-icons/fi";
 import clsx from "clsx";
 import { AdrStatusChip } from "../../../../components";
-import { Adr } from "../../../../types";
+import { Adr } from "../../../../lib-shared/types";
 
 function capitalize(s: string): string {
   return s.charAt(0).toUpperCase() + s.slice(1);

packages/web/src/scenes/IndexScene/IndexScene.stories.tsx → packages/web/nextjs/src/scenes/IndexScene/IndexScene.stories.tsx

@@ -3,7 +3,7 @@ import { Meta, Story } from "@storybook/react";
 import { IndexScene, IndexSceneProps } from "./IndexScene";
 import { Log4brainsMode, Log4brainsModeContext } from "../../contexts";
 import { adrMocks } from "../../../.storybook/mocks";
-import { toAdrLight } from "../../types";
+import { toAdrLight } from "../../lib-shared/types";
 import { AdrBrowserLayout } from "../../layouts";
 
 const markdown = `# Hello World

packages/web/nextjs/tsconfig.json

@@ -0,0 +1,24 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": false,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve"
+  },
+  "include": ["next-env.d.ts", "src/**/*.ts", "src/**/*.tsx"],
+  "exclude": [
+    "node_modules",
+    "**/*.test.ts",
+    "**/*.test.tsx",
+    "**/*.stories.tsx"
+  ]
+}