@storm-software/workspace-tools 1.202.0 → 1.203.0

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.203.0 (2024-12-19)
+
+### Features
+
+- **workspace-tools:** Update TypeScript library generators to use `unbuild`
+  executor
+  ([29468243](https://github.com/storm-software/storm-ops/commit/29468243))
+
+## 1.202.1 (2024-12-19)
+
+### Bug Fixes
+
+- **workspace-tools:** Resolved issue with TypeScript library generator
+  ([f1968e8d](https://github.com/storm-software/storm-ops/commit/f1968e8d))
+
 ## 1.202.0 (2024-12-18)
 
 ### Features

package/declarations.d.ts

@@ -194,12 +194,20 @@ declare function typeScriptLibraryGeneratorFn(
 ): Promise<any>;
 export { typeScriptLibraryGeneratorFn };
 
-export type ProjectTagVariant = "language" | "type" | "dist-style" | "provider";
+export type ProjectTagVariant =
+  | "language"
+  | "type"
+  | "dist-style"
+  | "provider"
+  | "platform"
+  | "registry";
 export const ProjectTagVariant = {
   LANGUAGE: "language" as ProjectTagVariant,
   TYPE: "type" as ProjectTagVariant,
   DIST_STYLE: "dist-style" as ProjectTagVariant,
-  PROVIDER: "provider" as ProjectTagVariant
+  PROVIDER: "provider" as ProjectTagVariant,
+  PLATFORM: "platform" as ProjectTagVariant,
+  REGISTRY: "registry" as ProjectTagVariant
 };
 
 export type ProjectTagLanguageValue = "typescript" | "rust";
@@ -220,6 +228,14 @@ export const ProjectTagDistStyleValue = {
   CLEAN: "clean" as ProjectTagDistStyleValue
 };
 
+export type ProjectTagPlatformValue = "node" | "browser" | "neutral" | "worker";
+export const ProjectTagPlatformValue = {
+  NODE: "node" as ProjectTagPlatformValue,
+  BROWSER: "browser" as ProjectTagPlatformValue,
+  NEUTRAL: "neutral" as ProjectTagPlatformValue,
+  WORKER: "worker" as ProjectTagPlatformValue
+};
+
 export type ProjectTagRegistryValue = "cargo" | "npm" | "container" | "cyclone";
 export const ProjectTagRegistryValue = {
   CARGO: "cargo" as ProjectTagRegistryValue,

package/index.js

@@ -220722,7 +220722,6 @@ __export(workspace_tools_exports, {
   ProjectTagConstants: () => ProjectTagConstants,
   YARN_LOCK_FILE: () => YARN_LOCK_FILE,
   YARN_LOCK_PATH: () => YARN_LOCK_PATH,
-  addLint: () => addLint,
   addProjectTag: () => addProjectTag,
   applyWorkspaceExecutorTokens: () => applyWorkspaceExecutorTokens,
   buildCargoCommand: () => buildCargoCommand,
@@ -221088,6 +221087,91 @@ var import_js = require("@nx/js");
 var import_init = __toESM(require("@nx/js/src/generators/init/init"));
 var import_generator = __toESM(require("@nx/js/src/generators/setup-verdaccio/generator"));
 
+// 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"
+  },
+  Platform: {
+    TAG_ID: "platform",
+    NODE: "node",
+    BROWSER: "browser",
+    NEUTRAL: "neutral",
+    WORKER: "worker"
+  },
+  Registry: {
+    TAG_ID: "registry",
+    CARGO: "cargo",
+    NPM: "npm",
+    CONTAINER: "container",
+    CYCLONE: "cyclone"
+  }
+};
+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 }
+  );
+};
+
 // packages/workspace-tools/src/utils/versions.ts
 var tsupVersion = "^7.2.0";
 var prettierPackageJsonVersion = "2.4.6";
@@ -221146,6 +221230,7 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
           tsConfig: (0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json"),
           project: (0, import_devkit.joinPathFragments)(options.projectRoot, "package.json"),
           defaultConfiguration: "production",
+          platform: "neutral",
           assets: [
             {
               input: options.projectRoot,
@@ -221169,21 +221254,25 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
             verbose: true
           }
         }
-      },
-      lint: {},
-      test: {}
+      }
     }
   };
-  if (schema.platform && projectConfig?.targets?.build) {
+  if (schema.platform) {
     projectConfig.targets.build.options.platform = schema.platform;
   }
+  addProjectTag(
+    projectConfig,
+    ProjectTagConstants.Platform.TAG_ID,
+    projectConfig.targets.build.options.platform === "node" ? ProjectTagConstants.Platform.NODE : projectConfig.targets.build.options.platform === "worker" ? ProjectTagConstants.Platform.WORKER : projectConfig.targets.build.options.platform === "browser" ? ProjectTagConstants.Platform.BROWSER : ProjectTagConstants.Platform.NEUTRAL,
+    { overwrite: true }
+  );
   createProjectTsConfigJson(tree, options);
   (0, import_devkit.addProjectConfiguration)(tree, options.name, projectConfig);
   let repository = {
     type: "github",
     url: "https://github.com/storm-software/storm-stack.git"
   };
-  let description = schema.description ?? "\u26A1 A Storm package used to create modern, scalable web applications.";
+  let description = schema.description ?? "A package developed by Storm Software used to create modern, scalable web applications.";
   if (tree.exists("package.json")) {
     const packageJson = (0, import_devkit.readJson)(tree, "package.json");
     if (packageJson?.repository) {
@@ -221292,96 +221381,9 @@ async function typeScriptLibraryGeneratorFn(tree, schema) {
       exclude: ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
     });
   }
-  const lintCallback = await addLint(tree, options);
-  tasks.push(lintCallback);
   await (0, import_devkit.formatFiles)(tree);
   return null;
 }
