siomplify release process

Author: matuscongrady

.github/workflows/README.md

@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { BIN_DIST_FOLDER_PATH } from '@shared/naming/project-fs-paths';
+import { DIST_PACKAGE_FOLDER_PATH } from '@shared/naming/project-fs-paths';
 import { getPlatform } from '@shared/utils/bin-executable';
 import { logInfo, logSuccess } from '@shared/utils/logging';
 import { archiveItem } from '@shared/utils/zip';
@@ -34,7 +34,7 @@ const buildEverything = async () => {
 
   logInfo(`Building binary for platform: ${platform}, version: ${version}`);
 
-  const distFolderPath = BIN_DIST_FOLDER_PATH;
+  const distFolderPath = DIST_PACKAGE_FOLDER_PATH;
   await remove(distFolderPath);
 
   const platformDistFolderPath = await buildBinaryFile({

scripts/build-dist-package.ts

@@ -4,13 +4,11 @@ import { NPM_PACKAGE_JSON_SOURCE_PATH, NPM_RELEASE_FOLDER_PATH } from '../shared
 import { logInfo, logSuccess } from '../shared/utils/logging';
 import { buildNpmMainExport } from './build-npm-main-export';
 import { buildNpmSdkExport } from './build-npm-sdk-export.js';
-import { packageHelperLambdas } from './package-helper-lambdas.js';
 import { getVersion } from './release/args';
 
 export const copySdkPackageJson = async (version?: string) => {
   const packageJson = await readJson(NPM_PACKAGE_JSON_SOURCE_PATH);
 
-  // Update version if provided
   if (version) {
     packageJson.version = version;
   }
@@ -35,7 +33,6 @@ export const buildNpm = async ({ version }: { version?: string } = {}) => {
   await Promise.all([
     buildNpmMainExport(),
     buildNpmSdkExport({ distFolderPath: NPM_RELEASE_FOLDER_PATH }),
-    packageHelperLambdas({ isDev: false, distFolderPath: NPM_RELEASE_FOLDER_PATH }),
     copySdkPackageJson(versionToUse),
     copyBinWrapper()
   ]);

scripts/build-npm.ts

@@ -1,14 +1,14 @@
-import { CLI_DIST_PATH, CLI_SOURCE_PATH, DIST_FOLDER_PATH } from '@shared/naming/project-fs-paths';
+import { CLI_SOURCE_PATH, DEV_TMP_FOLDER_PATH } from '@shared/naming/project-fs-paths';
 import { dynamicRequire } from '@shared/utils/fs-utils';
 import { logError, logInfo, logWarn } from '@shared/utils/logging';
 import packageJson from '../package.json';
-import { generateSourceMapInstall } from './build-cli-sources';
 import { packageHelperLambdas } from './package-helper-lambdas';
+import { generateSourceMapInstall } from './release/build-cli-sources';
 
 const buildSource = async () => {
   const result = await Bun.build({
     entrypoints: [CLI_SOURCE_PATH],
-    outdir: CLI_DIST_PATH,
+    outdir: DEV_TMP_FOLDER_PATH,
     target: 'bun',
     minify: false,
     sourcemap: 'inline',
@@ -20,20 +20,21 @@ const buildSource = async () => {
   if (!result.success) {
     throw new Error(`Failed to build source: ${result.logs.map((log) => log.message).join('\n')}`);
   }
+  return result.outputs[0].path;
 };
 
 export const runDev = async () => {
-  await Promise.all([
+  const [cliDistPath] = await Promise.all([
     buildSource(),
-    packageHelperLambdas({ isDev: true, distFolderPath: DIST_FOLDER_PATH }),
-    generateSourceMapInstall({ distFolderPath: DIST_FOLDER_PATH })
+    packageHelperLambdas({ isDev: true, distFolderPath: DEV_TMP_FOLDER_PATH }),
+    generateSourceMapInstall({ distFolderPath: DEV_TMP_FOLDER_PATH })
   ]);
 
   logInfo('----- RUN -----');
   try {
     process.env.STP_DEV_MODE = 'true';
     const { runUsingCli } = dynamicRequire({
-      filePath: CLI_DIST_PATH
+      filePath: cliDistPath
     }) as typeof import('../src/api/cli');
     await runUsingCli();
     logInfo('----- FINISHED -----');

scripts/dev.ts

@@ -1,8 +1,6 @@
 import { arch } from 'node:os';
-import { basename, dirname, join } from 'node:path';
+import { basename, join } from 'node:path';
 import {
-  CLI_BUILD_DIST_FOLDER_PATH,
-  CLI_DIST_PATH,
   COMPLETIONS_SCRIPTS_PATH,
   CONFIG_SCHEMA_PATH,
   DIST_FOLDER_PATH,
@@ -97,11 +95,11 @@ export const EXECUTABLE_FILE_PATTERNS = [
   '*/exec.exe'
 ];
 
-export const generateSourceMapInstall = async ({ distFolderPath }: { distFolderPath?: string }) => {
+export const generateSourceMapInstall = async ({ distFolderPath }: { distFolderPath: string }) => {
   logInfo('Generating source map install file...');
   await buildEsCode({
     rawCode: 'require("source-map-support").install({ environment: "node", handleUncaughtExceptions: false });',
-    distPath: join(distFolderPath || CLI_BUILD_DIST_FOLDER_PATH, SOURCE_MAP_INSTALL_FILE_NAME),
+    distPath: join(distFolderPath, SOURCE_MAP_INSTALL_FILE_NAME),
     externals: ['path'],
     excludeDependencies: ['path'],
     sourceMaps: 'disabled',
@@ -357,12 +355,6 @@ export const createReleaseDataFile = async ({
   logSuccess('Release data file created successfully.');
 };
 
-export const copyLegalComments = async ({ distFolderPath }: { distFolderPath?: string }) => {
-  logInfo('Copying config schema...');
-  await copy(join(dirname(CLI_DIST_PATH), `${basename(CLI_DIST_PATH)}.LEGAL.txt`), join(distFolderPath, 'LEGAL.txt'));
-  logSuccess('Config schema copied successfully.');
-};
-
 export const getPlatformsToBuildFor = ({
   presetPlatforms
 }: {

scripts/release/build-cli-sources.ts

@@ -1,5 +1,5 @@
 import { basename, join } from 'node:path';
-import { BIN_DIST_FOLDER_PATH } from '@shared/naming/project-fs-paths';
+import { DIST_PACKAGE_FOLDER_PATH } from '@shared/naming/project-fs-paths';
 import { createRelease, getReleaseByTag } from '@shared/utils/github-api';
 import { uploadReleaseAsset } from '@shared/utils/github-file-manipulation';
 import { logInfo, logSuccess } from '@shared/utils/logging';
@@ -31,12 +31,12 @@ export const createGithubRelease = async ({ version, isPrerelease }: { version:
 
 export const uploadReleaseAssets = async ({ releaseId }: { uploadUrl: string; releaseId: number }) => {
   logInfo('Uploading release assets...');
-  const allItems = await readdir(BIN_DIST_FOLDER_PATH);
+  const allItems = await readdir(DIST_PACKAGE_FOLDER_PATH);
 
   // Filter to only archive files (.tar.gz and .zip), skip directories
   const assetsToUpload: string[] = [];
   for (const item of allItems) {
-    const absolutePath = join(BIN_DIST_FOLDER_PATH, item);
+    const absolutePath = join(DIST_PACKAGE_FOLDER_PATH, item);
     const stats = await stat(absolutePath);
     if (stats.isFile() && (item.endsWith('.tar.gz') || item.endsWith('.zip'))) {
       assetsToUpload.push(item);
@@ -45,7 +45,7 @@ export const uploadReleaseAssets = async ({ releaseId }: { uploadUrl: string; re
 
   await Promise.all(
     assetsToUpload.map((assetName) => {
-      const absoluteAssetPath = join(BIN_DIST_FOLDER_PATH, assetName);
+      const absoluteAssetPath = join(DIST_PACKAGE_FOLDER_PATH, assetName);
       return uploadReleaseAsset({
         assetName: basename(assetName),
         sourceFilePath: absoluteAssetPath,

scripts/release/github.ts

@@ -6,14 +6,14 @@ export const BRIDGE_FILES_FOLDER_NAME = 'bridge-files';
 export const HELPER_LAMBDAS_FOLDER_NAME = 'helper-lambdas';
 const JSON_SCHEMAS_FOLDER_NAME = 'schemas';
 const SOURCE_MAP_INSTALL_FILENAME = 'source-map-install.js';
-const BINARY_DIST_FOLDER_NAME = '__binary-dist';
 const CLI_RELEASE_FOLDER_NAME = '__release';
 const SDK_RELEASE_FOLDER_NAME = '__release-npm';
 export const STARTER_PROJECTS_METADATA_FOLDER_NAME = 'starter-projects-metadata.json';
 
 export const DIST_FOLDER_PATH = join(process.cwd(), DIST_FOLDER_NAME);
+export const DEV_TMP_FOLDER_PATH = join(process.cwd(), 'node_modules', '__dev-tmp');
 export const CLI_BUILD_DIST_FOLDER_PATH = join(process.cwd(), '__cli-dist', 'stacktape');
-export const BIN_DIST_FOLDER_PATH = join(process.cwd(), BINARY_DIST_FOLDER_NAME);
+export const DIST_PACKAGE_FOLDER_PATH = join(process.cwd(), '__dist');
 export const CLI_RELEASE_FOLDER_PATH = join(process.cwd(), CLI_RELEASE_FOLDER_NAME);
 export const NPM_RELEASE_FOLDER_PATH = join(process.cwd(), SDK_RELEASE_FOLDER_NAME);
 export const PUBLISH_GITHUB_REPO_DIR_PATH = join(process.cwd(), '__publish-gh-repo-dir');
@@ -29,7 +29,6 @@ export const RESOURCES_DESCRIPTION_DIST_PATH = join(process.cwd(), '.resource-de
 export const BRIDGE_FILES_SOURCE_FOLDER_PATH = join(SOURCE_FOLDER_NAME, 'utils', BRIDGE_FILES_FOLDER_NAME);
 export const HELPER_LAMBDAS_DIST_FOLDER_PATH = join(DIST_FOLDER_PATH, HELPER_LAMBDAS_FOLDER_NAME);
 export const HELPER_LAMBDAS_SOURCE_FOLDER_PATH = join(process.cwd(), HELPER_LAMBDAS_FOLDER_NAME);
-export const CLI_DIST_PATH = join(DIST_FOLDER_PATH, 'cli.js');
 export const GENERATED_FILES_FOLDER_PATH = join(process.cwd(), '@generated');
 export const JSON_SCHEMAS_FOLDER_PATH = join(process.cwd(), '@generated', JSON_SCHEMAS_FOLDER_NAME);
 export const PACK_GENERATED_FOLDER_PATH = join(process.cwd(), '@generated', 'pack');