@storm-software/workspace-tools 1.118.0 → 1.120.0

package/src/plugins/typescript/index.js

@@ -29,6 +29,79 @@ var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
 var import_fileutils = require("nx/src/utils/fileutils");
 var import_package_json = require("nx/src/utils/package-json");
+
+// packages/workspace-tools/src/utils/project-tags.ts
+var ProjectTagConstants = {
+  Language: {
+    TAG_ID: "language",
+    TYPESCRIPT: "typescript",
+    RUST: "rust"
+  },
+  ProjectType: {
+    TAG_ID: "type",
+    LIBRARY: "library",
+    APPLICATION: "application"
+  },
+  DistStyle: {
+    TAG_ID: "dist-style",
+    NORMAL: "normal",
+    CLEAN: "clean"
+  },
+  Provider: {
+    TAG_ID: "provider"
+  }
+};
+var formatProjectTag = (variant, value) => {
+  return `${variant}:${value}`;
+};
+var hasProjectTag = (project, variant) => {
+  project.tags = project.tags ?? [];
+  const prefix = formatProjectTag(variant, "");
+  return project.tags.some(
+    (tag) => tag.startsWith(prefix) && tag.length > prefix.length
+  );
+};
+var getProjectTag = (project, variant) => {
+  if (!hasProjectTag(project, variant)) {
+    return void 0;
+  }
+  project.tags = project.tags ?? [];
+  const prefix = formatProjectTag(variant, "");
+  const tag = project.tags.find((tag2) => tag2.startsWith(prefix));
+  return tag?.replace(prefix, "");
+};
+var isEqualProjectTag = (project, variant, value) => {
+  const tag = getProjectTag(project, variant);
+  return !!(tag && tag?.toUpperCase() === value.toUpperCase());
+};
+var addProjectTag = (project, variant, value, options = {
+  overwrite: false
+}) => {
+  project.tags = project.tags ?? [];
+  if (options.overwrite || !hasProjectTag(project, variant)) {
+    project.tags = project.tags.filter(
+      (tag) => !tag.startsWith(formatProjectTag(variant, ""))
+    );
+    project.tags.push(formatProjectTag(variant, value));
+  }
+};
+var setDefaultProjectTags = (project) => {
+  project.tags = project.tags ?? [];
+  addProjectTag(
+    project,
+    ProjectTagConstants.ProjectType.TAG_ID,
+    project.projectType === "application" ? ProjectTagConstants.ProjectType.APPLICATION : ProjectTagConstants.ProjectType.LIBRARY,
+    { overwrite: true }
+  );
+  addProjectTag(
+    project,
+    ProjectTagConstants.DistStyle.TAG_ID,
+    project.targets && Object.keys(project.targets).includes("clean-package") ? ProjectTagConstants.DistStyle.CLEAN : ProjectTagConstants.DistStyle.NORMAL,
+    { overwrite: true }
+  );
+};
+
+// packages/workspace-tools/src/plugins/typescript/project-config.ts
 var name = "storm-software/typescript/project-config";
 var createNodes = [
   "{project.json,**/project.json}",
@@ -168,11 +241,37 @@ var createNodes = [
         executor: "@storm-software/workspace-tools:npm-publish",
         options: {}
       };
+      if (project.projectType === "application" || isEqualProjectTag(
+        project,
+        ProjectTagConstants.ProjectType.TAG_ID,
+        ProjectTagConstants.ProjectType.APPLICATION
+      ) || isEqualProjectTag(
+        project,
+        ProjectTagConstants.DistStyle.TAG_ID,
+        ProjectTagConstants.DistStyle.CLEAN
+      )) {
+        targets["clean-package"] = {
+          cache: false,
+          dependsOn: ["build"],
+          executor: "@storm-software/workspace-tools:clean-package",
+          options: {
+            cleanReadMe: true,
+            cleanComments: true
+          }
+        };
+        targets["nx-release-publish"].dependsOn = ["clean-package"];
+      }
     }
