@storm-software/workspace-tools 1.60.9 → 1.60.11

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 1.60.11 (2024-02-22)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Remove prettier imports from tsup build ([5513d93d](https://github.com/storm-software/storm-ops/commit/5513d93d))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
+## 1.60.10 (2024-02-22)
+
+
+### 🩹 Fixes
+
+- **workspace-tools:** Resolve issue with multi-require imports ([711dca38](https://github.com/storm-software/storm-ops/commit/711dca38))
+
+
+### ❤️  Thank You
+
+- Patrick Sullivan
+
 ## 1.60.9 (2024-02-22)
 
 

package/executors.json

@@ -21,11 +21,6 @@
       "schema": "./src/executors/tsup-browser/schema.json",
       "description": "Runs a browser platform TypeScript build"
     },
-    "design-tokens": {
-      "implementation": "./src/executors/design-tokens/executor",
-      "schema": "./src/executors/design-tokens/schema.json",
-      "description": "Generate code (TailWind CSS, Tamagui, CSS variables, etc.) from a tokens.json file exported from Figma Tokens Studio"
-    },
     "typia": {
       "implementation": "./src/executors/typia/executor",
       "schema": "./src/executors/typia/schema.json",

package/index.js

@@ -13096,7 +13096,7 @@ ${lanes.join("\n")}
       function isEnabled() {
         return enabled;
       }
-      function enable(system = sys2) {
+      function enable(system = sys) {
         var _a3;
         if (!enabled) {
           enabled = true;
@@ -16313,21 +16313,21 @@ ${lanes.join("\n")}
           }
         }
       }
-      function patchWriteFileEnsuringDirectory2(sys22) {
-        const originalWriteFile = sys22.writeFile;
-        sys22.writeFile = (path15, data, writeBom) => writeFileEnsuringDirectories(
+      function patchWriteFileEnsuringDirectory2(sys2) {
+        const originalWriteFile = sys2.writeFile;
+        sys2.writeFile = (path15, data, writeBom) => writeFileEnsuringDirectories(
           path15,
           data,
           !!writeBom,
-          (path22, data2, writeByteOrderMark) => originalWriteFile.call(sys22, path22, data2, writeByteOrderMark),
-          (path22) => sys22.createDirectory(path22),
-          (path22) => sys22.directoryExists(path22)
+          (path22, data2, writeByteOrderMark) => originalWriteFile.call(sys2, path22, data2, writeByteOrderMark),
+          (path22) => sys2.createDirectory(path22),
+          (path22) => sys2.directoryExists(path22)
         );
       }
       function setSys2(s) {
-        sys2 = s;
+        sys = s;
       }
-      var FileWatcherEventKind2, PollingInterval2, missingFileModifiedTime2, defaultChunkLevels, pollingChunkSize, unchangedPollThresholds2, ignoredPaths2, curSysLog, FileSystemEntryKind2, sys2;
+      var FileWatcherEventKind2, PollingInterval2, missingFileModifiedTime2, defaultChunkLevels, pollingChunkSize, unchangedPollThresholds2, ignoredPaths2, curSysLog, FileSystemEntryKind2, sys;
       var init_sys = __esm2({
         "src/compiler/sys.ts"() {
           "use strict";
@@ -16355,7 +16355,7 @@ ${lanes.join("\n")}
             FileSystemEntryKind22[FileSystemEntryKind22["Directory"] = 1] = "Directory";
             return FileSystemEntryKind22;
           })(FileSystemEntryKind2 || {});
-          sys2 = (() => {
+          sys = (() => {
             const byteOrderMarkIndicator = "\uFEFF";
             function getNodeSystem() {
               const nativePattern = /^native |^\([^)]+\)$|^(internal[\\/]|[a-zA-Z0-9_\s]+(\.js)?$)/;
@@ -16798,23 +16798,23 @@ ${lanes.join("\n")}
                 return hash.digest("hex");
               }
             }
-            let sys22;
+            let sys2;
             if (isNodeLikeSystem()) {
-              sys22 = getNodeSystem();
+              sys2 = getNodeSystem();
             }
-            if (sys22) {
-              patchWriteFileEnsuringDirectory2(sys22);
+            if (sys2) {
+              patchWriteFileEnsuringDirectory2(sys2);
             }
-            return sys22;
+            return sys2;
           })();
-          if (sys2 && sys2.getEnvironmentVariable) {
-            setCustomPollingValues(sys2);
+          if (sys && sys.getEnvironmentVariable) {
+            setCustomPollingValues(sys);
             Debug.setAssertionLevel(
-              /^development$/i.test(sys2.getEnvironmentVariable("NODE_ENV")) ? 1 : 0
+              /^development$/i.test(sys.getEnvironmentVariable("NODE_ENV")) ? 1 : 0
               /* None */
             );
           }
-          if (sys2 && sys2.debugMode) {
+          if (sys && sys.debugMode) {
             Debug.isDebugging = true;
           }
         }
@@ -21787,7 +21787,7 @@ ${lanes.join("\n")}
       function getNodeFlags(node) {
         return node.flags;
       }
-      function validateLocaleAndSetLanguage(locale, sys22, errors) {
+      function validateLocaleAndSetLanguage(locale, sys2, errors) {
         const lowerCaseLocale = locale.toLowerCase();
         const matchResult = /^([a-z]+)([_-]([a-z]+))?$/.exec(lowerCaseLocale);
         if (!matchResult) {
@@ -21808,19 +21808,19 @@ ${lanes.join("\n")}
         }
         setUILocale(locale);
         function trySetLanguageAndTerritory(language2, territory2, errors2) {
-          const compilerFilePath = normalizePath(sys22.getExecutingFilePath());
+          const compilerFilePath = normalizePath(sys2.getExecutingFilePath());
           const containingDirectoryPath = getDirectoryPath(compilerFilePath);
           let filePath = combinePaths(containingDirectoryPath, language2);
           if (territory2) {
             filePath = filePath + "-" + territory2;
           }
-          filePath = sys22.resolvePath(combinePaths(filePath, "diagnosticMessages.generated.json"));
-          if (!sys22.fileExists(filePath)) {
+          filePath = sys2.resolvePath(combinePaths(filePath, "diagnosticMessages.generated.json"));
+          if (!sys2.fileExists(filePath)) {
             return false;
           }
           let fileContents = "";
           try {
-            fileContents = sys22.readFile(filePath);
+            fileContents = sys2.readFile(filePath);
           } catch (e3) {
             if (errors2) {
               errors2.push(createCompilerDiagnostic(Diagnostics.Unable_to_open_file_0, filePath));
@@ -49082,7 +49082,7 @@ ${lanes.join("\n")}
           }
         }
         function parseResponseFile(fileName) {
-          const text = tryReadFile2(fileName, readFile3 || ((fileName2) => sys2.readFile(fileName2)));
+          const text = tryReadFile2(fileName, readFile3 || ((fileName2) => sys.readFile(fileName2)));
           if (!isString(text)) {
             errors.push(text);
             return;
@@ -49252,7 +49252,7 @@ ${lanes.join("\n")}
           watchOptionsToExtend
         );
       }
-      function readConfigFile3(fileName, readFile3) {
+      function readConfigFile2(fileName, readFile3) {
         const textOrDiagnostic = tryReadFile2(fileName, readFile3);
         return isString(textOrDiagnostic) ? parseConfigFileTextToJson2(fileName, textOrDiagnostic) : { config: {}, error: textOrDiagnostic };
       }
@@ -49758,7 +49758,7 @@ ${lanes.join("\n")}
         }
         return value;
       }
-      function parseJsonConfigFileContent3(json2, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache, existingWatchOptions) {
+      function parseJsonConfigFileContent2(json2, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache, existingWatchOptions) {
         return parseJsonConfigFileContentWorker(
           json2,
           /*sourceFile*/
@@ -131388,7 +131388,7 @@ ${lanes.join("\n")}
         function getSourceMappingURL(mapOptions, sourceMapGenerator, filePath, sourceMapFilePath, sourceFile) {
           if (mapOptions.inlineSourceMap) {
             const sourceMapText = sourceMapGenerator.toString();
-            const base64SourceMapText = base64encode(sys2, sourceMapText);
+            const base64SourceMapText = base64encode(sys, sourceMapText);
             return `data:application/json;base64,${base64SourceMapText}`;
           }
           const sourceMapFile = getBaseFileName(normalizeSlashes(Debug.checkDefined(sourceMapFilePath)));
@@ -137188,7 +137188,7 @@ ${lanes.join("\n")}
           }
         };
       }
-      function createCompilerHostWorker2(options8, setParentNodes, system = sys2) {
+      function createCompilerHostWorker2(options8, setParentNodes, system = sys) {
         const existingDirectories = /* @__PURE__ */ new Map();
         const getCanonicalFileName = createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         function directoryExists(directoryPath) {
@@ -144092,7 +144092,7 @@ ${lanes.join("\n")}
         }
       });
       function createDiagnosticReporter2(system, pretty) {
-        const host = system === sys2 && sysFormatDiagnosticsHost ? sysFormatDiagnosticsHost : {
+        const host = system === sys && sysFormatDiagnosticsHost ? sysFormatDiagnosticsHost : {
           getCurrentDirectory: () => system.getCurrentDirectory(),
           getNewLine: () => system.newLine,
           getCanonicalFileName: createGetCanonicalFileName(system.useCaseSensitiveFileNames)
@@ -144536,7 +144536,7 @@ ${lanes.join("\n")}
         }
         return 0;
       }
-      function createWatchHost2(system = sys2, reportWatchStatus2) {
+      function createWatchHost2(system = sys, reportWatchStatus2) {
         const onWatchStatusChange = reportWatchStatus2 || createWatchStatusReporter2(system);
         return {
           onWatchStatusChange,
@@ -144653,7 +144653,7 @@ ${lanes.join("\n")}
           now: maybeBind(system, system.now)
         };
       }
-      function createWatchCompilerHost(system = sys2, createProgram22, reportDiagnostic, reportWatchStatus2) {
+      function createWatchCompilerHost(system = sys, createProgram22, reportDiagnostic, reportWatchStatus2) {
         const write = (s) => system.write(s + system.newLine);
         const result = createProgramHost2(system, createProgram22);
         copyProperties(result, createWatchHost2(system, reportWatchStatus2));
@@ -144718,7 +144718,7 @@ ${lanes.join("\n")}
         return host;
       }
       function performIncrementalCompilation2(input) {
-        const system = input.system || sys2;
+        const system = input.system || sys;
         const host = input.host || (input.host = createIncrementalCompilerHost2(input.options, system));
         const builderProgram = createIncrementalProgram2(input);
         const exitStatus = emitFilesAndReportErrorsAndGetExitStatus2(
@@ -144736,10 +144736,10 @@ ${lanes.join("\n")}
         "src/compiler/watch.ts"() {
           "use strict";
           init_ts2();
-          sysFormatDiagnosticsHost = sys2 ? {
-            getCurrentDirectory: () => sys2.getCurrentDirectory(),
-            getNewLine: () => sys2.newLine,
-            getCanonicalFileName: createGetCanonicalFileName(sys2.useCaseSensitiveFileNames)
+          sysFormatDiagnosticsHost = sys ? {
+            getCurrentDirectory: () => sys.getCurrentDirectory(),
+            getNewLine: () => sys.newLine,
+            getCanonicalFileName: createGetCanonicalFileName(sys.useCaseSensitiveFileNames)
           } : void 0;
           screenStartingMessageCodes2 = [
             Diagnostics.Starting_compilation_in_watch_mode.code,
@@ -144789,7 +144789,7 @@ ${lanes.join("\n")}
           return void 0;
         return createBuilderProgramUsingProgramBuildInfo2(buildInfo, buildInfoPath, host);
       }
-      function createIncrementalCompilerHost2(options8, system = sys2) {
+      function createIncrementalCompilerHost2(options8, system = sys) {
         const host = createCompilerHostWorker2(
           options8,
           /*setParentNodes*/
@@ -145595,12 +145595,12 @@ ${lanes.join("\n")}
         host.now = maybeBind(system, system.now);
         return host;
       }
-      function createSolutionBuilderHost2(system = sys2, createProgram22, reportDiagnostic, reportSolutionBuilderStatus, reportErrorSummary2) {
+      function createSolutionBuilderHost2(system = sys, createProgram22, reportDiagnostic, reportSolutionBuilderStatus, reportErrorSummary2) {
         const host = createSolutionBuilderHostBase(system, createProgram22, reportDiagnostic, reportSolutionBuilderStatus);
         host.reportErrorSummary = reportErrorSummary2;
         return host;
       }
-      function createSolutionBuilderWithWatchHost2(system = sys2, createProgram22, reportDiagnostic, reportSolutionBuilderStatus, reportWatchStatus2) {
+      function createSolutionBuilderWithWatchHost2(system = sys, createProgram22, reportDiagnostic, reportSolutionBuilderStatus, reportWatchStatus2) {
         const host = createSolutionBuilderHostBase(system, createProgram22, reportDiagnostic, reportSolutionBuilderStatus);
         const watchHost = createWatchHost2(system, reportWatchStatus2);
         copyProperties(host, watchHost);
@@ -147729,11 +147729,11 @@ ${lanes.join("\n")}
         }
       });
       function hasArgument2(argumentName) {
-        return sys2.args.includes(argumentName);
+        return sys.args.includes(argumentName);
       }
       function findArgument2(argumentName) {
-        const index = sys2.args.indexOf(argumentName);
-        return index >= 0 && index < sys2.args.length - 1 ? sys2.args[index + 1] : void 0;
+        const index = sys.args.indexOf(argumentName);
+        return index >= 0 && index < sys.args.length - 1 ? sys.args[index + 1] : void 0;
       }
       function nowString2() {
         const d4 = /* @__PURE__ */ new Date();
@@ -147790,12 +147790,12 @@ ${lanes.join("\n")}
         return nodeCoreModules.has(moduleName) ? "node" : moduleName;
       }
       function loadSafeList(host, safeListPath) {
-        const result = readConfigFile3(safeListPath, (path15) => host.readFile(path15));
+        const result = readConfigFile2(safeListPath, (path15) => host.readFile(path15));
         return new Map(Object.entries(result.config));
       }
       function loadTypesMap(host, typesMapPath) {
         var _a3;
-        const result = readConfigFile3(typesMapPath, (path15) => host.readFile(path15));
+        const result = readConfigFile2(typesMapPath, (path15) => host.readFile(path15));
         if ((_a3 = result.config) == null ? void 0 : _a3.simpleMap) {
           return new Map(Object.entries(result.config.simpleMap));
         }
@@ -147875,7 +147875,7 @@ ${lanes.join("\n")}
           let manifestTypingNames;
           if (host.fileExists(manifestPath)) {
             filesToWatch2.push(manifestPath);
-            manifest = readConfigFile3(manifestPath, (path15) => host.readFile(path15)).config;
+            manifest = readConfigFile2(manifestPath, (path15) => host.readFile(path15)).config;
             manifestTypingNames = flatMap([manifest.dependencies, manifest.devDependencies, manifest.optionalDependencies, manifest.peerDependencies], getOwnKeys);
             addInferredTypings(manifestTypingNames, `Typing names in '${manifestPath}' dependencies`);
           }
@@ -147910,7 +147910,7 @@ ${lanes.join("\n")}
             log(`Searching for typing names in ${packagesFolderPath}; all files: ${JSON.stringify(dependencyManifestNames)}`);
           for (const manifestPath2 of dependencyManifestNames) {
             const normalizedFileName = normalizePath(manifestPath2);
-            const result2 = readConfigFile3(normalizedFileName, (path15) => host.readFile(path15));
+            const result2 = readConfigFile2(normalizedFileName, (path15) => host.readFile(path15));
             const manifest2 = result2.config;
             if (!manifest2.name) {
               continue;
@@ -154525,7 +154525,7 @@ ${lanes.join("\n")}
           if (match2) {
             if (match2[1]) {
               const base64Object = match2[1];
-              return convertDocumentToSourceMapper(host, base64decode(sys2, base64Object), generatedFileName);
+              return convertDocumentToSourceMapper(host, base64decode(sys, base64Object), generatedFileName);
             }
             mapFileName = void 0;
           }
@@ -163433,8 +163433,8 @@ ${newComment.split("\n").map((c4) => ` * ${c4}`).join("\n")}
         return node && node.parent && node.parent.kind === 212 && node.parent.argumentExpression === node;
       }
       function getDefaultLibFilePath(options8) {
-        if (sys2) {
-          return combinePaths(getDirectoryPath(normalizePath(sys2.getExecutingFilePath())), getDefaultLibFileName(options8));
+        if (sys) {
+          return combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), getDefaultLibFileName(options8));
         }
         throw new Error("getDefaultLibFilePath is only supported when consumed as a node module. ");
       }
@@ -207585,7 +207585,7 @@ ${e3.message}`;
         parseIsolatedEntityName: () => parseIsolatedEntityName,
         parseIsolatedJSDocComment: () => parseIsolatedJSDocComment,
         parseJSDocTypeExpressionForTests: () => parseJSDocTypeExpressionForTests,
-        parseJsonConfigFileContent: () => parseJsonConfigFileContent3,
+        parseJsonConfigFileContent: () => parseJsonConfigFileContent2,
         parseJsonSourceFileConfigFileContent: () => parseJsonSourceFileConfigFileContent2,
         parseJsonText: () => parseJsonText,
         parseListTypeOption: () => parseListTypeOption2,
@@ -207638,7 +207638,7 @@ ${e3.message}`;
         rangeStartIsOnSameLineAsRangeEnd: () => rangeStartIsOnSameLineAsRangeEnd,
         rangeStartPositionsAreOnSameLine: () => rangeStartPositionsAreOnSameLine,
         readBuilderProgram: () => readBuilderProgram2,
-        readConfigFile: () => readConfigFile3,
+        readConfigFile: () => readConfigFile2,
         readHelper: () => readHelper2,
         readJson: () => readJson4,
         readJsonConfigFile: () => readJsonConfigFile2,
@@ -207793,7 +207793,7 @@ ${e3.message}`;
         symbolToDisplayParts: () => symbolToDisplayParts2,
         syntaxMayBeASICandidate: () => syntaxMayBeASICandidate2,
         syntaxRequiresTrailingSemicolonOrASI: () => syntaxRequiresTrailingSemicolonOrASI2,
-        sys: () => sys2,
+        sys: () => sys,
         sysLog: () => sysLog2,
         tagNamesAreEquivalent: () => tagNamesAreEquivalent,
         takeWhile: () => takeWhile,
@@ -209989,7 +209989,7 @@ ${e3.message}`;
         parseIsolatedEntityName: () => parseIsolatedEntityName,
         parseIsolatedJSDocComment: () => parseIsolatedJSDocComment,
         parseJSDocTypeExpressionForTests: () => parseJSDocTypeExpressionForTests,
-        parseJsonConfigFileContent: () => parseJsonConfigFileContent3,
+        parseJsonConfigFileContent: () => parseJsonConfigFileContent2,
         parseJsonSourceFileConfigFileContent: () => parseJsonSourceFileConfigFileContent2,
         parseJsonText: () => parseJsonText,
         parseListTypeOption: () => parseListTypeOption2,
@@ -210042,7 +210042,7 @@ ${e3.message}`;
         rangeStartIsOnSameLineAsRangeEnd: () => rangeStartIsOnSameLineAsRangeEnd,
         rangeStartPositionsAreOnSameLine: () => rangeStartPositionsAreOnSameLine,
         readBuilderProgram: () => readBuilderProgram2,
-        readConfigFile: () => readConfigFile3,
+        readConfigFile: () => readConfigFile2,
         readHelper: () => readHelper2,
         readJson: () => readJson4,
         readJsonConfigFile: () => readJsonConfigFile2,
@@ -210197,7 +210197,7 @@ ${e3.message}`;
         symbolToDisplayParts: () => symbolToDisplayParts2,
         syntaxMayBeASICandidate: () => syntaxMayBeASICandidate2,
         syntaxRequiresTrailingSemicolonOrASI: () => syntaxRequiresTrailingSemicolonOrASI2,
-        sys: () => sys2,
+        sys: () => sys,
         sysLog: () => sysLog2,
         tagNamesAreEquivalent: () => tagNamesAreEquivalent,
         takeWhile: () => takeWhile,
@@ -486520,7 +486520,7 @@ var environmentPlugin = (data) => ({
 
 // packages/workspace-tools/src/utils/run-tsup-build.ts
 var import_tsup = __toESM(require_dist7());
-var ts8 = __toESM(require_typescript());
+var import_typescript = __toESM(require_typescript());
 
 // packages/workspace-tools/src/utils/file-path-utils.ts
 var import_node_path4 = require("node:path");
@@ -486646,8 +486646,8 @@ ${options8.banner}
   }
 };
 function getNormalizedTsConfig(context, workspaceRoot, outputPath, options8) {
-  const config = ts8.readConfigFile(options8.tsConfig, ts8.sys.readFile).config;
-  const tsConfig = ts8.parseJsonConfigFileContent(
+  const config = import_typescript.default.readConfigFile(options8.tsConfig, import_typescript.default.sys.readFile).config;
+  const tsConfig = import_typescript.default.parseJsonConfigFileContent(
     {
       ...config,
       compilerOptions: {
@@ -486670,7 +486670,7 @@ function getNormalizedTsConfig(context, workspaceRoot, outputPath, options8) {
         declarationDir: (0, import_devkit3.joinPathFragments)(workspaceRoot, "tmp", ".tsup", "declaration")
       }
     },
-    ts8.sys,
+    import_typescript.default.sys,
     (0, import_node_path5.dirname)(options8.tsConfig)
   );
   tsConfig.options.pathsBasePath = workspaceRoot;
@@ -493097,21 +493097,6 @@ ${externalDependencies.map((dep) => {
       return `name: ${dep.name}, node: ${dep.node}, outputs: ${dep.outputs}`;
     }).join("\n")}`
   );
-  const prettier = await Promise.resolve().then(() => (init_prettier(), prettier_exports));
-  const prettierOptions = {
-    plugins: ["prettier-plugin-packagejson"],
-    trailingComma: "none",
-    tabWidth: 2,
-    semi: true,
-    singleQuote: false,
-    quoteProps: "preserve",
-    insertPragma: false,
-    bracketSameLine: true,
-    printWidth: 80,
-    bracketSpacing: true,
-    arrowParens: "avoid",
-    endOfLine: "lf"
-  };
   let entryPoints = [];
   if (options8.entry) {
     entryPoints.push(options8.entry);
@@ -493253,13 +493238,7 @@ ${externalDependencies.map((dep) => {
     packageJson.repository.directory ??= projectRoot ? projectRoot : (0, import_devkit4.joinPathFragments)("packages", context.projectName);
     const packageJsonPath = (0, import_devkit4.joinPathFragments)(context.root, options8.outputPath, "package.json");
     writeDebug(config, `\u26A1 Writing package.json file to: ${packageJsonPath}`);
-    (0, import_node_fs3.writeFileSync)(
-      packageJsonPath,
-      await prettier.format(JSON.stringify(packageJson), {
-        ...prettierOptions,
-        parser: "json"
-      })
-    );
+    (0, import_node_fs3.writeFileSync)(packageJsonPath, JSON.stringify(packageJson));
   } else {
     writeWarning(config, "Skipping writing to package.json file");
   }
@@ -493274,15 +493253,9 @@ ${externalDependencies.map((dep) => {
       files.map(
         async (file) => (0, import_fs_extra.writeFile)(
           file,
-          await prettier.format(
-            `${options8.banner ? options8.banner.startsWith("//") ? options8.banner : `// ${options8.banner}` : ""}
+          `${options8.banner ? options8.banner.startsWith("//") ? options8.banner : `// ${options8.banner}` : ""}
 
 ${(0, import_node_fs3.readFileSync)(file, "utf-8")}`,
-            {
-              ...prettierOptions,
-              parser: "typescript"
-            }
-          ),
           "utf-8"
         )
       )