@w5s/mrm-preset 3.5.7 → 3.5.8

package/core/{pkg.js → pkg.cjs}

@@ -5,12 +5,13 @@
  * @typedef {string|boolean|number|null|Array<unknown>|Record<string, unknown>} JsonValue
  */
 
+const glob = require('glob');
+const { file, json, packageJson } = require('mrm-core');
 const path = require('node:path');
 // @ts-ignore
 const { intersect } = require('semver-intersect');
-const { packageJson, file, json } = require('mrm-core');
-const glob = require('glob');
-const jsonFile = require('./jsonFile.js');
+
+const jsonFile = require('./jsonFile.cjs');
 
 /**
  * An empty placeholder for npm script
@@ -32,23 +33,6 @@ function archetype(packageFile) {
   return 'library';
 }
 
-/**
- * @param {(pkg: import('mrm-core').PackageJson) => void} block
- */
-function withPackageJson(block) {
-  const packageFile = packageJson();
-  block(packageFile);
-  packageFile.save();
-}
-
-/**
- * @param {import("mrm-core").Json} packageFile
- * @returns {string[]} - The list of workspace matchers
- */
-function listWorkspaceMatchers(packageFile) {
-  return packageFile.get('workspaces.packages', packageFile.get('workspaces', []));
-}
-
 /**
  * @param {(workspace: {
  *   projectDir: string;
@@ -65,14 +49,22 @@ function forEachWorkspace(fn) {
     directories.forEach((directory) => {
       const packageFile = json(path.join(directory, 'package.json'));
       fn({
-        projectDir: directory,
         packageFile,
+        projectDir: directory,
       });
       packageFile.save();
     });
   }
 }
 
+/**
+ * @param {import("mrm-core").Json} packageFile
+ * @returns {string[]} - The list of workspace matchers
+ */
+function listWorkspaceMatchers(packageFile) {
+  return packageFile.get('workspaces.packages', packageFile.get('workspaces', []));
+}
+
 /**
  * @template {undefined|JsonValue} T
  * @param {import('mrm-core').Json} packageFile
@@ -90,37 +82,42 @@ function script(packageFile, options) {
   });
 }
 
-const defaultManager = 'npm';
-
 /**
- * @param {import('mrm-core').PackageJson} packageFile
- * @returns {'yarn'|'npm'|'pnpm'} - The manager used by the package
+ * @param {(pkg: import('mrm-core').PackageJson) => void} block
  */
