@dword-design/base 11.3.13 → 12.0.0

package/dist/cli.js

@@ -3,74 +3,71 @@ import { mapValues, values } from '@dword-design/functions';
 import makeCli from 'make-cli';
 import { Base } from "./index.js";
 import loadConfig from "./load-config/index.js";
-const run = async () => {
-  const base = new Base(await loadConfig());
-  const testOptions = [{
-    description: 'Only run tests matching this string or regexp',
-    name: '-g, --grep <grep>'
-  }, {
-    description: 'Update snapshots',
-    name: '-u, --update-snapshots'
-  }, {
-    description: 'Run tests in interactive UI mode',
-    name: '--ui-host <host>'
-  }, {
-    description: 'Host to serve UI on; specifying this option opens UI in a browser tab',
-    name: '--ui'
-  }];
-  try {
-    var _ref, _checkUnknownFiles$co, _base$config$commands;
-    await makeCli({
-      commands: (_ref = (_checkUnknownFiles$co = {
-        checkUnknownFiles: {
-          handler: () => base.checkUnknownFiles()
-        },
-        commit: {
-          handler: () => base.commit(),
-          options: [{
-            description: 'Allow empty commits',
-            name: '--allow-empty'
-          }]
-        },
-        depcheck: {
-          handler: () => base.depcheck()
-        },
-        lint: {
-          handler: () => base.lint()
-        },
-        prepare: {
-          handler: () => base.prepare()
-        },
-        ...(base.config.testInContainer && {
-          'test:raw': {
-            arguments: '[patterns...]',
-            handler: (patterns, options) => base.testRaw({
-              patterns,
-              ...options
-            }),
-            options: testOptions
-          }
-        }),
-        test: {
+const base = new Base(await loadConfig());
+const testOptions = [{
+  description: 'Only run tests matching this string or regexp',
+  name: '-g, --grep <grep>'
+}, {
+  description: 'Update snapshots',
+  name: '-u, --update-snapshots'
+}, {
+  description: 'Run tests in interactive UI mode',
+  name: '--ui-host <host>'
+}, {
+  description: 'Host to serve UI on; specifying this option opens UI in a browser tab',
+  name: '--ui'
+}];
+try {
+  var _ref, _checkUnknownFiles$co, _base$config$commands;
+  await makeCli({
+    commands: (_ref = (_checkUnknownFiles$co = {
+      checkUnknownFiles: {
+        handler: () => base.checkUnknownFiles()
+      },
+      commit: {
+        handler: () => base.commit(),
+        options: [{
+          description: 'Allow empty commits',
+          name: '--allow-empty'
+        }]
+      },
+      depcheck: {
+        handler: () => base.depcheck()
+      },
+      lint: {
+        handler: () => base.lint()
+      },
+      prepare: {
+        handler: () => base.prepare()
+      },
+      ...(base.config.testInContainer && {
+        'test:raw': {
           arguments: '[patterns...]',
-          handler: (patterns, options) => base.test({
+          handler: (patterns, options) => base.testRaw({
             patterns,
             ...options
           }),
           options: testOptions
-        },
-        ...(_base$config$commands = base.config.commands, mapValues((command, name) => ({
-          ...command,
-          handler: (...args) => base.run(name, ...args)
-        }))(_base$config$commands))
-      }, mapValues((command, name) => ({
-        name,
-        ...command
-      }))(_checkUnknownFiles$co)), values(_ref))
-    });
-  } catch (error) {
-    console.log(error.message);
-    process.exit(1);
-  }
-};
-run();
+        }
+      }),
+      test: {
+        arguments: '[patterns...]',
+        handler: (patterns, options) => base.test({
+          patterns,
+          ...options
+        }),
+        options: testOptions
+      },
+      ...(_base$config$commands = base.config.commands, mapValues((command, name) => ({
+        ...command,
+        handler: (...args) => base.run(name, ...args)
+      }))(_base$config$commands))
+    }, mapValues((command, name) => ({
+      name,
+      ...command
+    }))(_checkUnknownFiles$co)), values(_ref))
+  });
+} catch (error) {
+  console.error(error);
+  process.exit(1);
+}

package/dist/commands/check-unknown-files/index.js

@@ -7,7 +7,6 @@ export default async function () {
   const allowedMatches = [...(_this$generatedFiles = this.generatedFiles, keys(_this$generatedFiles)), ...Object.keys({
     '.baserc.json': true,
     '.env.schema.json': true,
-    '.eslintrc.json': true,
     '.git': true,
     '.husky/_': true,
     '.husky/commit-msg': true,
@@ -21,6 +20,7 @@ export default async function () {
     __snapshots__: true,
     demo: true,
     doc: true,
+    'eslint.config.js': true,
     'global-test-hooks.js': true,
     'pnpm-lock.yaml': true,
     'pnpm-workspace.yaml': true,

package/dist/commands/lint/index.js

@@ -1,18 +1,12 @@
 import { execa } from 'execa';
-import { createRequire } from 'module';
 import parsePackagejsonName from 'parse-packagejson-name';
-const _require = createRequire(import.meta.url);
-export default async function (options) {
+export default async function () {
   const packageName = parsePackagejsonName(this.packageConfig.name).fullName;
   if (this.config.git !== undefined && packageName !== this.config.git.project) {
     throw new Error(`Package name '${packageName}' has to be equal to repository name '${this.config.git.project}'`);
   }
-  options = {
-    resolvePluginsRelativeTo: _require.resolve('@dword-design/eslint-config'),
-    ...options
-  };
   try {
-    await execa('eslint', ['--fix', '--ext', '.js,.json,.vue', '--ignore-path', '.gitignore', '--resolve-plugins-relative-to', options.resolvePluginsRelativeTo, '.'], {
+    await execa('eslint', ['--fix', '--ext', '.js,.json,.vue', '.'], {
       all: true
     });
   } catch (error) {

package/dist/commands/prepare/__snapshots__/index.spec.js.snap

@@ -8,7 +8,6 @@ Object {
   ".editorconfig": true,
   ".env.json": true,
   ".env.schema.json": true,
-  ".eslintrc.json": true,
   ".git": true,
   ".gitattributes": true,
   ".github": true,
@@ -25,6 +24,7 @@ Object {
   "LICENSE.md": true,
   "README.md": true,
   "babel.config.json": true,
+  "eslint.config.js": true,
   "package.json": true,
   "pnpm-lock.yaml": true,
   "src": true,

package/dist/commands/prepare/index.js

@@ -1,8 +1,8 @@
+import { createRequire } from 'node:module';
 import { first, keys } from '@dword-design/functions';
 import packageName from 'depcheck-package-name';
 import { execa, execaCommand } from 'execa';
 import fs from 'fs-extra';
-import { createRequire } from 'module';
 import outputFiles from 'output-files';
 const _require = createRequire(import.meta.url);
 const commitlintPackageConfig = _require(packageName`@commitlint/cli/package.json`);

package/dist/commands/test-docker/index.js

@@ -1,9 +1,9 @@
+import os from 'node:os';
 import { filter, flatMap, join, keys, map, replace } from '@dword-design/functions';
 import { constantCase } from 'change-case';
 import { execa } from 'execa';
 import { findUpSync } from 'find-up';
 import fs from 'fs-extra';
-import os from 'os';
 export default async function (options) {
   var _ref, _this$packageConfig$n, _ref2, _ref3;
   options = {

package/dist/commands/test-raw/index.js

@@ -1,10 +1,10 @@
+import { createRequire } from 'node:module';
+import P from 'node:path';
 import { endent, includes } from '@dword-design/functions';
 import Ajv from 'ajv';
 import packageName from 'depcheck-package-name';
 import { execa } from 'execa';
 import fs from 'fs-extra';
-import { createRequire } from 'module';
-import P from 'path';
 import isCI from "./is-ci.js";
 import packageJsonSchema from "./package-json-schema.js";
 const _require = createRequire(import.meta.url);
@@ -30,12 +30,12 @@ export default async function (options) {
     await this.depcheck();
   }
   const runDockerTests = !isCI() || !(_ref = ['win32', 'darwin'], includes(process.platform)(_ref));
-  return execa(this.packageConfig.type === 'module' ? packageName`c8` : packageName`nyc`, this.config.testRunner === 'playwright' ? ['playwright', 'test', '--pass-with-no-tests', ...(runDockerTests ? [] : ['--grep-invert', '@usesdocker']), ...(options.updateSnapshots ? ['--update-snapshots'] : []), ...(options.ui ? ['--ui'] : []), ...(options.uiHost ? ['--ui-host', options.uiHost] : []), ...(options.grep ? ['--grep', options.grep] : []), '--trace', 'retain-on-failure', ...(isCI() ? ['--forbid-only'] : []),
+  return execa(this.packageConfig.type === 'module' ? packageName`c8` : packageName`nyc`, [...(this.packageConfig.type === 'module' ? ['--exclude', 'eslint.config.js'] : []), ...(this.config.testRunner === 'playwright' ? ['playwright', 'test', '--pass-with-no-tests', ...(runDockerTests ? [] : ['--grep-invert', '@usesdocker']), ...(options.updateSnapshots ? ['--update-snapshots'] : []), ...(options.ui ? ['--ui'] : []), ...(options.uiHost ? ['--ui-host', options.uiHost] : []), ...(options.grep ? ['--grep', options.grep] : []), '--trace', 'retain-on-failure', ...(isCI() ? ['--forbid-only'] : []),
   /**
    * Reporter set to dot in CI environments by default.
    * See https://github.com/microsoft/playwright/blob/42ade54975f6990c41cddc7b6e11c46a36648d0d/packages/playwright/src/common/config.ts#L301.
    */
-  '--reporter', 'list', ...options.patterns] : ['--reporter', 'lcov', '--reporter', 'text', '--cwd', process.cwd(), '--all', '--exclude', '**/*.spec.js', '--exclude', 'coverage', '--exclude', 'tmp-*', '--exclude', 'dist', 'mocha', '--reporter', _require.resolve(packageName`mocha-spec-reporter-with-file-names`), '--ui', packageName`mocha-ui-exports-auto-describe`, '--require', packageName`@dword-design/pretest`, ...((await fs.exists(P.join('global-test-hooks.js'))) ? ['--require', 'global-test-hooks.js'] : []), '--file', _require.resolve(packageName`@dword-design/setup-test`), ...(runDockerTests ? [] : ['--ignore', '**/*.usesdocker.spec.js']), '--timeout', 130000, ...(options.patterns.length > 0 ? options.patterns : ['{,!(node_modules)/**/}*.spec.js']), ...(options.grep ? ['--grep', options.grep] : []), ...(process.platform === 'win32' ? ['--exit'] : [])], {
+  '--reporter', 'list', ...options.patterns] : ['--reporter', 'lcov', '--reporter', 'text', '--cwd', process.cwd(), '--all', '--exclude', '**/*.spec.js', '--exclude', 'coverage', '--exclude', 'tmp-*', '--exclude', 'dist', 'mocha', '--reporter', _require.resolve(packageName`mocha-spec-reporter-with-file-names`), '--ui', packageName`mocha-ui-exports-auto-describe`, '--require', packageName`@dword-design/pretest`, ...((await fs.exists(P.join('global-test-hooks.js'))) ? ['--require', 'global-test-hooks.js'] : []), '--file', _require.resolve(packageName`@dword-design/setup-test`), ...(runDockerTests ? [] : ['--ignore', '**/*.usesdocker.spec.js']), '--timeout', 130_000, ...(options.patterns.length > 0 ? options.patterns : ['{,!(node_modules)/**/}*.spec.js']), ...(options.grep ? ['--grep', options.grep] : []), ...(process.platform === 'win32' ? ['--exit'] : [])])], {
     env: {
       NODE_ENV: 'test',
       ...(this.packageConfig.type === 'module' && {

package/dist/get-depcheck-special-base/index.js

@@ -1,4 +1,4 @@
-import P from 'path';
+import P from 'node:path';
 export default name => filePath => {
   var _filePath;
   return (_filePath = filePath, P.basename(_filePath)) === 'package.json' && name !== '@dword-design/base-config-node' ? [name] : [];

package/dist/get-generated-files/__snapshots__/index.spec.js.snap

@@ -6,7 +6,6 @@ Array [
   ".commitlintrc.json",
   ".cz.json",
   ".editorconfig",
-  ".eslintrc.json",
   ".gitattributes",
   ".github/DEPRECATED_DEPENDENCIES_ISSUE_TEMPLATE.md",
   ".github/labels.yml",
@@ -22,6 +21,7 @@ Array [
   ".vscode/settings.json",
   "LICENSE.md",
   "README.md",
+  "eslint.config.js",
   "package.json",
 ]
 `;
@@ -32,7 +32,6 @@ Array [
   ".cz.json",
   ".devcontainer/devcontainer.json",
   ".editorconfig",
-  ".eslintrc.json",
   ".gitattributes",
   ".github/DEPRECATED_DEPENDENCIES_ISSUE_TEMPLATE.md",
   ".github/FUNDING.yml",
@@ -51,6 +50,7 @@ Array [
   "LICENSE.md",
   "README.md",
   "babel.config.json",
+  "eslint.config.js",
   "package.json",
 ]
 `;

package/dist/get-generated-files/common-editor-ignore.js

@@ -1 +1 @@
-export default ['babel.config.json', '.commitlintrc.json', '.cz.json', '.devcontainer', '.editorconfig', '.eslintrc.json', '.gitattributes', '.github', '.gitignore', '.gitpod.Dockerfile', '.gitpod.yml', '.husky', '.npmrc', '.nyc_output', '.releaserc.json', '.renovaterc.json', '.vscode', 'CHANGELOG.md', 'coverage', 'LICENSE.md', 'node_modules', 'pnpm-lock.yaml'];
+export default ['babel.config.json', '.commitlintrc.json', '.cz.json', '.devcontainer', '.editorconfig', 'eslint.config.js', '.gitattributes', '.github', '.gitignore', '.gitpod.Dockerfile', '.gitpod.yml', '.husky', '.npmrc', '.nyc_output', '.releaserc.json', '.renovaterc.json', '.vscode', 'CHANGELOG.md', 'coverage', 'LICENSE.md', 'node_modules', 'pnpm-lock.yaml'];

package/dist/get-generated-files/get-editor-ignore/__snapshots__/index.spec.js.snap

@@ -6,7 +6,6 @@ Array [
   ".cz.json",
   ".devcontainer",
   ".editorconfig",
-  ".eslintrc.json",
   ".gitattributes",
   ".github",
   ".gitignore",
@@ -22,6 +21,7 @@ Array [
   "LICENSE.md",
   "babel.config.json",
   "coverage",
+  "eslint.config.js",
   "foo",
   "node_modules",
   "pnpm-lock.yaml",

package/dist/get-generated-files/get-eslint/index.js

@@ -1,6 +1,18 @@
+import { endent } from '@dword-design/functions';
 import packageName from 'depcheck-package-name';
 export default function () {
-  return this.config.eslintConfig || {
-    extends: packageName`@dword-design/eslint-config`
-  };
+  return this.config.eslintConfig || endent`
+      import { defineConfig } from '${packageName`eslint`}/config';
+      import config from '${packageName`@dword-design/eslint-config`}';
+
+      export default defineConfig([
+        config,
+        {
+          files: ['eslint.config.js'],
+          rules: {
+            'import/no-extraneous-dependencies': 'off',
+          },
+        },
+      ]);\n
+    `;
 }

package/dist/get-generated-files/get-github-workflow/steps/get-test.js

@@ -1,8 +1,8 @@
+import P from 'node:path';
 import { endent, fromPairs, keys, map } from '@dword-design/functions';
 import { constantCase } from 'change-case';
 import { findUpStop, findUpSync } from 'find-up';
 import fs from 'fs-extra';
-import P from 'path';
 import gitHubAction from 'tagged-template-noop';
 export default () => {
   var _ref, _ref2, _ref3, _envVariableNames;
@@ -13,7 +13,6 @@ export default () => {
     if (fs.existsSync(P.join(path, 'package.json'))) {
       return findUpStop;
     }
-    return undefined;
   });
   const envVariableNames = (_ref = (_ref2 = envSchemaPath ? fs.readJsonSync(envSchemaPath) : {}, keys(_ref2)), map(name => {
     var _name;

package/dist/get-generated-files/get-release/index.js

@@ -3,7 +3,7 @@ export default function () {
   return {
     plugins: ['@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', packageName`@semantic-release/changelog`, this.config.npmPublish ? packageName`@semantic-release/npm` : [packageName`@semantic-release/npm`, {
       npmPublish: false
-    }], this.config.deployAssets.length ? [packageName`@semantic-release/github`, {
+    }], this.config.deployAssets.length > 0 ? [packageName`@semantic-release/github`, {
       assets: this.config.deployAssets
     }] : packageName`@semantic-release/github`, [packageName`@semantic-release/git`, {
       message: 'chore: ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}'

package/dist/get-generated-files/get-renovate/index.js

@@ -18,13 +18,13 @@ export default function () {
     rangeStrategy: 'replace',
     regexManagers: [{
       datasourceTemplate: 'github-tags',
-      fileMatch: ['\\.js$'],
+      fileMatch: [String.raw`\.js$`],
       matchStrings: [getRegexManagerString('gitHubAction', '(?<depName>.*?)@v(?<currentValue>.*?)')],
       versioningTemplate: 'npm'
     }, {
       datasourceTemplate: 'node-version',
       depNameTemplate: 'node',
-      fileMatch: ['\\.js$'],
+      fileMatch: [String.raw`\.js$`],
       matchStrings: [getRegexManagerString('nodejsVersion', '(?<currentValue>.*?)')],
       versioningTemplate: 'node'
     }],

package/dist/get-generated-files/get-vscode/__snapshots__/index.spec.js.snap

@@ -9,7 +9,6 @@ Object {
     ".cz.json": true,
     ".devcontainer": true,
     ".editorconfig": true,
-    ".eslintrc.json": true,
     ".gitattributes": true,
     ".github": true,
     ".gitignore": true,
@@ -26,6 +25,7 @@ Object {
     "babel.config.json": true,
     "bar": true,
     "coverage": true,
+    "eslint.config.js": true,
     "foo": true,
     "node_modules": true,
     "pnpm-lock.yaml": true,

package/dist/get-generated-files/index.js

@@ -14,7 +14,7 @@ import githubLabelsConfig from "./github-labels.js";
 import githubSyncLabelsConfig from "./github-sync-labels.js";
 import npmrc from "./npmrc.js";
 export default function () {
-  var _commitlintConfig, _commitizenConfig, _this$githubCodespace, _this$getEslintConfig, _githubFunding, _sortKeys, _sortKeys2, _sortKeys3, _sortKeys4, _sortKeys5, _ref, _this$getGitignoreCon, _this$getGitpodConfig, _this$getReleaseConfi, _sortKeys6, _this$getVscodeConfig, _babelConfig, _ref2, _packageConfig;
+  var _commitlintConfig, _commitizenConfig, _this$githubCodespace, _githubFunding, _sortKeys, _sortKeys2, _sortKeys3, _sortKeys4, _sortKeys5, _ref, _this$getGitignoreCon, _this$getGitpodConfig, _this$getReleaseConfi, _sortKeys6, _this$getVscodeConfig, _babelConfig, _ref2, _packageConfig;
   const packageConfig = this.getPackageConfig();
   return {
     '.commitlintrc.json': `${_commitlintConfig = commitlintConfig, jsonToString({
@@ -27,9 +27,6 @@ export default function () {
       indent: 2
     })(_this$githubCodespace)}\n`,
     '.editorconfig': editorconfigConfig,
-    '.eslintrc.json': `${_this$getEslintConfig = this.getEslintConfig(), jsonToString({
-      indent: 2
-    })(_this$getEslintConfig)}\n`,
     '.gitattributes': gitattributesConfig,
     '.github/DEPRECATED_DEPENDENCIES_ISSUE_TEMPLATE.md': deprecatedDependenciesIssueTemplate,
     '.github/FUNDING.yml': (_githubFunding = githubFunding, yaml.stringify(_githubFunding)),
@@ -68,6 +65,7 @@ export default function () {
     'babel.config.json': `${_babelConfig = babelConfig, jsonToString({
       indent: 2
     })(_babelConfig)}\n`,
+    'eslint.config.js': this.getEslintConfig(),
     'package.json': `${_ref2 = (_packageConfig = packageConfig, sortPackageJson(_packageConfig)), jsonToString({
       indent: 2
     })(_ref2)}\n`

package/dist/get-git-info/index.js

@@ -3,11 +3,11 @@ import hostedGitInfo from 'hosted-git-info';
 import parseGitConfig from 'parse-git-config';
 export default () => {
   if (!fs.existsSync('.git')) {
-    return undefined;
+    return;
   }
   const gitUrl = parseGitConfig.sync()['remote "origin"']?.url;
   if (gitUrl === undefined) {
-    return undefined;
+    return;
   }
   const gitInfo = hostedGitInfo.fromUrl(gitUrl) || {};
   if (gitInfo.type !== 'github') {

package/dist/index.js

@@ -1,3 +1,4 @@
+import P from 'node:path';
 import { endent, filter, flatMap, identity, mapValues } from '@dword-design/functions';
 import jitiBabelTransform from '@dword-design/jiti-babel-transform';
 import deepmerge from 'deepmerge';
@@ -9,7 +10,6 @@ import packageName from 'depcheck-package-name';
 import depcheckParserBabel from 'depcheck-parser-babel';
 import fs from 'fs-extra';
 import jiti from 'jiti';
-import P from 'path';
 import { transform as pluginNameToPackageName } from 'plugin-name-to-package-name';
 import checkUnknownFiles from "./commands/check-unknown-files/index.js";
 import commit from "./commands/commit/index.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base",
-  "version": "11.3.13",
+  "version": "12.0.0",
   "description": "Base package for projects.",
   "repository": "dword-design/base",
   "funding": "https://github.com/sponsors/dword-design",
@@ -27,9 +27,9 @@
     "@commitlint/cli": "^18.6.1",
     "@commitlint/config-conventional": "^18.6.3",
     "@dword-design/babel-config": "^4.2.1",
-    "@dword-design/base-config-node": "^3.0.0",
+    "@dword-design/base-config-node": "^3.0.3",
     "@dword-design/ci": "^4.0.6",
-    "@dword-design/eslint-config": "^5.0.20",
+    "@dword-design/eslint-config": "^6.0.1",
     "@dword-design/functions": "^6.0.2",
     "@dword-design/jiti-babel-transform": "^2.0.0",
     "@dword-design/personal-data": "^2.0.3",
@@ -52,8 +52,8 @@
     "depcheck-detector-package-name": "^3.0.4",
     "depcheck-package-name": "^3.0.1",
     "depcheck-parser-babel": "^3.0.57",
-    "eslint": "^8.57.1",
-    "execa": "^9.5.2",
+    "eslint": "^9.27.0",
+    "execa": "^9.5.3",
     "find-up": "^7.0.0",
     "fs-extra": "^11.3.0",
     "get-projectz-readme-section-regex": "^3.0.10",
@@ -81,10 +81,10 @@
     "spdx-license-list": "^6.10.0",
     "suppress-experimental-warnings": "^2.0.0",
     "tagged-template-noop": "^2.1.1",
-    "yaml": "^2.7.1"
+    "yaml": "^2.8.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.27.1",
+    "@babel/cli": "^7.27.2",
     "@dword-design/chdir": "^3.0.2",
     "@dword-design/dotenv-json-extended": "^2.0.25",
     "@dword-design/tester": "^2.0.19",
@@ -93,7 +93,7 @@
     "p-event": "^6.0.1",
     "renovate": "^39.264.0",
     "rimraf": "^5.0.10",
-    "sharp": "^0.34.1",
+    "sharp": "^0.34.2",
     "unify-mocha-output": "^2.0.22"
   },
   "packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39",