@storm-software/workspace-tools 1.1.0 → 1.2.0

package/src/generators/preset/files/socket.yaml

@@ -0,0 +1,20 @@
+# top level version field is required
+version: 2
+
+triggerPaths:
+  - "packages/*/package.json"
+  - "package.json"
+  - "pnpm-lock.yaml"
+  - "pnpm-workspace.yaml"
+  - "apps/*/package.json"
+  - "libs/*/package.json"
+
+projectIgnorePaths:
+  - ".github/"
+  - ".vscode/"
+  - ".verdaccio/"
+  - ".nx/"
+  - "benchmarks/"
+  - "docs/"
+  - "examples/"
+  - "test/"

package/src/generators/preset/files/tsconfig.base.json.template

@@ -1,6 +1,6 @@
 {
     "$schema": "https://json.schemastore.org/tsconfig",
-    "extends": "@storm-software/workspace-tools/config/tsconfig.root.json",
+    "extends": "@storm-software/linting-tools/tsconfig/tsconfig.root.json",
     "display": "Storm Software - <%= name %>",
     "compilerOptions": {
         "rootDir": ".",

package/src/generators/preset/generator.js

@@ -3,26 +3,42 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const path = require("path");
+const versions_1 = require("../../utils/versions");
 function default_1(tree, options) {
+    var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const projectRoot = `.`;
-        (0, devkit_1.addProjectConfiguration)(tree, options.name, {
+        (_a = options.description) !== null && _a !== void 0 ? _a : (options.description = `⚡The ${options.namespace ? options.namespace : options.name} monorepo contains utility applications, tools, and various libraries to create modern and scalable web applications.`);
+        (_b = options.namespace) !== null && _b !== void 0 ? _b : (options.namespace = options.organization);
+        (0, devkit_1.addProjectConfiguration)(tree, `@${options.namespace}/${options.name}`, {
             root: projectRoot,
             projectType: "application",
-            targets: {}
+            targets: {
+                "local-registry": {
+                    "executor": "@nx/js:verdaccio",
+                    "options": {
+                        "port": 4873,
+                        "config": ".verdaccio/config.yml",
+                        "storage": "tmp/local-registry/storage"
+                    }
+                }
+            }
         });
         (0, devkit_1.updateJson)(tree, "package.json", json => {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             json.scripts = json.scripts || {};
             json.version = "0.0.0";
             json.private = true;
             (_a = json.keywords) !== null && _a !== void 0 ? _a : (json.keywords = [
+                options.name,
+                options.namespace,
                 "storm",
                 "stormstack",
-                "storm-stack",
-                "forecast",
-                "forecast-lang",
-                "forecast-model",
+                "storm-ops",
+                "powerplant",
+                "power-plant",
+                "power-plant-lang",
+                "power-plant-model",
                 "impact",
                 "nextjs",
                 "prisma",
@@ -31,7 +47,6 @@ function default_1(tree, options) {
                 "strapi",
                 "graphql",
                 "sullivanpj",
-                "open-system",
                 "monorepo"
             ]);
             (_b = json.homepage) !== null && _b !== void 0 ? _b : (json.homepage = "https://stormsoftware.org");
@@ -45,59 +60,104 @@ function default_1(tree, options) {
                 email: "contact@stormsoftware.org",
                 url: "https://stormsoftware.org"
             });
+            (_f = json.namespace) !== null && _f !== void 0 ? _f : (json.namespace = `@${options.namespace}`);
+            (_g = json.description) !== null && _g !== void 0 ? _g : (json.description = options.description);
+            (_h = options.repositoryUrl) !== null && _h !== void 0 ? _h : (options.repositoryUrl = `https://github.com/${options.organization}/${options.name}}`);
+            (_j = json.repository) !== null && _j !== void 0 ? _j : (json.repository = {
+                type: "github",
+                url: `${options.repositoryUrl}.git`
+            });
             // generate a start script into the package.json
             json.scripts.adr = "pnpm log4brains adr new";
             json.scripts["adr-preview"] = "pnpm log4brains preview";
-            json.scripts.prepare = "pnpm prepare:husky && npx patch-package -y";
-            json.scripts["prepare:husky"] = "is-ci || husky install";
+            json.scripts.prepare = "pnpm @storm-software/git-tools/scripts/prepare.js";
             json.scripts.preinstall =
-                "pnpm @storm-software/workspace-tools/scripts/pre-install.js || npx -y only-allow pnpm";
+                "pnpm @storm-software/git-tools/scripts/pre-install.js || npx -y only-allow pnpm";
             json.scripts["install:csb"] =
                 "corepack enable && pnpm install --frozen-lockfile";
             json.scripts.clean = "rimraf dist";
             json.scripts.prebuild = "pnpm clean";
+            json.scripts["clean:tools"] = "rimraf dist/tools";
+            json.scripts["clean:docs"] = "rimraf dist/docs";
+            if (!options.includeApps) {
+                json.scripts["clean:packages"] = "rimraf dist/packages";
+            }
+            else {
+                json.scripts["clean:apps"] = "rimraf dist/apps";
+                json.scripts["clean:libs"] = "rimraf dist/libs";
+                json.scripts["clean:storybook"] = "rimraf dist/storybook";
+            }
             json.scripts.build = "nx affected -t build --parallel=5";
             json.scripts["build:all"] = "nx run-many -t build --all --parallel=5";
             json.scripts["build:production"] =
                 "nx run-many -t build --all --prod --parallel=5";
+            json.scripts["build:tools"] =
+                "nx run-many -t build --projects=tools/* --parallel=5";
+            json.scripts["build:docs"] =
+                "nx run-many -t build --projects=docs/* --parallel=5";
+            if (!options.includeApps) {
+                json.scripts["build:packages"] =
+                    "nx run-many -t build --projects=packages/* --parallel=5";
+            }
+            else {
+                json.scripts["build:apps"] =
+                    "nx run-many -t build --projects=apps/* --parallel=5";
+                json.scripts["build:libs"] =
+                    "nx run-many -t build --projects=libs/* --parallel=5";
+                json.scripts["build:storybook"] = "storybook build -s public";
+            }
             json.scripts.nx = "nx";
             json.scripts.graph = "nx graph";
             json.scripts.lint = "pnpm storm-lint all";
-            json.scripts.start = "nx serve";
-            json.scripts.test = "nx test";
-            json.scripts.e2e = "nx e2e";
-            json.scripts.format = "nx format:write && pnpm doctoc --github README.md";
+            if (options.includeApps) {
+                json.scripts.start = "nx serve";
+                json.scripts.storybook = "pnpm storybook dev -p 6006";
+            }
+            json.scripts.format = "nx format:write";
             json.scripts.help = "nx help";
             json.scripts["dep-graph"] = "nx dep-graph";
             json.scripts["local-registry"] =
                 "nx local-registry @storm-software/storm-ops";
-            json.scripts["pre-push"] =
-                "lint-staged --concurrent false --config @storm-software/linting-tools/lint-staged/config";
+            json.scripts.e2e = "nx e2e";
+            if (options.includeApps) {
+                json.scripts.test = "nx test";
+            }
+            else {
+                json.scripts.test = "nx test && pnpm test:storybook";
+                json.scripts["test:storybook"] = "pnpm test-storybook";
+            }
+            json.scripts.lint = "pnpm storm-lint all --skip-cspell";
             json.scripts.commit = "pnpm storm-git commit";
+            json.scripts.readme =
+                'pnpm storm-git readme --templates="tools/readme-templates"';
             json.scripts["api-extractor"] =
                 "nx g @storm-software/workspace-tools:api-extractor --outputPath 'docs/api-reference' --clean --no-interactive";
             json.scripts.release = "pnpm storm-git release";
-            (_f = json.packageManager) !== null && _f !== void 0 ? _f : (json.packageManager = "pnpm@8.7.4");
+            (_k = json.packageManager) !== null && _k !== void 0 ? _k : (json.packageManager = "pnpm@8.10.2");
             json.engines = {
-                node: ">=18.17.0",
-                pnpm: ">=8.7.4"
+                pnpm: `>=${versions_1.pnpmVersion}`
             };
-            json.prettier = "@storm-software/linting-tools/prettier/config";
-            json.resolutions = {
-                graphql: "^16.8.0",
-                minimist: "^1.2.6"
-            };
-            json.bundlewatch = {
-                files: [
-                    {
-                        path: "dist/*/*.js",
-                        maxSize: "200kB"
+            if (options.includeApps) {
+                json.engines.node = `>=${versions_1.nodeVersion}`;
+            }
+            (_l = json.packageManager) !== null && _l !== void 0 ? _l : (json.packageManager = "pnpm@8.10.2");
+            json.prettier = "@storm-software/linting-tools/prettier/config.json";
+            if (options.includeApps) {
+                json.bundlewatch = {
+                    files: [
+                        {
+                            path: "dist/*/*.js",
+                            maxSize: "200kB"
+                        }
+                    ],
+                    ci: {
+                        trackBranches: ["main", "alpha", "beta"]
                     }
-                ],
-                ci: {
-                    trackBranches: ["main", "alpha", "beta"]
-                }
-            };
+                };
+                json.nextBundleAnalysis = {
+                    "buildOutputDirectory": "dist/apps/web/app/.next"
+                };
+            }
             json.nx = {
                 includedScripts: ["lint", "format"]
             };
@@ -105,43 +165,57 @@ function default_1(tree, options) {
         });
         (0, devkit_1.generateFiles)(tree, path.join(__dirname, "files"), projectRoot, options);
         yield (0, devkit_1.formatFiles)(tree);
-        return (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            react: "latest",
-            nx: "latest",
-            "react-dom": "latest",
-            "react-scripts": "latest"
-        }, {
+        let dependencies = {
+            "nx": "latest",
+            "@nx/js": "latest",
+            "@nx/workspace": "latest",
+            "@nx/devkit": "latest",
+            "@nx/eslint": "latest",
+            "@nx/eslint-plugin": "latest",
+            "@nx/jest": "latest",
             "@storm-software/git-tools": "latest",
             "@storm-software/linting-tools": "latest",
             "@storm-software/workspace-tools": "latest",
             "prettier-plugin-packagejson": "latest",
             "prettier-plugin-prisma": "latest",
-            "patch-package": "latest",
-            tsup: "latest",
-            eslint: "latest",
-            "eslint-config-next": "latest",
-            "eslint-config-prettier": "latest",
-            "eslint-plugin-cypress": "latest",
-            "eslint-plugin-import": "latest",
-            "eslint-plugin-jest": "latest",
-            "eslint-plugin-jsx-a11y": "latest",
-            "eslint-plugin-react": "latest",
-            "eslint-plugin-react-hooks": "latest",
-            "eslint-plugin-storybook": "latest",
-            "nx-cloud": "latest",
-            log4brains: "latest",
-            husky: "latest",
-            prettier: "latest",
-            "is-ci": "latest",
+            "tsup": "latest",
+            "eslint": "latest",
+            "log4brains": "latest",
+            "husky": "latest",
+            "prettier": "latest",
             "lint-staged": "latest",
-            jest: "29.5.0",
-            "jest-cli": "^29.5.0",
-            "jest-environment-jsdom": "29.5.0",
-            "jest-environment-node": "^29.4.1",
-            jsdom: "~22.1.0",
+            "semantic-release": "latest",
+            "@semantic-release/changelog": "latest",
+            "@semantic-release/commit-analyzer": "latest",
+            "@semantic-release/exec": "latest",
+            "@semantic-release/git": "latest",
+            "@semantic-release/github": "latest",
+            "@semantic-release/npm": "latest",
+            "@semantic-release/release-notes-generator": "latest",
+            "jest": "latest",
+            "jest-environment-jsdom": "latest",
+            "jest-environment-node": "latest",
+            "ts-jest": "latest",
+            "ts-node": "latest",
+            "tslib": "latest",
+            "typescript": versions_1.typescriptVersion,
+            "@swc-node/register": "latest",
+            "@swc/cli": "latest",
+            "@swc/core": "latest",
+            "@swc/helpers": "latest",
             "@types/react": "latest",
-            "@types/react-dom": "latest"
-        });
+            "@types/react-dom": "latest",
+            "@types/jest": "latest",
+            "@types/node": "20.8.10",
+            "verdaccio": "latest"
+        };
+        if (options.includeApps) {
+            dependencies = Object.assign(Object.assign({}, dependencies), { "bundlewatch": "latest", "react": "latest", "react-dom": "latest", "storybook": "latest", "@storybook/addons": "latest", "@nx/react": "latest", "@nx/next": "latest", "@nx/node": "latest", "@nx/storybook": "latest" });
+        }
+        if (options.nxCloud) {
+            dependencies = Object.assign(Object.assign({}, dependencies), { "nx-cloud": "latest" });
+        }
+        return (0, devkit_1.addDependenciesToPackageJson)(tree, dependencies, {});
     });
 }
 exports.default = default_1;

package/src/generators/preset/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/preset/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace-tools/src/generators/preset/generator.ts"],"names":[],"mappings":"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"}

package/src/generators/preset/schema.d.ts

@@ -1,3 +1,11 @@
+export type NxClientMode = "light" | "dark";
 export interface PresetGeneratorSchema {
   name: string;
+  organization: string;
+  includeApps: boolean;
+  namespace?: string;
+  description?: string;
+  repositoryUrl?: string;
+  nxCloud: boolean;
+  mode: NxClientMode;
 }

package/src/generators/preset/schema.json

@@ -2,17 +2,101 @@
   "$schema": "http://json-schema.org/schema",
   "$id": "Preset",
   "title": "Storm Workspace preset",
+  "description": "Storm workspace preset generator",
   "type": "object",
+  "example": [
+    {
+      "command": "nx g @storm-software/workspace-tools:preset --name 'example-repo'",
+      "description": "Generate a storm workspace with the name: example-repo, namespace: storm-software, organization: storm-software, and repositoryUrl: 'https://github.com/storm-software/example-repo'."
+    },
+
+    {
+      "command": "nx g @storm-software/workspace-tools:preset --name 'example-repo' --namespace 'example'",
+      "description": "Generate a storm workspace with the name: example-repo, namespace: example, and repositoryUrl: 'https://github.com/storm-software/example-repo'."
+    },
+    {
+      "command": "nx g @storm-software/workspace-tools:preset --name 'example-repo' --namespace 'example' --organization 'example-org' --description 'An example workspace'",
+      "description": "Generate a storm workspace with the name: example-repo, namespace: example, organization: example-org, description: 'An example workspace', and repositoryUrl: 'https://github.com/example-org/example-repo'."
+    }
+  ],
   "properties": {
     "name": {
       "type": "string",
-      "description": "",
+      "description": "The name of the workspace root.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
       "x-prompt": "What name would you like to use?"
+    },
+    "organization": {
+      "type": "string",
+      "description": "The organization that owns the workspace.",
+      "default": "storm-software",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      },
+      "x-prompt": "What organization owns this repository?"
+    },
+    "namespace": {
+      "type": "string",
+      "description": "The npm scope used for the workspace. Defaults to the organization name.",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "x-prompt": "What namespace (npm scope) would you like to use? Defaults to the organization name."
+    },
+    "includeApps": {
+      "type": "boolean",
+      "description": "Should a separate `apps` folder be created for this workspace (if Yes: `apps` and `libs` folders will be added, if No: `packages` folders will be added)?",
+      "default": false,
+      "$default": {
+        "$source": "argv",
+        "index": 3
+      },
+      "x-prompt": "Is the workspace a purely package based repository (one large packages folder) or does it include apps (split between apps and libs folders)?"
+    },
+    "description": {
+      "type": "string",
+      "description": "The description of the workspace to use in the package.json and README.md files.",
+      "$default": {
+        "$source": "argv",
+        "index": 4
+      },
+      "x-prompt": "Provide a description of the workspace to use in the package.json and README.md files."
+    },
+    "repositoryUrl": {
+      "type": "string",
+      "description": "The URL of the workspace in GitHub. Defaults to the https://github.com/<organization>/<name>",
+      "$default": {
+        "$source": "argv",
+        "index": 5
+      },
+      "x-prompt": "What is the workspace's GitHub repository URL?"
+    },
+    "nxCloud": {
+      "type": "boolean",
+      "description": "Should distributed caching with Nx Cloud be enabled for the workspace?",
+      "default": false,
+      "$default": {
+        "$source": "argv",
+        "index": 6
+      },
+      "x-prompt": "Should distributed caching with Nx Cloud be enabled for the workspace?"
+    },
+    "mode": {
+      "type": "string",
+      "description": "Which client mode should be used for the Nx Task Runner?",
+      "default": "dark",
+      "enum": ["light", "dark"],
+      "$default": {
+        "$source": "argv",
+        "index": 7
+      },
+      "x-prompt": "Which client mode should be used for the Nx Task Runner?"
     }
   },
-  "required": ["name"]
+  "required": ["name", "organization", "includeApps", "nxCloud", "mode"]
 }

package/src/utils/versions.d.ts

@@ -9,9 +9,12 @@ export declare const swcCoreVersion = "~1.3.95";
 export declare const swcHelpersVersion = "~0.5.3";
 export declare const swcNodeVersion = "1.6.8";
 export declare const tsLibVersion = "2.6.2";
-export declare const typesNodeVersion = "20.8.10";
+export declare const typesNodeVersion = "20.9.0";
 export declare const verdaccioVersion = "5.27.0";
 export declare const typescriptVersion = "~5.2.2";
 export declare const eslintVersion = "~8.53.0";
 export declare const lintStagedVersion = "15.0.2";
 export declare const semanticReleaseVersion = "22.0.7";
+
+export declare const nodeVersion = "20.9.0";
+export declare const pnpmVersion = "8.10.2";

package/src/generators/preset/files/.alexignore

@@ -1,4 +0,0 @@
-# `node_modules` is ignored by default
-
-**/CODE_OF_CONDUCT.md
-

package/src/generators/preset/files/.alexrc

@@ -1,39 +0,0 @@
-{
-  "allow": [
-    "attacks",
-    "color",
-    "dead",
-    "execute",
-    "executed",
-    "executes",
-    "execution",
-    "executions",
-    "failed",
-    "failure",
-    "failures",
-    "fire",
-    "fires",
-    "firing",
-    "hook",
-    "hooks",
-    "host-hostess",
-    "invalid",
-    "remains",
-    "special",
-    "white",
-    "just",
-    "easy",
-    "easily",
-    "simple",
-    "colors",
-    "clearly",
-    "obvious",
-    "pros",
-    "blind",
-    "xxx",
-    "tinker",
-    "reject",
-    "terror",
-    "Primitive"
-  ]
-}

package/src/generators/preset/files/.github/workflows/ci.yml

@@ -1,131 +0,0 @@
-name: "CI/CD"
-
-on:
-  workflow_dispatch:
-    inputs:
-      tag:
-        description: override release tag
-        required: false
-  push:
-    branches:
-      - "main"
-      - "alpha"
-      - "beta"
-
-env:
-  CI: true
-  NX_DAEMON: false
-  NX_VERBOSE_LOGGING: true
-  NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
-  NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }}
-  GITHUB_ACTOR: "🤖 Storm Bot"
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  build-and-release:
-    if: github.repository == 'storm-software/<%= name %>' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/alpha' || github.ref == 'refs/heads/beta')
-    name: "Build & Release"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: configure git
-        run: |
-          git config user.name "${GITHUB_ACTOR}"
-          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 8
-
-      - uses: actions/setup-node@v3
-        with:
-          registry-url: https://registry.npmjs.org/
-          node-version-file: .github/.nvmrc
-          cache: pnpm
-          cache-dependency-path: pnpm-lock.yaml
-
-      - name: Install Dependencies
-        run: pnpm ci
-
-      - name: Get appropriate base and head commits for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
-        with:
-          main-branch-name: "main"
-
-      - name: Set appropriate base and head commits for `nx affected` commands
-        run: |
-          echo "BASE: ${{ env.NX_BASE }}"
-          echo "HEAD: ${{ env.NX_HEAD }}"
-
-      #- name: Prepare for build
-      #  run: pnpm build
-
-      - name: Build repository packages
-        run: pnpm build --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
-
-      #- name: Run Linters
-      #  run: pnpm nx affected -t lint --parallel=3 --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
-
-      - name: Run Formatters
-        run: pnpm nx format
-
-      # - run: npx nx affected -t lint --parallel=3
-      # - run: npx nx affected -t test --parallel=3 --configuration=ci --base=${{ github.event.before }}
-
-      #  run: pnpm nx affected -t build --parallel=5 --exclude="core-server-cloudflare,worker-*" --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
-      #  run: pnpm nx affected -t build --parallel=3 --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
-
-      #- name: Run Tests
-      #  uses: nick-fields/retry@v2.8.3
-      #  with:
-      #    command: npx nx affected -t test --parallel=3 --configuration=ci --base=${{ github.event.before }}
-      #    timeout_minutes: 10
-      #    max_attempts: 3
-
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-
-      - name: Release Library Version Updates
-        run: npx nx affected -t semantic-release --parallel=3 --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
-
-      #- name: Release Repository Version Updates
-      #  run: pnpm nx run-many --target=semantic-release --parallel=false
-
-      - name: Create Pull Request
-        uses: repo-sync/pull-request@v2
-        with:
-          destination_branch: main
-          pr_title: "chore(repo): Github CI/CD automated updates"
-          pr_body: "This changeset is the result of updates made in the repository's files via the CI/CD pipeline automatically. The changes include linting, formatting, and version updates."
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-
-      # - name: Publish
-      #  run: |
-      #    git config --global user.name 'Pat Sullivan'
-      #    git config --global user.email 'sullivanpj@users.noreply.github.com'
-      #    npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-      #    npm run cipublish
-      #  env:
-      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #    GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #    NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-      #    NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      #    TAG: ${{ inputs.tag }}
-
-      #- name: Release Library Version Updates
-      #  run: npx nx affected -t semantic-release --parallel=3 --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }}
-      #  env:
-      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      #- name: Release Repository Version Updates
-      #  run: npm run semantic-release
-      #  env:
-      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # - name: Build Latest Documentation
-      #  run: npx nx run docs:build