-function manager(packageFile) {
-  if (packageFile.get('packageManager')) {
-    const [head, tail] = packageFile.get('packageManager').split('@', 2);
-
-    return head ?? tail;
-  }
-  if (file('yarn.lock').exists()) {
-    return 'yarn';
-  }
-  if (file('package-lock.json').exists()) {
-    return 'npm';
-  }
-  if (file('pnpm-lock.yaml').exists()) {
-    return 'pnpm';
-  }
-
-  return defaultManager;
+function withPackageJson(block) {
+  const packageFile = packageJson();
+  block(packageFile);
+  packageFile.save();
 }
 
+const defaultManager = 'npm';
+
 /**
  *
  * @param {import('mrm-core').Json} packageFile
+ * @param {Record<string, string>} engineVersionMap
  */
-function hasWorkspaces(packageFile) {
-  return Boolean(packageFile.get('workspaces'));
+function engineMinVersion(packageFile, engineVersionMap) {
+  /**
+   * @param {string} engineName
+   */
+  const engineConstraint = (engineName) => {
+    const defaultVersion = engineVersionMap[engineName];
+    const currentVersion = packageFile.get(`engines.${engineName}`, defaultVersion);
+    try {
+      return intersect(currentVersion, defaultVersion);
+    } catch {
+      return currentVersion; // leave unchanged
+    }
+  };
+
+  packageFile.merge({
+    engines: Object.fromEntries(
+      Object.keys(engineVersionMap).map((engineName) => [engineName, engineConstraint(engineName)]),
+    ),
+  });
+  return packageFile.get('engines');
 }
 
 /**
@@ -146,40 +143,44 @@ function hasDependency(packageFile, packageName, dependencyType) {
 /**
  *
  * @param {import('mrm-core').Json} packageFile
- * @param {Record<string, string>} engineVersionMap
  */
-function engineMinVersion(packageFile, engineVersionMap) {
-  /**
-   * @param {string} engineName
-   */
-  const engineConstraint = (engineName) => {
-    const defaultVersion = engineVersionMap[engineName];
-    const currentVersion = packageFile.get(`engines.${engineName}`, defaultVersion);
-    try {
-      return intersect(currentVersion, defaultVersion);
-    } catch {
-      return currentVersion; // leave unchanged
-    }
-  };
+function hasWorkspaces(packageFile) {
+  return Boolean(packageFile.get('workspaces'));
+}
 
-  packageFile.merge({
-    engines: Object.fromEntries(
-      Object.keys(engineVersionMap).map((engineName) => [engineName, engineConstraint(engineName)]),
-    ),
-  });
-  return packageFile.get('engines');
+/**
+ * @param {import('mrm-core').PackageJson} packageFile
+ * @returns {'yarn'|'npm'|'pnpm'} - The manager used by the package
+ */
+function manager(packageFile) {
+  if (packageFile.get('packageManager')) {
+    const [head, tail] = packageFile.get('packageManager').split('@', 2);
+
+    return head ?? tail;
+  }
+  if (file('yarn.lock').exists()) {
+    return 'yarn';
+  }
+  if (file('package-lock.json').exists()) {
+    return 'npm';
+  }
+  if (file('pnpm-lock.yaml').exists()) {
+    return 'pnpm';
+  }
+
+  return defaultManager;
 }
 
 module.exports = {
   ...jsonFile,
-  emptyScript,
   archetype,
-  script,
-  manager,
+  emptyScript,
   engineMinVersion,
+  forEachWorkspace,
   hasDependency,
   hasWorkspaces,
-  withPackageJson,
-  forEachWorkspace,
   listWorkspaceMatchers,
+  manager,
+  script,
+  withPackageJson,
 };

package/core/{semanticRelease.js → semanticRelease.cjs}

@@ -1,6 +1,6 @@
-const npm = require('./npm.js');
-const pkg = require('./pkg.js');
-const jsonFile = require('./jsonFile.js');
+const jsonFile = require('./jsonFile.cjs');
+const npm = require('./npm.cjs');
+const pkg = require('./pkg.cjs');
 
 /**
  * @typedef {{
@@ -15,7 +15,7 @@ const jsonFile = require('./jsonFile.js');
  *   update?: (config: SemanticReleaseConfig) => SemanticReleaseConfig
  * }} options
  */
-function semanticRelease({ state, update, preset }) {
+function semanticRelease({ preset, state, update }) {
   npm.dependency({
     dev: true,
     name: ['semantic-release', ...(preset ? [preset] : [])],
@@ -24,13 +24,13 @@ function semanticRelease({ state, update, preset }) {
 
   pkg.withPackageJson((packageFile) => {
     jsonFile.value(packageFile, {
-      path: 'release',
-      state,
-      update,
       /** @type {SemanticReleaseConfig} */
       default: {
         extends: preset ? [preset] : [],
       },
+      path: 'release',
+      state,
+      update,
     });
   });
 }

package/core/{turbo.js → turbo.cjs}

@@ -1,6 +1,7 @@
 const { json } = require('mrm-core');
-const npm = require('./npm.js');
-const jsonFile = require('./jsonFile.js');
+
+const jsonFile = require('./jsonFile.cjs');
+const npm = require('./npm.cjs');
 
 /**
  * @typedef {{
@@ -23,14 +24,14 @@ function turbo({ state, update }) {
 
   if (hasTurbo) {
     jsonFile.value(turboFile, {
+      /** @type {TurboConfig} */
+      default: {},
       path: undefined,
       state,
       update: (previousValue) => ({
         $schema: 'https://turbo.build/schema.json',
         ...update(previousValue),
       }),
-      /** @type {TurboConfig} */
-      default: {},
     });
 
     /**

package/core/{typedoc.js → typedoc.cjs}

@@ -1,7 +1,8 @@
-const { packageJson, json } = require('mrm-core');
-const pkg = require('./pkg.js');
-const npm = require('./npm.js');
-const jsonFile = require('./jsonFile.js');
+const { json, packageJson } = require('mrm-core');
+
+const jsonFile = require('./jsonFile.cjs');
+const npm = require('./npm.cjs');
+const pkg = require('./pkg.cjs');
 
 /**
  * @typedef {{
@@ -30,22 +31,22 @@ function typedoc({ state, update }) {
 
   if (hasTypedoc) {
     jsonFile.value(typedocFile, {
+      /** @type {TypeDocConfig} */
+      default: {},
       path: undefined,
       state,
       update: (config) => ({
         ...update(config),
         ...(hasWorkspaces
           ? {
-              entryPointStrategy: 'packages',
               entryPoints: undefined,
+              entryPointStrategy: 'packages',
             }
           : {
-              entryPointStrategy: undefined,
               entryPoints: ['src/index.ts'],
+              entryPointStrategy: undefined,
             }),
       }),
-      /** @type {TypeDocConfig} */
-      default: {},
     });
 
     /**

package/core/{vitest.js → vitest.cjs}

@@ -1,8 +1,9 @@
-const fs = require('node:fs');
 const { file, packageJson } = require('mrm-core');
-const pkg = require('./pkg.js');
-const npm = require('./npm.js');
-const project = require('./project.js');
+const fs = require('node:fs');
+
+const npm = require('./npm.cjs');
+const pkg = require('./pkg.cjs');
+const project = require('./project.cjs');
 
 /**
  * @param {{
@@ -32,12 +33,12 @@ function vitest({ state }) {
     vitestVersion = packageFile.get('devDependencies.vitest');
     pkg.script(packageFile, {
       name: `${project.test}:root`,
-      update,
       state: hasWorkspace ? 'absent' : 'present',
+      update,
     });
   });
 
-  pkg.forEachWorkspace(({ projectDir, packageFile }) => {
+  pkg.forEachWorkspace(({ packageFile, projectDir }) => {
     const hasSrc = fs.existsSync(`${projectDir}/src`);
     const packageState = hasVitest && hasSrc ? 'present' : 'absent';
     pkg.value(packageFile, {
@@ -52,8 +53,8 @@ function vitest({ state }) {
     });
     pkg.script(packageFile, {
       name: `${project.test}:src`,
-      update,
       state: packageState,
+      update,
     });
     const viteConfig = file(`${projectDir}/vite.config.mts`);
     if (packageState === 'absent') {

package/core/{vscode.js → vscode.cjs}

@@ -67,7 +67,7 @@ exports.vscodeTask = vscodeTask;
  *   }
  * }} snippets
  */
-function vscodeSnippets({ name = 'mrm', state = 'present', snippets }) {
+function vscodeSnippets({ name = 'mrm', snippets, state = 'present' }) {
   const snippetFile = json(`.vscode/${name}.code-snippets`);
   if (state === 'present') {
     snippetFile.merge(snippets);

package/cspell/{index.js → index.cjs}

@@ -1,7 +1,7 @@
-const { cspell } = require('../core/cspell.js');
-const project = require('../core/project.js');
-const pkg = require('../core/pkg.js');
-const npm = require('../core/npm.js');
+const { cspell } = require('../core/cspell.cjs');
+const npm = require('../core/npm.cjs');
+const pkg = require('../core/pkg.cjs');
+const project = require('../core/project.cjs');
 
 function task() {
   const preset = '@w5s/cspell-config';
@@ -23,22 +23,22 @@ function task() {
     const workspaceMatchers = pkg.listWorkspaceMatchers(packageFile);
     pkg.script(packageFile, {
       name: project.spellcheck,
-      update: `turbo run spellcheck`,
       state: 'present',
+      update: `turbo run spellcheck`,
     });
     pkg.script(packageFile, {
       name: `${project.spellcheck}:root`,
+      state: 'present',
       update: `cspell --no-progress '**' ${
         hasWorkspaces ? (workspaceMatchers.map((_) => `--exclude='${_}/**'`).join(' ')) : ''
       }`,
-      state: 'present',
     });
   });
   pkg.forEachWorkspace(({ packageFile }) => {
     pkg.script(packageFile, {
       name: project.spellcheck,
-      update: `cspell --no-progress '**'`,
       state: 'present',
+      update: `cspell --no-progress '**'`,
     });
   });
 }

package/editorconfig/{index.js → index.cjs}

@@ -1,14 +1,15 @@
-const { readFileSync } = require('node:fs');
 const { blockSync } = require('@w5s/configurator-core');
-const { vscodeRecommendedExtension } = require('../core/vscode.js');
+const { readFileSync } = require('node:fs');
+
+const { vscodeRecommendedExtension } = require('../core/vscode.cjs');
 
 function task() {
   const templateContent = readFileSync(require.resolve('./_editorconfig'), 'utf8').slice(0, -1);
 
   blockSync({
     block: templateContent,
-    path: '.editorconfig',
     insertPosition: ['before', 'BeginningOfFile'],
+    path: '.editorconfig',
   });
 
   vscodeRecommendedExtension({

package/eslint/{index.js → index.cjs}

@@ -1,9 +1,10 @@
 const { packageJson } = require('mrm-core');
-const pkg = require('../core/pkg.js');
-const npm = require('../core/npm.js');
-const { eslintConfig } = require('../core/eslint.js');
-const project = require('../core/project.js');
-const { vscodeSettings, vscodeRecommendedExtension } = require('../core/vscode.js');
+
+const { eslintConfig } = require('../core/eslint.cjs');
+const npm = require('../core/npm.cjs');
+const pkg = require('../core/pkg.cjs');
+const project = require('../core/project.cjs');
+const { vscodeRecommendedExtension, vscodeSettings } = require('../core/vscode.cjs');
 
 function createESLint({ eslintPreset: eslintPresetDefault = 'eslint:recommended' }) {
   /**
@@ -54,13 +55,13 @@ function createESLint({ eslintPreset: eslintPresetDefault = 'eslint:recommended'
       // workspaces
       pkg.script(packageFile, {
         name: `${project.lint}:root`,
-        update: `eslint .${extOption}${hasWorkspaces ? ignorePatterns : ''}`,
         state: 'present',
+        update: `eslint .${extOption}${hasWorkspaces ? ignorePatterns : ''}`,
       });
       pkg.script(packageFile, {
         name: `${project.format}:root`,
-        update: `eslint .${extOption}${hasWorkspaces ? ignorePatterns : ''} --fix`,
         state: 'present',
+        update: `eslint .${extOption}${hasWorkspaces ? ignorePatterns : ''} --fix`,
       });
 
       // clean
@@ -88,13 +89,13 @@ function createESLint({ eslintPreset: eslintPresetDefault = 'eslint:recommended'
           : _);
       pkg.script(packageFile, {
         name: `${project.lint}:src`,
-        update: updater(false),
         state: 'present',
+        update: updater(false),
       });
       pkg.script(packageFile, {
         name: `${project.format}:src`,
-        update: updater(true),
         state: 'present',
+        update: updater(true),
       });
     });
 

package/githooks/{index.js → index.cjs}

@@ -1,11 +1,12 @@
-const path = require('node:path');
-const { packageJson, template } = require('mrm-core');
 const { fileSync } = require('@w5s/configurator-core');
-const project = require('../core/project.js');
-const pkg = require('../core/pkg.js');
-const { hasGit } = require('../core/git.js');
-const { gitHook } = require('../core/githooks.js');
-const { lintStaged } = require('../core/lintStaged.js');
+const { packageJson, template } = require('mrm-core');
+const path = require('node:path');
+
+const { hasGit } = require('../core/git.cjs');
+const { gitHook } = require('../core/githooks.cjs');
+const { lintStaged } = require('../core/lintStaged.cjs');
+const pkg = require('../core/pkg.cjs');
+const project = require('../core/project.cjs');
 
 function task() {
   const gitSupported = hasGit();
@@ -16,14 +17,14 @@ function task() {
     state: gitSupported ? 'present' : 'absent',
     update: (config) => ({
       ...config,
-      '*.{json,jsonc,json5}': [...(hasESLint ? ['eslint'] : [])],
-      '*.{yml,yaml}': [...(hasESLint ? ['eslint'] : [])],
       '*.js?(x)': [...(hasESLint ? ['eslint'] : [])],
       '*.ts?(x)': [
         // TODO: https://github.com/okonet/lint-staged/issues/825
         // ...(hasTsc ? ["tsc --noEmit --skipLibCheck"] : []),
         ...(hasESLint ? ['eslint'] : []),
       ],
+      '*.{json,jsonc,json5}': [...(hasESLint ? ['eslint'] : [])],
+      '*.{yml,yaml}': [...(hasESLint ? ['eslint'] : [])],
     }),
   });
   pkg.withPackageJson((_packageFile) => {
@@ -37,13 +38,13 @@ function task() {
   });
 
   gitHook({
-    name: 'pre-commit',
     content: `npm exec -- lint-staged`,
+    name: 'pre-commit',
     state: gitSupported ? 'present' : 'absent',
   });
   gitHook({
-    name: 'pre-push',
     content: `npm run ${project.validate}`,
+    name: 'pre-push',
     state: gitSupported ? 'present' : 'absent',
   });
 

package/gitignore/{index.js → index.cjs}

@@ -1,4 +1,4 @@
-const { gitIgnore } = require('../core/git.js');
+const { gitIgnore } = require('../core/git.cjs');
 
 function task() {
   gitIgnore(['macOS', 'NodeJS', 'VisualStudioCode']);

package/lang/{index.js → index.cjs}

@@ -1,9 +1,9 @@
 const path = require('node:path');
 const { json, file, template, packageJson } = require('mrm-core');
-const npm = require('../core/npm.js');
-const project = require('../core/project.js');
-// const { typedoc } = require('../core/typedoc.js');
-const pkg = require('../core/pkg.js');
+const npm = require('../core/npm.cjs');
+const project = require('../core/project.cjs');
+// const { typedoc } = require('../core/typedoc.cjs');
+const pkg = require('../core/pkg.cjs');
 
 /**
  *

package/licenses/{index.js → index.cjs}

@@ -1,22 +1,23 @@
 const { packageJson } = require('mrm-core');
-const pkg = require('../core/pkg.js');
-const jsonFile = require('../core/jsonFile.js');
+
+const jsonFile = require('../core/jsonFile.cjs');
+const pkg = require('../core/pkg.cjs');
 
 function task() {
   pkg.withPackageJson((packageFile) => {
     jsonFile.value(packageFile, {
+      default: 'UNLICENSED',
       path: 'license',
       state: 'present',
-      default: 'UNLICENSED',
     });
   });
   const license = packageJson().get('license');
 
   pkg.forEachWorkspace(({ packageFile }) => {
     jsonFile.value(packageFile, {
+      default: license,
       path: 'license',
       state: 'present',
-      default: license,
     });
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "3.5.7",
+  "version": "3.5.8",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -24,8 +24,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@w5s/configurator-core": "^1.0.0-alpha.8",
-    "@w5s/dev": "^3.4.7",
+    "@w5s/configurator-core": "^1.0.0-alpha.9",
+    "@w5s/dev": "^3.4.8",
     "debug": "^4.3.3",
     "glob": "^13.0.0",
     "mrm-core": "^7.0.0",
@@ -39,5 +39,5 @@
     "access": "public"
   },
   "sideEffect": false,
-  "gitHead": "fcde4af12d29afdb46ed396ef832c36a399ed057"
+  "gitHead": "e6c63e0164ce2199e59bdca360f4766b6a78584d"
 }

package/package.json.backup

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "3.5.7",
+  "version": "3.5.8",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -22,25 +22,25 @@
   "main": "config.json",
   "scripts": {
     "build": "pnpm run \"/^build:.*/\"",
-    "build:tsc": "tsc",
+    "build:tsc": "pnpm exec tsc",
     "clean": "pnpm run \"/^clean:.*/\"",
     "clean:tsc": "rm -rf dist",
     "docs": "node ../../markdown.mjs",
     "format": "pnpm run \"/^format:.*/\"",
-    "format:src": "eslint . --fix",
+    "format:src": "pnpm exec eslint . --fix",
     "lint": "pnpm run \"/^lint:.*/\"",
-    "lint:src": "eslint .",
+    "lint:src": "pnpm exec eslint .",
     "postpack": "clean-package restore",
     "prepack": "clean-package",
-    "spellcheck": "cspell --no-progress '**'",
+    "spellcheck": "pnpm exec cspell --no-progress '**'",
     "test": "pnpm run \"/^test:.*/\"",
     "test:script": "mkdir -p .temp; cd .temp; mrm bootstrap --dir ..; mrm configure --dir ..",
     "typecheck": "pnpm run \"/^typecheck:.*/\"",
-    "typecheck:src": "tsc --noEmit"
+    "typecheck:src": "pnpm exec tsc --noEmit"
   },
   "dependencies": {
-    "@w5s/configurator-core": "^1.0.0-alpha.8",
-    "@w5s/dev": "^3.4.7",
+    "@w5s/configurator-core": "^1.0.0-alpha.9",
+    "@w5s/dev": "^3.4.8",
     "debug": "^4.3.3",
     "glob": "^13.0.0",
     "mrm-core": "^7.0.0",
@@ -60,5 +60,5 @@
     "access": "public"
   },
   "sideEffect": false,
-  "gitHead": "fcde4af12d29afdb46ed396ef832c36a399ed057"
+  "gitHead": "e6c63e0164ce2199e59bdca360f4766b6a78584d"
 }

package/post-configure/{index.js → index.cjs}

@@ -1,8 +1,9 @@
-const { spawnSync } = require('node:child_process');
 const { packageJson } = require('mrm-core');
-const project = require('../core/project.js');
-const pkg = require('../core/pkg.js');
-const npm = require('../core/npm.js');
+const { spawnSync } = require('node:child_process');
+
+const npm = require('../core/npm.cjs');
+const pkg = require('../core/pkg.cjs');
+const project = require('../core/project.cjs');
 
 function task() {
   // Remove old deps