@storm-software/workspace-tools 1.90.1 → 1.105.1

package/src/plugins/rust/index.js

@@ -26,9 +26,9 @@ __export(rust_exports, {
 module.exports = __toCommonJS(rust_exports);
 
 // packages/workspace-tools/src/plugins/rust/cargo-toml.ts
-var import_devkit2 = require("@nx/devkit");
-var import_project_graph = require("nx/src/config/project-graph");
 var import_node_path2 = require("node:path");
+var import_project_graph = require("nx/src/config/project-graph");
+var import_devkit2 = require("@nx/devkit");
 
 // packages/workspace-tools/src/utils/cargo.ts
 var import_node_path = require("node:path");
@@ -98,34 +98,67 @@ var createNodes = [
       if (!isExternal(cargoPackage, ctx.workspaceRoot)) {
         const root = (0, import_node_path2.dirname)(cargoFile);
         const targets = {
+          "lint-ls": {
+            cache: true,
+            inputs: ["config_linting", "rust", "^production"],
+            dependsOn: ["^lint-ls"]
+          },
           lint: {
             cache: true,
-            inputs: ["default", "^production"],
-            dependsOn: ["^lint"],
+            inputs: ["config_linting", "rust", "^production"],
+            dependsOn: ["lint-ls", "^lint"],
             executor: "@monodon/rust:lint",
-            outputs: ["{options.target-dir}"],
             options: {
-              "target-dir": `dist/target/${cargoPackage.name}`
+              "target-dir": `{workspaceRoot}/dist/target/${cargoPackage.name}`
+            }
+          },
+          "format-readme": {
+            cache: true,
+            dependsOn: ["^format-readme"]
+          },
+          "format-toml": {
+            cache: true,
+            dependsOn: ["^format-toml"]
+          },
+          format: {
+            cache: true,
+            inputs: ["config_linting", "rust", "^production"],
+            dependsOn: ["format-readme", "format-toml", "^format"],
+            executor: "nx:run-commands",
+            options: {
+              command: `echo 'Formatting the project files in "{projectRoot}"' `,
+              color: true
+            }
+          },
+          clean: {
+            cache: true,
+            inputs: ["rust", "^production"],
+            outputs: [`{workspaceRoot}/dist/target/${cargoPackage.name}`],
+            executor: "nx:run-commands",
+            options: {
+              command: `pnpm exec rimraf dist/target/${cargoPackage.name}`,
+              color: true,
+              cwd: "{workspaceRoot}"
             }
           },
           build: {
             cache: true,
-            inputs: ["default", "^production"],
-            dependsOn: ["lint", "^build"],
+            inputs: ["rust", "^production"],
+            dependsOn: ["format", "clean", "^build"],
             executor: "@monodon/rust:check",
             outputs: ["{options.target-dir}"],
             options: {
-              "target-dir": `dist/target/${cargoPackage.name}`
+              "target-dir": `{workspaceRoot}/dist/target/${cargoPackage.name}`
             }
           },
           test: {
             cache: true,
-            inputs: ["defaultTesting", "^production"],
-            dependsOn: ["test", "^build"],
+            inputs: ["config_testing", "source_testing", "rust", "^production"],
+            dependsOn: ["build", "^test"],
             executor: "@monodon/rust:test",
             outputs: ["{options.target-dir}"],
             options: {
-              "target-dir": `dist/target/${cargoPackage.name}`
+              "target-dir": `{workspaceRoot}/dist/target/${cargoPackage.name}`
             },
             configurations: {
               production: {
@@ -138,8 +171,7 @@ var createNodes = [
         if (!isPrivate) {
           targets["nx-release-publish"] = {
             cache: false,
-            inputs: ["default", "^production"],
-            dependsOn: ["test", "build", "^nx-release-publish"],
+            inputs: ["rust", "^production"],
             executor: "@storm-software/workspace-tools:cargo-publish",
             options: {
               packageRoot: root
@@ -155,7 +187,7 @@ var createNodes = [
               generator: "@storm-software/workspace-tools:release-version"
             }
           },
-          tags: ["lang:rust"]
+          tags: ["language:rust"]
         };
       }
       for (const dep of cargoPackage.dependencies) {

package/src/plugins/typescript/index.js

@@ -42,13 +42,24 @@ var createNodes = [
       packageJson
     );
     const targets = (0, import_package_json.readTargetsFromPackageJson)(packageJson);
+    if (!targets["lint-ls"]) {
+      targets["lint-ls"] = {
+        cache: true,
+        inputs: ["config_linting", "typescript", "^production"],
+        dependsOn: ["^lint-ls"],
+        executor: "nx:run-commands",
+        options: {
+          command: 'pnpm exec ls-lint --config="@storm-software/linting-tools/ls-lint/ls-lint.yml" ',
+          color: true
+        }
+      };
+    }
     if (!targets.lint) {
       targets.lint = {
         cache: true,
-        inputs: ["default"],
-        dependsOn: ["^lint"],
+        inputs: ["config_linting", "typescript", "^production"],
+        dependsOn: ["lint-ls", "^lint"],
         executor: "@nx/eslint:lint",
-        outputs: ["{options.outputFile}"],
         options: {
           format: "stylish",
           fix: true,
@@ -58,12 +69,65 @@ var createNodes = [
         }
       };
     }
+    if (!targets["format-readme"]) {
+      targets["format-readme"] = {
+        cache: true,
+        dependsOn: ["^format-readme"]
+      };
+    }
+    if (!targets["format-toml"]) {
+      targets["format-toml"] = {
+        cache: true,
+        dependsOn: ["^format-toml"]
+      };
+    }
+    if (!targets["format-prettier"]) {
+      targets["format-prettier"] = {
+        cache: true,
+        inputs: ["config_linting", "typescript", "^production"],
+        dependsOn: ["^format-prettier"]
+      };
+    }
+    if (!targets.format) {
+      targets.format = {
+        cache: true,
+        inputs: ["config_linting", "typescript", "^production"],
+        dependsOn: [
+          "format-readme",
+          "format-toml",
+          "format-prettier",
+          "^format"
+        ],
+        executor: "nx:run-commands",
+        options: {
+          command: `echo 'Formatting the project files in "{projectRoot}"' `,
+          color: true
+        }
+      };
+    }
+    if (!targets.clean) {
+      targets.clean = {
+        cache: true,
+        executor: "nx:run-commands",
+        inputs: ["typescript", "^production"],
+        outputs: ["{workspaceRoot}/dist/{projectRoot}"],
+        options: {
+          command: "pnpm exec rimraf dist/{projectRoot}",
+          color: true,
+          cwd: "{workspaceRoot}"
+        }
+      };
+    }
     if (!targets.test) {
       targets.test = {
         cache: true,
-        inputs: ["default", "^production"],
-        dependsOn: ["build", "^test"],
         executor: "@nx/jest:jest",
+        inputs: [
+          "config_testing",
+          "source_testing",
+          "typescript",
+          "^production"
+        ],
         outputs: ["{workspaceRoot}/coverage/{projectRoot}"],
         defaultConfiguration: "local",
         options: {
@@ -86,8 +150,7 @@ var createNodes = [
     if (!isPrivate) {
       targets["nx-release-publish"] = {
         cache: false,
-        inputs: ["default", "^production"],
-        dependsOn: ["build", "^nx-release-publish"],
+        inputs: ["typescript", "^production"],
         executor: "@storm-software/workspace-tools:npm-publish",
         options: {}
       };
@@ -95,7 +158,7 @@ var createNodes = [
     return project?.name ? {
       projects: {
         [project.name]: {
-          tags: ["lang:typescript"],
+          tags: ["language:typescript"],
           ...project,
           targets,
           release: {