+    addProjectTag(
+      project,
+      ProjectTagConstants.Language.TAG_ID,
+      ProjectTagConstants.Language.TYPESCRIPT,
+      { overwrite: true }
+    );
+    setDefaultProjectTags(project);
     return project?.name ? {
       projects: {
         [project.name]: {
-          tags: ["language:typescript"],
           ...project,
           targets,
           release: {

package/src/utils/index.js

@@ -65395,7 +65395,7 @@ var init_schema = __esm({
       ci: z2.boolean().default(true).describe(
         "An indicator specifying if the current environment is a CI environment"
       ),
-      workspaceRoot: z2.string().trim().optional().describe("The root directory of the workspace"),
+      workspaceRoot: z2.string().trim().default("").describe("The root directory of the workspace"),
       packageDirectory: z2.string().trim().optional().describe("The root directory of the package"),
       externalPackagePatterns: z2.array(z2.string()).default([]).describe(
         "The build will use these package patterns to determine if they should be external to the bundle"
@@ -68041,6 +68041,7 @@ var init_create_storm_config = __esm({
             ...config.colors
           }
         });
+        result.workspaceRoot ??= defaultConfig.workspaceRoot ? defaultConfig.workspaceRoot : findWorkspaceRoot(workspaceRoot3);
       } else {
         result = _static_cache;
       }
@@ -296571,8 +296572,10 @@ __export(utils_exports, {
   NPM_LOCK_PATH: () => NPM_LOCK_PATH,
   PNPM_LOCK_FILE: () => PNPM_LOCK_FILE,
   PNPM_LOCK_PATH: () => PNPM_LOCK_PATH,
+  ProjectTagConstants: () => ProjectTagConstants,
   YARN_LOCK_FILE: () => YARN_LOCK_FILE,
   YARN_LOCK_PATH: () => YARN_LOCK_PATH,
+  addProjectTag: () => addProjectTag,
   applyWorkspaceExecutorTokens: () => applyWorkspaceExecutorTokens,
   cargoCommand: () => cargoCommand,
   cargoCommandSync: () => cargoCommandSync,
@@ -296581,12 +296584,16 @@ __export(utils_exports, {
   childProcess: () => childProcess2,
   createCliOptions: () => createCliOptions,
   eslintVersion: () => eslintVersion,
+  formatProjectTag: () => formatProjectTag,
   getLockFileDependencies: () => getLockFileDependencies,
   getLockFileName: () => getLockFileName,
   getLockFileNodes: () => getLockFileNodes,
   getProjectConfiguration: () => getProjectConfiguration,
   getProjectConfigurations: () => getProjectConfigurations,
+  getProjectTag: () => getProjectTag,
   getTypiaTransform: () => getTypiaTransform,
+  hasProjectTag: () => hasProjectTag,
+  isEqualProjectTag: () => isEqualProjectTag,
   isExternal: () => isExternal,
   lintStagedVersion: () => lintStagedVersion,
   lockFileExists: () => lockFileExists,
@@ -296602,6 +296609,7 @@ __export(utils_exports, {
   prettierVersion: () => prettierVersion,
   runProcess: () => runProcess,
   semanticReleaseVersion: () => semanticReleaseVersion,
+  setDefaultProjectTags: () => setDefaultProjectTags,
   stringifyCargoToml: () => stringifyCargoToml,
   swcCliVersion: () => swcCliVersion,
   swcCoreVersion: () => swcCoreVersion,
@@ -299830,6 +299838,77 @@ function createCliOptions(obj) {
   }
   return args;
 }
+
+// packages/workspace-tools/src/utils/project-tags.ts
+var ProjectTagConstants = {
+  Language: {
+    TAG_ID: "language",
+    TYPESCRIPT: "typescript",
+    RUST: "rust"
+  },
+  ProjectType: {
+    TAG_ID: "type",
+    LIBRARY: "library",
+    APPLICATION: "application"
+  },
+  DistStyle: {
+    TAG_ID: "dist-style",
+    NORMAL: "normal",
+    CLEAN: "clean"
+  },
+  Provider: {
+    TAG_ID: "provider"
+  }
+};
+var formatProjectTag = (variant, value2) => {
+  return `${variant}:${value2}`;
+};
+var hasProjectTag = (project, variant) => {
+  project.tags = project.tags ?? [];
+  const prefix = formatProjectTag(variant, "");
+  return project.tags.some(
+    (tag) => tag.startsWith(prefix) && tag.length > prefix.length
+  );
+};
+var getProjectTag = (project, variant) => {
+  if (!hasProjectTag(project, variant)) {
+    return void 0;
+  }
+  project.tags = project.tags ?? [];
+  const prefix = formatProjectTag(variant, "");
+  const tag = project.tags.find((tag2) => tag2.startsWith(prefix));
+  return tag?.replace(prefix, "");
+};
+var isEqualProjectTag = (project, variant, value2) => {
+  const tag = getProjectTag(project, variant);
+  return !!(tag && tag?.toUpperCase() === value2.toUpperCase());
+};
+var addProjectTag = (project, variant, value2, options = {
+  overwrite: false
+}) => {
+  project.tags = project.tags ?? [];
+  if (options.overwrite || !hasProjectTag(project, variant)) {
+    project.tags = project.tags.filter(
+      (tag) => !tag.startsWith(formatProjectTag(variant, ""))
+    );
+    project.tags.push(formatProjectTag(variant, value2));
+  }
+};
+var setDefaultProjectTags = (project) => {
+  project.tags = project.tags ?? [];
+  addProjectTag(
+    project,
+    ProjectTagConstants.ProjectType.TAG_ID,
+    project.projectType === "application" ? ProjectTagConstants.ProjectType.APPLICATION : ProjectTagConstants.ProjectType.LIBRARY,
+    { overwrite: true }
+  );
+  addProjectTag(
+    project,
+    ProjectTagConstants.DistStyle.TAG_ID,
+    project.targets && Object.keys(project.targets).includes("clean-package") ? ProjectTagConstants.DistStyle.CLEAN : ProjectTagConstants.DistStyle.NORMAL,
+    { overwrite: true }
+  );
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LOCK_FILES,
@@ -299837,8 +299916,10 @@ function createCliOptions(obj) {
   NPM_LOCK_PATH,
   PNPM_LOCK_FILE,
   PNPM_LOCK_PATH,
+  ProjectTagConstants,
   YARN_LOCK_FILE,
   YARN_LOCK_PATH,
+  addProjectTag,
   applyWorkspaceExecutorTokens,
   cargoCommand,
   cargoCommandSync,
@@ -299847,12 +299928,16 @@ function createCliOptions(obj) {
   childProcess,
   createCliOptions,
   eslintVersion,
+  formatProjectTag,
   getLockFileDependencies,
   getLockFileName,
   getLockFileNodes,
   getProjectConfiguration,
   getProjectConfigurations,
+  getProjectTag,
   getTypiaTransform,
+  hasProjectTag,
+  isEqualProjectTag,
   isExternal,
   lintStagedVersion,
   lockFileExists,
@@ -299868,6 +299953,7 @@ function createCliOptions(obj) {
   prettierVersion,
   runProcess,
   semanticReleaseVersion,
+  setDefaultProjectTags,
   stringifyCargoToml,
   swcCliVersion,
   swcCoreVersion,

package/src/generators/preset/files/.github/workflows/dependabot-approve.yml

@@ -1,24 +0,0 @@
-# https://stackoverflow.com/q/70664840/590396
-name: Dependabot auto-approve
-on: pull_request_target
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'renovate[bot]' || github.actor == 'Stormie-Bot' }}
-    steps:
-      - name: Approve a PR
-        run: gh pr review --approve "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --squash "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{ secrets.STORM_BOT_GITHUB_TOKEN }}