-async function addLint(tree, options) {
-  const { lintProjectGenerator } = (0, import_devkit.ensurePackage)("@nx/eslint", nxVersion);
-  const { mapLintPattern } = (
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    require("@nx/eslint/src/generators/lint-project/lint-project")
-  );
-  const projectConfiguration = (0, import_devkit.readProjectConfiguration)(tree, options.name);
-  const task = lintProjectGenerator(tree, {
-    project: options.name,
-    linter: options.linter,
-    skipFormat: true,
-    tsConfigPaths: [(0, import_devkit.joinPathFragments)(options.projectRoot, "tsconfig.json")],
-    unitTestRunner: options.unitTestRunner,
-    eslintFilePatterns: [
-      mapLintPattern(
-        options.projectRoot,
-        options.js ? "js" : "ts",
-        options.rootProject
-      )
-    ],
-    setParserOptionsProject: options.setParserOptionsProject,
-    rootProject: options.rootProject
-  });
-  const {
-    addOverrideToLintConfig,
-    lintConfigHasOverride,
-    isEslintConfigSupported,
-    updateOverrideInLintConfig
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-  } = require("@nx/eslint/src/generators/utils/eslint-file");
-  if (!isEslintConfigSupported(tree)) {
-    return task;
-  }
-  addOverrideToLintConfig(tree, "", {
-    files: ["*.json"],
-    parser: "jsonc-eslint-parser",
-    rules: {
-      "@nx/dependency-checks": [
-        "error",
-        {
-          "buildTargets": ["build"],
-          "ignoredFiles": [
-            "{projectRoot}/esbuild.config.{js,ts,mjs,mts}",
-            "{projectRoot}/jest.config.ts"
-          ],
-          "checkMissingDependencies": true,
-          "checkObsoleteDependencies": true,
-          "checkVersionMismatches": false
-        }
-      ]
-    }
-  });
-  if (lintConfigHasOverride(
-    tree,
-    projectConfiguration.root,
-    (o) => Array.isArray(o.files) ? o.files.some((f2) => f2.match(/\.json$/)) : !!o.files?.match(/\.json$/),
-    true
-  )) {
-    updateOverrideInLintConfig(
-      tree,
-      projectConfiguration.root,
-      (o) => o.rules?.["@nx/dependency-checks"],
-      (o) => {
-        const value2 = o.rules["@nx/dependency-checks"];
-        let ruleSeverity;
-        let ruleOptions;
-        if (Array.isArray(value2)) {
-          ruleSeverity = value2[0];
-          ruleOptions = value2[1];
-        } else {
-          ruleSeverity = value2 ?? "error";
-          ruleOptions = {};
-        }
-        if (options.bundler === "esbuild") {
-          ruleOptions.ignoredFiles = [
-            "{projectRoot}/esbuild.config.{js,ts,mjs,mts}"
-          ];
-          o.rules["@nx/dependency-checks"] = [ruleSeverity, ruleOptions];
-        }
-        return o;
-      }
-    );
-  }
-  return task;
-}
 function getOutputPath(options) {
   const parts = ["dist"];
   if (options.projectRoot === ".") {
@@ -235642,7 +235644,7 @@ async function nodeLibraryGeneratorFn(tree, schema) {
     devDependencies: {
       "@types/node": typesNodeVersion
     },
-    buildExecutor: "@storm-software/workspace-tools:tsup-node"
+    buildExecutor: "@storm-software/workspace-tools:unbuild"
   };
   const options = await normalizeOptions(tree, tsLibraryGeneratorOptions);
   const { className, name, propertyName } = (0, import_devkit11.names)(
@@ -236960,86 +236962,6 @@ function isPostInstallProcess() {
 // packages/workspace-tools/src/utils/package-helpers.ts
 var import_devkit16 = require("@nx/devkit");
 var import_node_fs20 = require("node:fs");
-
-// 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"
-  },
-  Registry: {
-    TAG_ID: "registry",
-    CARGO: "cargo",
-    NPM: "npm",
-    CONTAINER: "container",
-    CYCLONE: "cyclone"
-  }
-};
-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 }
-  );
-};
-
-// packages/workspace-tools/src/utils/package-helpers.ts
 var PackageManagerTypes = {
   PackageJson: "package.json",
   CargoToml: "Cargo.toml"
@@ -237086,7 +237008,6 @@ var getTypiaTransform = (program3, diagnostics) => (0, import_transform.default)
   ProjectTagConstants,
   YARN_LOCK_FILE,
   YARN_LOCK_PATH,
-  addLint,
   addProjectTag,
   applyWorkspaceExecutorTokens,
   buildCargoCommand,