feat: Update ESLint config to fix imports/exports (#109)

Author: vicb

packages/cloudflare/eslint.config.mjs

@@ -1,6 +1,8 @@
+import pluginJs from "@eslint/js";
+import importPlugin from "eslint-plugin-import";
+import simpleImportSort from "eslint-plugin-simple-import-sort";
 import eslintPluginUnicorn from "eslint-plugin-unicorn";
 import globals from "globals";
-import pluginJs from "@eslint/js";
 import tseslint from "typescript-eslint";
 
 export default [
@@ -18,13 +20,20 @@ export default [
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
   {
+    name: "open-next",
     plugins: {
       unicorn: eslintPluginUnicorn,
+      "simple-import-sort": simpleImportSort,
+      import: importPlugin,
     },
     rules: {
       "@typescript-eslint/ban-ts-comment": "off",
       "unicorn/prefer-node-protocol": "error",
-      "sort-imports": "error",
+      "simple-import-sort/imports": "error",
+      "simple-import-sort/exports": "error",
+      "import/first": "error",
+      "import/newline-after-import": "error",
+      "import/no-duplicates": "error",
     },
   },
 ];

packages/cloudflare/package.json

@@ -46,6 +46,8 @@
     "@types/node": "catalog:",
     "esbuild": "catalog:",
     "eslint": "catalog:",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unicorn": "catalog:",
     "glob": "catalog:",
     "globals": "catalog:",

packages/cloudflare/src/cli/args.ts

@@ -1,6 +1,6 @@
-import { type Stats, mkdirSync, statSync } from "node:fs";
-import { parseArgs } from "node:util";
+import { mkdirSync, type Stats, statSync } from "node:fs";
 import { resolve } from "node:path";
+import { parseArgs } from "node:util";
 
 export function getArgs(): {
   skipNextBuild: boolean;

packages/cloudflare/src/cli/build/build-next-app.ts

@@ -1,6 +1,7 @@
-import { type AgentName as PackageManager, detect } from "package-manager-detector";
 import { execSync } from "node:child_process";
 
+import { type AgentName as PackageManager, detect } from "package-manager-detector";
+
 /**
  * Builds the Next.js app in the standard Next.js cli way (this outputs a `.next` directory)
  *

packages/cloudflare/src/cli/build/build-worker.ts

@@ -1,21 +1,23 @@
-import { Plugin, build } from "esbuild";
+import { existsSync, readFileSync } from "node:fs";
 import { cp, readFile, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
-import { existsSync, readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+
+import { build, Plugin } from "esbuild";
+
 import { Config } from "../config";
 import { copyPackageCliFiles } from "./patches/investigated/copy-package-cli-files";
-import { copyPrerenderedRoutes } from "./utils";
-import { fileURLToPath } from "node:url";
+import { patchCache } from "./patches/investigated/patch-cache";
+import { patchRequire } from "./patches/investigated/patch-require";
+import { updateWebpackChunksFile } from "./patches/investigated/update-webpack-chunks-file";
 import { inlineEvalManifest } from "./patches/to-investigate/inline-eval-manifest";
 import { inlineMiddlewareManifestRequire } from "./patches/to-investigate/inline-middleware-manifest-require";
 import { inlineNextRequire } from "./patches/to-investigate/inline-next-require";
-import { patchCache } from "./patches/investigated/patch-cache";
 import { patchExceptionBubbling } from "./patches/to-investigate/patch-exception-bubbling";
 import { patchFindDir } from "./patches/to-investigate/patch-find-dir";
 import { patchReadFile } from "./patches/to-investigate/patch-read-file";
-import { patchRequire } from "./patches/investigated/patch-require";
 import { patchWranglerDeps } from "./patches/to-investigate/wrangler-deps";
-import { updateWebpackChunksFile } from "./patches/investigated/update-webpack-chunks-file";
+import { copyPrerenderedRoutes } from "./utils";
 
 /** The dist directory of the Cloudflare adapter package */
 const packageDistDir = join(dirname(fileURLToPath(import.meta.url)), "..");

packages/cloudflare/src/cli/build/index.ts

@@ -1,10 +1,11 @@
-import { containsDotNextDir, getConfig } from "../config";
+import { cpSync } from "node:fs";
+import { rm } from "node:fs/promises";
+import { join } from "node:path";
+
 import type { ProjectOptions } from "../config";
+import { containsDotNextDir, getConfig } from "../config";
 import { buildNextjsApp } from "./build-next-app";
 import { buildWorker } from "./build-worker";
-import { cpSync } from "node:fs";
-import { join } from "node:path";
-import { rm } from "node:fs/promises";
 
 /**
  * Builds the application in a format that can be passed to workerd

packages/cloudflare/src/cli/build/patches/investigated/copy-package-cli-files.ts

@@ -1,7 +1,8 @@
-import { Config } from "../../../config";
 import { cpSync } from "node:fs";
 import { join } from "node:path";
 
+import { Config } from "../../../config";
+
 /**
  * Copies the template files present in the cloudflare adapter package into the standalone node_modules folder
  */

packages/cloudflare/src/cli/build/patches/investigated/patch-cache.ts

@@ -1,7 +1,9 @@
-import { Config } from "../../../config";
-import { build } from "esbuild";
 import { join } from "node:path";
 
+import { build } from "esbuild";
+
+import { Config } from "../../../config";
+
 /**
  * Sets up the OpenNext cache handler in a Next.js build.
  *

packages/cloudflare/src/cli/build/patches/investigated/update-webpack-chunks-file/get-chunk-installation-identifiers.test.ts

@@ -1,7 +1,9 @@
-import { describe, expect, test } from "vitest";
-import { getChunkInstallationIdentifiers } from "./get-chunk-installation-identifiers";
 import { readFile } from "node:fs/promises";
+
+import { describe, expect, test } from "vitest";
+
 import { tsParseFile } from "../../../utils";
+import { getChunkInstallationIdentifiers } from "./get-chunk-installation-identifiers";
 
 describe("getChunkInstallationIdentifiers", () => {
   test("gets chunk identifiers from unminified code", async () => {

packages/cloudflare/src/cli/build/patches/investigated/update-webpack-chunks-file/get-file-content-with-updated-webpack-f-require-code.test.ts

@@ -1,7 +1,9 @@
-import { describe, expect, test } from "vitest";
-import { getFileContentWithUpdatedWebpackFRequireCode } from "./get-file-content-with-updated-webpack-f-require-code";
 import { readFile } from "node:fs/promises";
+
+import { describe, expect, test } from "vitest";
+
 import { tsParseFile } from "../../../utils";
+import { getFileContentWithUpdatedWebpackFRequireCode } from "./get-file-content-with-updated-webpack-f-require-code";
 
 describe("getFileContentWithUpdatedWebpackFRequireCode", () => {
   test("returns the updated content of the f.require function from unminified webpack runtime code", async () => {