@mnci/cli 1.17.1 → 1.18.0

package/dist/cli.js

@@ -141,7 +141,20 @@ async function promptStack() {
       { name: "Vitest", value: "vitest" }
     ]
   });
-  return { testRunner };
+  const linter = await (0, import_prompts.select)({
+    message: "Linter and formatter",
+    choices: [
+      {
+        name: "ESLint + Prettier \u2014 every file type, the widest rule coverage",
+        value: "eslint"
+      },
+      {
+        name: "oxlint + oxfmt for JS/TS, ESLint for the rest \u2014 much faster, same style",
+        value: "oxlint"
+      }
+    ]
+  });
+  return { testRunner, linter };
 }
 
 // src/util/fsx.ts
@@ -1241,7 +1254,7 @@ var import_node_path12 = require("path");
 // src/overlay.ts
 var import_node_fs6 = require("fs");
 var import_node_path11 = require("path");
-var DEFAULT_STACK = { testRunner: "jest" };
+var DEFAULT_STACK = { testRunner: "jest", linter: "eslint" };
 var PRETTIER_VERSION = "^3.8.1";
 var TS_COMPILER_DEPENDENCIES = {
   "@typescript/native": "npm:typescript@^7.0.2",
@@ -1375,7 +1388,7 @@ function eslintConfigSpec() {
   return process.env.MNCI_ESLINT_CONFIG_SPEC ?? ESLINT_CONFIG_VERSION;
 }
 var ESLINT_VERSION = "^10.8.0";
-function devcontainerJson(workspaceName) {
+function devcontainerJson(workspaceName, linter) {
   return `${toJson({
     name: workspaceName,
     image: `mcr.microsoft.com/devcontainers/typescript-node:${NODE_VERSION}-bookworm`,
@@ -1394,7 +1407,7 @@ function devcontainerJson(workspaceName) {
     // The same recommendations the `.code-workspace` file carries, so opening
     // the folder in a container suggests the identical toolset.
     customizations: {
-      vscode: { extensions: [...VSCODE_RECOMMENDED_EXTENSIONS] }
+      vscode: { extensions: vscodeExtensions(linter) }
     }
   })}
 `;
@@ -1501,43 +1514,47 @@ __pycache__
 .ruff_cache
 .dart_tool
 `;
-var VSCODE_RECOMMENDED_EXTENSIONS = [
-  "dbaeumer.vscode-eslint",
-  "esbenp.prettier-vscode",
+var LINTER_EXTENSIONS = {
+  eslint: ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode"],
+  oxlint: ["oxc.oxc-vscode", "dbaeumer.vscode-eslint"]
+};
+var SHARED_VSCODE_EXTENSIONS = [
   "nrwl.angular-console",
   "firsttris.vscode-jest-runner"
 ];
-function vscodeWorkspace(workspaceName, existingTasks) {
+function vscodeExtensions(linter) {
+  return [...LINTER_EXTENSIONS[linter], ...SHARED_VSCODE_EXTENSIONS];
+}
+function vscodeSettings(linter) {
+  const formatter = linter === "oxlint" ? "oxc.oxc-vscode" : "esbenp.prettier-vscode";
+  const eslintLanguages = linter === "oxlint" ? ["json", "jsonc", "markdown", "yaml", "html", "css"] : [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact",
+    "json",
+    "jsonc",
+    "markdown",
+    "yaml"
+  ];
+  return {
+    "eslint.validate": eslintLanguages,
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": "explicit"
+    },
+    "editor.defaultFormatter": formatter,
+    "editor.formatOnSave": true,
+    "[json]": { "editor.defaultFormatter": formatter },
+    "[jsonc]": { "editor.defaultFormatter": formatter },
+    "[yaml]": { "editor.defaultFormatter": formatter }
+  };
+}
+function vscodeWorkspace(workspaceName, linter, existingTasks) {
   return JSON.stringify(
     {
       folders: [{ path: ".", name: workspaceName }],
-      settings: {
-        "eslint.validate": [
-          "javascript",
-          "javascriptreact",
-          "typescript",
-          "typescriptreact",
-          "json",
-          "jsonc",
-          "markdown",
-          "yaml"
-        ],
-        "editor.codeActionsOnSave": {
-          "source.fixAll.eslint": "explicit"
-        },
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": true,
-        "[json]": {
-          "editor.defaultFormatter": "esbenp.prettier-vscode"
-        },
-        "[jsonc]": {
-          "editor.defaultFormatter": "esbenp.prettier-vscode"
-        },
-        "[yaml]": {
-          "editor.defaultFormatter": "esbenp.prettier-vscode"
-        }
-      },
-      extensions: { recommendations: [...VSCODE_RECOMMENDED_EXTENSIONS] },
+      settings: vscodeSettings(linter),
+      extensions: { recommendations: vscodeExtensions(linter) },
       tasks: {
         version: existingTasks?.version ?? "2.0.0",
         tasks: existingTasks?.tasks ?? []
@@ -1595,7 +1612,7 @@ function mnciConfig(options) {
     agent: options.agent,
     variableGroup: options.variableGroup,
     ci: options.ci,
-    stack: { testRunner: options.stack.testRunner }
+    stack: { testRunner: options.stack.testRunner, linter: options.stack.linter }
   };
 }
 function readMnciConfig(workspaceRoot) {
@@ -2172,13 +2189,16 @@ function applyOverlay(workspaceRoot, options) {
   writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".prettierrc.mjs"), PRETTIER_CONFIG);
   writeFileEnsured(
     (0, import_node_path11.join)(workspaceRoot, ".devcontainer/devcontainer.json"),
-    devcontainerJson(options.workspaceName)
+    devcontainerJson(options.workspaceName, options.stack.linter)
   );
   writeFileEnsured((0, import_node_path11.join)(workspaceRoot, ".prettierignore"), PRETTIER_IGNORE);
   removeNxScaffolding(workspaceRoot);
   const codeWorkspacePath = (0, import_node_path11.join)(workspaceRoot, `${options.workspaceName}.code-workspace`);
   const existing = readCodeWorkspace(codeWorkspacePath);
-  writeFileEnsured(codeWorkspacePath, vscodeWorkspace(options.workspaceName, existing?.tasks));
+  writeFileEnsured(
+    codeWorkspacePath,
+    vscodeWorkspace(options.workspaceName, options.stack.linter, existing?.tasks)
+  );
   if (options.workspaceName !== "undefined") {
     (0, import_node_fs6.rmSync)((0, import_node_path11.join)(workspaceRoot, "undefined.code-workspace"), { force: true });
   }
@@ -2361,14 +2381,16 @@ function nxCloudProviderValue(ci) {
   return ci === "azure" ? "azure" : "github";
 }
 async function resolveStack(options) {
-  if (options.testRunner || options.yes) {
+  if (options.testRunner || options.linter || options.yes) {
     return {
-      testRunner: options.testRunner ?? DEFAULT_STACK.testRunner
+      testRunner: options.testRunner ?? DEFAULT_STACK.testRunner,
+      linter: options.linter ?? DEFAULT_STACK.linter
     };
   }
   const prompted = await promptStack();
   return {
-    testRunner: prompted.testRunner
+    testRunner: prompted.testRunner,
+    linter: prompted.linter
   };
 }
 var CI_PROVIDERS = /* @__PURE__ */ new Set(["azure", "github", "both"]);
@@ -2514,6 +2536,7 @@ function resolveOverlayOptions(workspaceRoot, options, persisted) {
     );
   }
   const variableGroup = options.variableGroup ?? persisted.variableGroup ?? "Build";
+  const linter = options.linter ?? persisted.stack?.linter ?? "eslint";
   const testRunner = options.testRunner ?? persisted.stack?.testRunner;
   if (!testRunner) {
     throw new Error(
@@ -2527,7 +2550,7 @@ function resolveOverlayOptions(workspaceRoot, options, persisted) {
     agent,
     variableGroup,
     ci,
-    stack: { testRunner }
+    stack: { testRunner, linter }
   };
 }
 function runUpgrade(workspaceRoot, options) {
@@ -2641,7 +2664,10 @@ function buildProgram(cliVersion) {
   program.command("new").argument("[name]", "workspace name").description("Create a new monorepo (Nx TS preset + release/pipeline overlay)").option("-y, --yes", "accept defaults for anything not passed as a flag").option("--scope <scope>", "npm scope for publishable packages (e.g. @demo)").option("--registry <kind>", "azure-artifacts | npm").option("--organization <name>", "Azure DevOps organization").option("--project <name>", "Azure DevOps project").option("--artifacts-feed <name>", "Azure Artifacts feed").option(
     "--agent <pool>",
     "CI build agent: a vmImage (e.g. ubuntu-latest) or self-hosted pool name"
-  ).option("--variable-group <name>", "Azure DevOps variable group holding the npm PAT").option("--ci <provider>", "CI provider: azure | github | both").option("--test-runner <runner>", "unit-test runner: jest | vitest").option("--nx-cloud", "connect the workspace to Nx Cloud (remote caching + CI insights)").action(async (name, options) => {
+  ).option("--variable-group <name>", "Azure DevOps variable group holding the npm PAT").option("--ci <provider>", "CI provider: azure | github | both").option("--test-runner <runner>", "unit-test runner: jest | vitest").option(
+    "--linter <linter>",
+    "linter + formatter: eslint (ESLint + Prettier) | oxlint (oxlint + oxfmt for JS/TS, ESLint for the rest)"
+  ).option("--nx-cloud", "connect the workspace to Nx Cloud (remote caching + CI insights)").action(async (name, options) => {
     await runNew(name, options);
   });
   program.command("upgrade").description(
@@ -2649,6 +2675,9 @@ function buildProgram(cliVersion) {
   ).option("--scope <scope>", "npm scope for publishable packages (overrides the persisted value)").option("--registry <kind>", "azure-artifacts | npm (overrides the persisted value)").option("--organization <name>", "Azure DevOps organization").option("--project <name>", "Azure DevOps project").option("--artifacts-feed <name>", "Azure Artifacts feed").option("--agent <pool>", "CI build agent (overrides the persisted value)").option("--variable-group <name>", "Azure DevOps variable group holding the npm PAT").option("--ci <provider>", "CI provider: azure | github | both (overrides the persisted value)").option(
     "--test-runner <runner>",
     "unit-test runner: jest | vitest (overrides the persisted value)"
+  ).option(
+    "--linter <linter>",
+    "linter + formatter: eslint | oxlint (overrides the persisted value)"
   ).action((options) => {
     runUpgrade(process.cwd(), options);
   });