aberlaas 2.5.0 → 2.7.0

package/bin/aberlaas.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import aberlaas from '../main.js';
+
 (async () => {
   await aberlaas.run(process.argv.slice(2));
 })();

package/commands/ci/index.js

@@ -1,8 +1,7 @@
 import ciInfo from 'ci-info';
-import run from 'firost/run.js';
+import { consoleInfo, run } from 'firost';
 import commandTest from '../test/index.js';
 import commandLint from '../lint/index.js';
-import consoleInfo from 'firost/consoleInfo.js';
 
 export default {
   /**

package/commands/compress/index.js

@@ -1,7 +1,5 @@
-import _ from 'golgoth/lodash.js';
-import pMap from 'golgoth/pMap.js';
-import consoleError from 'firost/consoleError.js';
-import firostError from 'firost/error.js';
+import { _, pMap } from 'golgoth';
+import { consoleError, firostError } from 'firost';
 import compressPng from './png.js';
 import compressDummy from './dummy.js';
 

package/commands/compress/png.js

@@ -1,8 +1,6 @@
+import { _ } from 'golgoth';
+import { firostError, run, which } from 'firost';
 import helper from '../../helper.js';
-import _ from 'golgoth/lodash.js';
-import run from 'firost/run.js';
-import which from 'firost/which.js';
-import firostError from 'firost/error.js';
 
 export default {
   /**

package/commands/init/index.js

@@ -1,18 +1,21 @@
-import _ from 'golgoth/lodash.js';
-import isFile from 'firost/isFile.js';
-import copy from 'firost/copy.js';
-import move from 'firost/move.js';
-import readJson from 'firost/readJson.js';
-import writeJson from 'firost/writeJson.js';
-import firostError from 'firost/error.js';
-import read from 'firost/read.js';
-import write from 'firost/write.js';
-import run from 'firost/run.js';
-import spinner from 'firost/spinner.js';
+import { _ } from 'golgoth';
+import {
+  consoleInfo,
+  copy,
+  firostError,
+  isFile,
+  move,
+  read,
+  readJson,
+  run,
+  spinner,
+  write,
+  writeJson,
+} from 'firost';
+
+import Gilmore from 'gilmore';
 import helper from '../../helper.js';
 import nodeConfig from '../../configs/node.cjs';
-import consoleInfo from 'firost/consoleInfo.js';
-import Gilmore from 'gilmore';
 
 export default {
   /**

package/commands/lint/circleci.js

@@ -1,10 +1,7 @@
+import ciInfo from 'ci-info';
+import { exists, firostError, run, which } from 'firost';
 import helper from '../../helper.js';
 import lintYml from './yml.js';
-import ciInfo from 'ci-info';
-import exists from 'firost/exists.js';
-import run from 'firost/run.js';
-import which from 'firost/which.js';
-import firostError from 'firost/error.js';
 
 export default {
   configPath: '.circleci/config.yml',

package/commands/lint/css.js

@@ -1,8 +1,8 @@
+import stylelint from 'stylelint';
+import { _ } from 'golgoth';
+import { firostError, firostImport } from 'firost';
 import helper from '../../helper.js';
 import { fix as prettierFix } from './helpers/prettier.js';
-import stylelint from 'stylelint';
-import _ from 'golgoth/lodash.js';
-import firostError from 'firost/error.js';
 
 export default {
   /**
@@ -39,7 +39,7 @@ export default {
       'stylelint.config.js',
       'configs/stylelint.js',
     );
-    const config = await helper.import(configFile);
+    const config = await firostImport(configFile);
 
     const result = await stylelint.lint({
       config,

package/commands/lint/helpers/prettier.js

@@ -1,10 +1,7 @@
 import * as prettier from 'prettier';
+import { firostError, read, write } from 'firost';
+import { _, pMap } from 'golgoth';
 import helper from '../../../helper.js';
-import firostError from 'firost/error.js';
-import write from 'firost/write.js';
-import read from 'firost/read.js';
-import pMap from 'golgoth/pMap.js';
-import _ from 'golgoth/lodash.js';
 
 /**
  * Fix all files using prettier

package/commands/lint/index.js

@@ -1,7 +1,5 @@
-import _ from 'golgoth/lodash.js';
-import pMap from 'golgoth/pMap.js';
-import consoleError from 'firost/consoleError.js';
-import firostError from 'firost/error.js';
+import { _, pMap } from 'golgoth';
+import { consoleError, firostError } from 'firost';
 import linterCircleCI from './circleci.js';
 import linterCss from './css.js';
 import linterJson from './json.js';

package/commands/lint/js.js

@@ -1,7 +1,7 @@
-import helper from '../../helper.js';
-import _ from 'golgoth/lodash.js';
-import firostError from 'firost/error.js';
+import { _ } from 'golgoth';
+import { firostError } from 'firost';
 import { ESLint } from 'eslint';
+import helper from '../../helper.js';
 
 export default {
   /**

package/commands/lint/json.js

@@ -1,10 +1,8 @@
+import path from 'path';
+import { _, pMap } from 'golgoth';
+import { firostError, read } from 'firost';
 import helper from '../../helper.js';
 import { fix as prettierFix } from './helpers/prettier.js';
-import path from 'path';
-import _ from 'golgoth/lodash.js';
-import pMap from 'golgoth/pMap.js';
-import firostError from 'firost/error.js';
-import read from 'firost/read.js';
 
 export default {
   /**

package/commands/lint/yml.js

@@ -1,11 +1,9 @@
+import path from 'path';
+import { firostError, read } from 'firost';
+import { _, pMap } from 'golgoth';
+import yamlLint from 'yaml-lint';
 import helper from '../../helper.js';
 import { fix as prettierFix } from './helpers/prettier.js';
-import firostError from 'firost/error.js';
-import read from 'firost/read.js';
-import _ from 'golgoth/lodash.js';
-import pMap from 'golgoth/pMap.js';
-import yamlLint from 'yaml-lint';
-import path from 'path';
 
 export default {
   /**

package/commands/precommit/index.js

@@ -1,5 +1,5 @@
 import lintStaged from 'lint-staged';
-import firostError from 'firost/error.js';
+import { firostError, firostImport } from 'firost';
 import helper from '../../helper.js';
 
 export default {
@@ -10,7 +10,7 @@ export default {
       'lintstaged.config.js',
       'configs/lintstaged.js',
     );
-    const config = await helper.import(configPath);
+    const config = await firostImport(configPath);
 
     try {
       const result = await lintStaged({

package/commands/readme/index.js

@@ -1,14 +1,8 @@
-import helper from '../../helper.js';
-import _ from 'golgoth/lodash.js';
-import pMap from 'golgoth/pMap.js';
-import readJson from 'firost/readJson.js';
-import read from 'firost/read.js';
-import write from 'firost/write.js';
-import glob from 'firost/glob.js';
-import exists from 'firost/exists.js';
 import path from 'path';
+import { _, dedent, pMap } from 'golgoth';
+import { exists, glob, read, readJson, write } from 'firost';
 import frontMatter from 'front-matter';
-import dedent from 'golgoth/dedent.js';
+import helper from '../../helper.js';
 
 export default {
   /**

package/commands/setup/circleci.js

@@ -1,9 +1,7 @@
-import githubHelper from './helpers/github.js';
+import { _ } from 'golgoth';
+import { consoleError, consoleInfo, consoleSuccess } from 'firost';
 import circleCiHelper from './helpers/circleci.js';
-import _ from 'golgoth/lodash.js';
-import consoleInfo from 'firost/consoleInfo.js';
-import consoleSuccess from 'firost/consoleSuccess.js';
-import consoleError from 'firost/consoleError.js';
+import githubHelper from './helpers/github.js';
 
 export default {
   /**

package/commands/setup/github.js

@@ -1,6 +1,5 @@
+import { consoleError, consoleSuccess } from 'firost';
 import githubHelper from './helpers/github.js';
-import consoleSuccess from 'firost/consoleSuccess.js';
-import consoleError from 'firost/consoleError.js';
 
 export default {
   /**

package/commands/setup/helpers/circleci.js

@@ -1,6 +1,5 @@
-import got from 'golgoth/got.js';
-import _ from 'golgoth/lodash.js';
-import firostError from 'firost/error.js';
+import { _, got } from 'golgoth';
+import { firostError } from 'firost';
 
 export default {
   /**

package/commands/setup/helpers/github.js

@@ -1,7 +1,7 @@
-import run from 'firost/run.js';
+import { run } from 'firost';
 import { Octokit } from '@octokit/rest';
 import parseGithubUrl from 'parse-github-repo-url';
-import _ from 'golgoth/lodash.js';
+import { _ } from 'golgoth';
 
 export default {
   /**

package/commands/setup/helpers/ssh.js

@@ -1,12 +1,8 @@
+import path from 'path';
+import { _ } from 'golgoth';
+import { exists, mkdirp, read, run, which } from 'firost';
 import helper from '../../../helper.js';
 import githubHelper from './github.js';
-import _ from 'golgoth/lodash.js';
-import which from 'firost/which.js';
-import exists from 'firost/exists.js';
-import read from 'firost/read.js';
-import run from 'firost/run.js';
-import mkdirp from 'firost/mkdirp.js';
-import path from 'path';
 
 export default {
   /**

package/commands/setup/index.js

@@ -1,7 +1,7 @@
+import { _ } from 'golgoth';
 import github from './github.js';
 import circleci from './circleci.js';
 import renovate from './renovate.js';
-import _ from 'golgoth/lodash.js';
 
 export default {
   /**

package/commands/setup/renovate.js

@@ -1,6 +1,5 @@
+import { consoleError, consoleSuccess } from 'firost';
 import githubHelper from './helpers/github.js';
-import consoleSuccess from 'firost/consoleSuccess.js';
-import consoleError from 'firost/consoleError.js';
 
 export default {
   renovateId: 2471197,

package/commands/test/index.js

@@ -1,7 +1,7 @@
 import { createVitest, registerConsoleShortcuts } from 'vitest/node';
+import { firostError, firostImport } from 'firost';
+import { _ } from 'golgoth';
 import helper from '../../helper.js';
-import firostError from 'firost/error.js';
-import _ from 'golgoth/lodash.js';
 
 export default {
   /**
@@ -60,7 +60,7 @@ export default {
       'vite.config.js',
       'configs/vite.js',
     );
-    const optionsFromConfig = (await helper.import(configFile)).test;
+    const optionsFromConfig = (await firostImport(configFile)).test;
 
     // Enhancing options with custom CLI arguments
     const optionsFromAberlaas = {

package/configs/eslint.cjs

@@ -1,16 +1,10 @@
 // Note: ESLint doesn't support ESM configuration as of 2024-02-19. This file
 // needs to stay as a CommonJS file
 const nodeConfig = require('./node.cjs');
+
 module.exports = {
-  env: {
-    browser: true,
-    es2023: true,
-    node: true,
-  },
-  parserOptions: {
-    sourceType: 'module',
-    ecmaVersion: 'latest',
-  },
+  env: { browser: true, es2023: true, node: true },
+  parserOptions: { sourceType: 'module', ecmaVersion: 'latest' },
   extends: [
     'eslint:recommended',
     'plugin:n/recommended',
@@ -29,9 +23,7 @@ module.exports = {
     // https://github.com/import-js/eslint-plugin-import/issues/2430)
     // we manually define the most common extensions
     'import/resolver': {
-      node: {
-        extensions: ['.js', '.cjs', '.mjs', '.d.ts'],
-      },
+      node: { extensions: ['.js', '.cjs', '.mjs', '.d.ts'] },
     },
   },
   plugins: ['jsdoc', 'prettier'],
@@ -69,10 +61,7 @@ module.exports = {
     ],
     'no-unused-vars': [
       'error',
-      {
-        argsIgnorePattern: '^_.',
-        varsIgnorePattern: '^_.',
-      },
+      { argsIgnorePattern: '^_.', varsIgnorePattern: '^_.' },
     ],
     'no-shadow': ['error'],
     'object-shorthand': ['error', 'always'],
@@ -80,15 +69,21 @@ module.exports = {
     // https://github.com/prettier/prettier/issues/6064 is fixed
     'quote-props': ['error', 'as-needed'],
     quotes: ['error', 'single', { avoidEscape: true }],
+    // Used to sort the members inside an import statement
+    // Example:
+    // import { foo, bar } from 'something';
+    // => import { bar, foo } from 'something'
+    'sort-imports': ['error', { ignoreDeclarationSort: true }],
     // Node
     'n/no-unsupported-features/es-syntax': [
       'error',
-      {
-        version: `>=${nodeConfig.nodeVersion}`,
-      },
+      { version: `>=${nodeConfig.nodeVersion}` },
     ],
     // Import
+    'import/first': ['error'],
     'import/no-cycle': ['error'],
+    'import/order': ['error'],
+    'import/newline-after-import': ['error'],
     // JSDoc
     'jsdoc/check-param-names': ['warn'],
     'jsdoc/check-types': ['warn'],
@@ -114,9 +109,7 @@ module.exports = {
     // Vitest
     {
       files: ['**/__tests__/**/*.js'],
-      env: {
-        'vitest-globals/env': true,
-      },
+      env: { 'vitest-globals/env': true },
       globals: {
         // Test name
         testName: false,
@@ -136,22 +129,10 @@ module.exports = {
       rules: {
         'no-restricted-globals': [
           'error',
-          {
-            name: 'fit',
-            message: 'No focused test',
-          },
-          {
-            name: 'fdescribe',
-            message: 'No focused tests',
-          },
-          {
-            name: 'xit',
-            message: 'No skipped test',
-          },
-          {
-            name: 'xdescribe',
-            message: 'No skipped tests',
-          },
+          { name: 'fit', message: 'No focused test' },
+          { name: 'fdescribe', message: 'No focused tests' },
+          { name: 'xit', message: 'No skipped test' },
+          { name: 'xdescribe', message: 'No skipped tests' },
         ],
         'vitest/consistent-test-it': ['warn', { fn: 'it' }],
         // Disabling vitest/no-identical-title
@@ -163,11 +144,6 @@ module.exports = {
     },
     // no-process-exit
     // We need to send clear exit codes in yarn run scripts
-    {
-      files: ['**/scripts/**/*.js'],
-      rules: {
-        'no-process-exit': ['off'],
-      },
-    },
+    { files: ['**/scripts/**/*.js'], rules: { 'no-process-exit': ['off'] } },
   ],
 };

package/configs/vite/test/setupFiles/captureOutput.js

@@ -1,4 +1,4 @@
 // We make captureOutput publicly available inside of tests
-import captureOutput from 'firost/captureOutput.js';
+import { captureOutput } from 'firost';
 
 globalThis.captureOutput = captureOutput;

package/configs/vite.js

@@ -1,4 +1,5 @@
 import { configDefaults, defineConfig } from 'vitest/config';
+
 const configDir = new URL('./vite/', import.meta.url).pathname;
 
 export default defineConfig({

package/helper.js

@@ -1,9 +1,8 @@
 import path from 'path';
-import _ from 'golgoth/lodash.js';
-import glob from 'firost/glob.js';
-import exists from 'firost/exists.js';
-import findUp from 'find-up';
 import * as url from 'url';
+import { _ } from 'golgoth';
+import { glob } from 'firost';
+import findUp from 'find-up';
 
 export default {
   /**
@@ -113,54 +112,4 @@ export default {
     // Fallback on default config in aberlaas
     return this.aberlaasPath(aberlaasPath);
   },
-
-  /**
-   * Returns path to a specific binary.
-   *
-   * Knowing the path to a specific binary is not trivial:
-   * - Aberlaas dependencies should be in node_modules/aberlaas/.bin
-   * - Host dependencies should be in node_modules/.bin
-   *
-   * There are some special cases:
-   * - If both aberlaas and host use the same dependency version, it will be
-   *   hoisted to the host
-   * - If they use different versions, priority should be given to the one in
-   *   aberlaas
-   * - Mono-repo setup and yarn link will move dependencies out of
-   *   node_modules/.bin
-   *
-   * For those reasons, we defer to running yarn bin to get the exact path to
-   * the binary, and check in order of importance in aberlaas first, and then in
-   * the host
-   *
-   * @param {string} bin Binary name
-   * @returns {string} Path to the binary
-   **/
-  async which(bin) {
-    const binaryPathSuffix = `./node_modules/.bin/${bin}`;
-    const pathsToTest = [
-      this.aberlaasPath(binaryPathSuffix),
-      this.hostPath(binaryPathSuffix),
-    ];
-
-    for (const binaryPath of pathsToTest) {
-      if (await exists(binaryPath)) {
-        return binaryPath;
-      }
-    }
-    return false;
-  },
-  /**
-   * Dynamically import a file
-   * This is a wrapper around the default import, but bypasses the cache
-   * It makes sure importing a file several times always loads the last version
-   * TODO: This should probably be moved in firost once firost is moved to ESM
-   * @param {string} filepath Path to the file to load
-   * @returns {object} Content of the loaded file
-   **/
-  async import(filepath) {
-    const content = await import(`${filepath}?cacheBusting=${Date.now()}`);
-
-    return content.default || content;
-  },
 };

package/main.js

@@ -1,10 +1,7 @@
-import minimist from 'minimist';
-import consoleError from 'firost/consoleError.js';
-import exit from 'firost/exit.js';
-import env from 'firost/env.js';
-import absolute from 'firost/absolute.js';
-import _ from 'golgoth/lodash.js';
 import path from 'path';
+import minimist from 'minimist';
+import { absolute, consoleError, env, exit } from 'firost';
+import { _ } from 'golgoth';
 import commandCi from './commands/ci/index.js';
 import commandCompress from './commands/compress/index.js';
 import commandInit from './commands/init/index.js';

package/package.json

@@ -2,7 +2,7 @@
   "name": "aberlaas",
   "type": "module",
   "description": "Scaffold your JavaScript projects with tests, lint and release scripts",
-  "version": "2.5.0",
+  "version": "2.7.0",
   "repository": "pixelastic/aberlaas",
   "homepage": "https://projects.pixelastic.com/aberlaas/",
   "author": "Tim Carry (@pixelastic)",
@@ -43,10 +43,10 @@
     "eslint-plugin-jsdoc": "46.10.1",
     "eslint-plugin-n": "16.6.2",
     "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-vitest": "0.3.22",
-    "eslint-plugin-vitest-globals": "1.4.0",
+    "eslint-plugin-vitest": "0.4.1",
+    "eslint-plugin-vitest-globals": "1.5.0",
     "find-up": "5.0.0",
-    "firost": "3.1.0",
+    "firost": "3.5.0",
     "front-matter": "4.0.2",
     "gilmore": "0.2.0",
     "golgoth": "2.1.0",
@@ -58,7 +58,7 @@
     "prettier": "3.2.5",
     "std-mocks": "1.0.1",
     "stylelint": "13.13.1",
-    "vitest": "1.3.1",
+    "vitest": "1.4.0",
     "yaml-lint": "1.7.0"
   },
   "engines": {
@@ -77,5 +77,5 @@
     "lint:fix": "ABERLAAS_CWD=$INIT_CWD yarn g:lint:fix",
     "postinstall": "./scripts/postinstall"
   },
-  "gitHead": "d8c221450f847e80e4b86783b9291f3e02239a45"
+  "gitHead": "901e0aff17a63a548edcba92d984c8610d6e4362"
 }

package/templates/lintstaged.config.js

@@ -1,4 +1,5 @@
 import config from 'aberlaas/configs/lintstaged';
+
 export default {
   ...config,
 };

package/templates/prettier.config.js

@@ -1,4 +1,5 @@
 import config from 'aberlaas/configs/prettier';
+
 export default {
   ...config,
 };

package/templates/scripts/lib/test

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -e
 
-aberlaas test "${@:-./lib}"
+cd ./lib
+aberlaas test "$@"

package/templates/scripts/lib/test-watch

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 set -e
 
-aberlaas test --watch "${@:-./lib}"
+cd ./lib
+aberlaas test --watch "$@"

package/templates/stylelint.config.js

@@ -1,4 +1,5 @@
 import config from 'aberlaas/configs/stylelint';
+
 export default {
   ...config,
 };

package/templates/vite.config.js

@@ -1,4 +1,5 @@
 import config from 'aberlaas/configs/vite';
+
 export default {
   ...config,
 };