aberlaas-ci 2.19.0 → 2.20.1

package/lib/main.js

@@ -1,9 +1,44 @@
+import { consoleInfo, firostError, run as firostRun } from 'firost';
+import { yarnRun } from 'aberlaas-helper';
 import ciInfo from 'ci-info';
-import { firostError, run } from 'firost';
-import commandTest from 'aberlaas-test';
-import commandLint from 'aberlaas-lint';
 
-export default {
+export let __;
+
+/**
+ * Run CI scripts and fail the job if any fails
+ * Runs lint and test by default, but can be changed with --no-test and
+ * --no-lint
+ * @param {object} cliArgs CLI Argument object, as created by minimist
+ * @returns {boolean} True on success, throws on error
+ */
+export async function run(cliArgs = {}) {
+  const args = {
+    test: true,
+    lint: true,
+    ...cliArgs,
+  };
+
+  if (!__.isCI()) {
+    throw firostError(
+      'ABERLAAS_CI_NOT_CI_ENVIRONMENT',
+      'Current system is not a CI. Use CI=1 to force',
+    );
+  }
+
+  await __.displayVersions();
+
+  if (args.test) {
+    await __.yarnRunTest();
+  }
+
+  if (args.lint) {
+    await __.yarnRunLint();
+  }
+
+  return true;
+}
+
+__ = {
   /**
    * Checks if currently running on a CI server
    * @returns {boolean} True if on a CI server
@@ -12,37 +47,45 @@ export default {
     return ciInfo.isCI;
   },
   /**
-   * Run CI scripts and fail the job if any fails
-   * Runs lint and test by default, but can be changed with --no-test and
-   * --no-lint
-   * @param {object} cliArgs CLI Argument object, as created by minimist
-   * @returns {boolean} True on success, throws on error
+   * Displays the current versions of Node.js and Yarn by executing version commands
    */
-  async run(cliArgs = {}) {
-    const args = {
-      test: true,
-      lint: true,
-      ...cliArgs,
-    };
-
-    if (!this.isCI()) {
-      throw firostError(
-        'ERROR_CI',
-        'Current system is not a CI. Use CI=1 to force',
-      );
-    }
-
-    if (args.test) {
-      await this.__runTest();
-    }
-
-    if (args.lint) {
-      await this.__runLint();
-    }
-
+  async displayVersions() {
+    const nodeVersion = await __.runCommand('node --version');
+    const yarnVersion = await __.runCommand('yarn --version');
+    __.consoleInfo(`node ${nodeVersion}, yarn ${yarnVersion}`);
+  },
+  /**
+   * Executes a command asynchronously and returns the stdout output
+   * @param {string} command - The command to execute
+   * @returns {string} The stdout output of the executed command
+   */
+  async runCommand(command) {
+    const { stdout } = await __.firostRun(command, {
+      stdout: false,
+    });
+    return stdout;
+  },
+  /**
+   * Runs the test suite via yarn run test
+   * @returns {boolean} True on success
+   */
+  async yarnRunTest() {
+    await __.yarnRun('test');
     return true;
   },
-  __runTest: commandTest.run.bind(commandTest),
-  __runLint: commandLint.run.bind(commandLint),
-  __run: run,
+  /**
+   * Runs linting via yarn run lint
+   * @returns {boolean} True on success
+   */
+  async yarnRunLint() {
+    await __.yarnRun('lint');
+    return true;
+  },
+  consoleInfo,
+  firostRun,
+  yarnRun,
+};
+
+export default {
+  run,
 };

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "aberlaas-ci",
   "type": "module",
+  "sideEffects": false,
   "description": "aberlaas ci command: Run tests and lint on each commit on the CI",
-  "version": "2.19.0",
+  "version": "2.20.1",
   "repository": "pixelastic/aberlaas",
   "homepage": "https://projects.pixelastic.com/aberlaas/",
   "author": "Tim Carry (@pixelastic)",
@@ -17,26 +18,22 @@
   "engines": {
     "node": ">=18.18.0"
   },
-  "scripts": {
-    "build": "../../scripts/local/build",
-    "build:prod": "../../scripts/local/build-prod",
-    "cms": "../../scripts/local/cms",
-    "serve": "../../scripts/local/serve",
-    "ci": "../../scripts/local/ci",
-    "release": "../../scripts/local/release",
-    "update-dependencies": "node ../../scripts/meta/update-dependencies.js",
-    "test:meta": "../../scripts/local/test-meta",
-    "test": "../../scripts/local/test",
-    "test:": "../../scripts/local/test-",
-    "compress": "../../scripts/local/compress",
-    "lint": "../../scripts/local/lint",
-    "lint:fix": "../../scripts/local/lint-fix"
-  },
   "dependencies": {
-    "aberlaas-lint": "^2.19.0",
-    "aberlaas-test": "^2.18.1",
-    "ci-info": "4.1.0",
-    "firost": "5.2.1"
+    "aberlaas-helper": "workspace:*",
+    "ci-info": "4.3.1",
+    "firost": "5.5.1"
   },
-  "gitHead": "11175e8d126f535dc73a3aa942acd79f450d74c4"
+  "scripts": {
+    "build": "cd ../docs && yarn run build",
+    "build:prod": "cd ../docs && yarn run build:prod",
+    "cms": "cd ../docs && yarn run cms",
+    "serve": "cd ../docs && yarn run serve",
+    "release": "cd ../.. && ./scripts/release",
+    "test:meta": "cd ../.. && ./scripts/test-meta",
+    "test": "cd ../.. && ./scripts/test",
+    "test:watch": "cd ../.. && ./scripts/test-watch",
+    "compress": "cd ../.. && ./scripts/compress",
+    "lint": "cd ../.. && ./scripts/lint",
+    "lint:fix": "cd ../.. && ./scripts/lint-fix"
+  }
 }