cleanup for release process (#933)

justincorrigible · web-flow · commit a40f2cedff88 · 2025-04-07T12:17:36.000-04:00
diff --git a/docker/Dockerfile.jenkins b/docker/Dockerfile.jenkins
@@ -8,7 +8,7 @@ ARG ES_HOST=http://localhost:9200
 #######################################################
 # Builder
 #######################################################
-FROM node:18-alpine as builder
+FROM node:22-alpine as builder
 
 ARG APP_FOLDER
 ARG APP_GID
@@ -43,4 +43,4 @@ USER $APP_USER
 
 EXPOSE 5050
 
-CMD make _ping_elasticsearch_server -e && npm run server:prod
+CMD make _ping_elasticsearch_server -e && npm run server
diff --git a/docker/Dockerfile.jenkins.dockerignore b/docker/Dockerfile.jenkins.dockerignore
@@ -1,8 +1,7 @@
 .*
-Dockerfile
 docker-compose.yml
 docker
-docks
+docs
 integration-tests
 modules/**/*
 !modules/server
diff --git a/docker/Dockerfile.local b/docker/Dockerfile.local
@@ -8,7 +8,7 @@ ARG ES_HOST=http://localhost:9200
 #######################################################
 # Builder
 #######################################################
-FROM node:18-alpine as builder
+FROM node:22-alpine as builder
 
 ARG APP_FOLDER
 ARG APP_GID
@@ -46,4 +46,4 @@ USER $APP_USER
 
 EXPOSE 5050
 
-CMD make _ping_elasticsearch_server -e && npm run server:prod
+CMD make _ping_elasticsearch_server -e && npm run server
diff --git a/docker/Dockerfile.local.dockerignore b/docker/Dockerfile.local.dockerignore
@@ -1,9 +1,9 @@
-Dockerfile
 docker-compose.yml
 .git
 **/node_modules
 **/dist
 docker
+docs
 !docker/ui/**
 !docker/test/**
 .npmrc
diff --git a/docs/setup.md b/docs/setup.md
@@ -111,7 +111,7 @@ We'll use the Overture Conductor service, a flexible Docker Compose setup, to sp
 3.  Install the required npm packages:
 
     ```bash
-    npm ci
+    npm install
     ```
 
     :::warning
@@ -120,13 +120,7 @@ We'll use the Overture Conductor service, a flexible Docker Compose setup, to sp
 
     :::
 
-4.  Bootstrap the Arranger repository:
-
-    ```bash
-    npm run bootstrap
-    ```
-
-5.  Run the Arranger server:
+4.  Run the Arranger server:
 
     ```bash
     npm run server
diff --git a/modules/components/.npmignore b/modules/components/.npmignore
@@ -1,8 +1,12 @@
+.storybook/
 __mocks__/
+public/
 src/
 stories/
-.storybook/
 
 .env*
 .gitignore
 *config.js*
+*config.ts*
+
+tsconfig.*
diff --git a/modules/components/nope.eslintrcnope.jsnope b/modules/components/nope.eslintrcnope.jsnope
diff --git a/modules/components/package.json b/modules/components/package.json
@@ -7,20 +7,15 @@
 		"access": "public"
 	},
 	"scripts": {
-		"build": "babel src --copy-files --extensions .tsx,.ts,.js,.jsx --out-dir dist",
-		"build:production": "npm run build && npm run declarations -- --project tsconfig.release.json",
-		"build-storybook": "build-storybook -s ./public",
-		"cleanDist": "rm -rf dist",
-		"dashboard": "STORYBOOK_DASHBOARD=true start-storybook -p 6060 -c .storybook -s ./public",
-		"declarations": "tsc --emitDeclarationOnly",
-		"ifPublish:declarations": "if test \"$PUBLISH_DECLARATIONS\" = \"true\" ; then (npm run -s declarations || true) ; fi",
-		"lint": "eslint ./src --ext=.jsx,.js,.tsx,.ts",
+		"build:babel": "babel src --copy-files --extensions .tsx,.ts,.js,.jsx --out-dir dist",
+		"build:declarations": "tsc --emitDeclarationOnly --project tsconfig.release.json",
+		"build": "concurrently -n babel,tsc -c yellow,blue -P 'npm:build:babel -- {@}' 'npm:build:declarations -- {@}' --",
+		"nuke:dist": "rm -rf dist",
 		"patchTS": "ts-patch install -s",
-		"portal": "STORYBOOK_PORTAL=true start-storybook -p 7070 -c .storybook -s ./public",
-		"storybook": "start-storybook -p 8080 -c .storybook -s ./public",
+		"prepare": "npm run patchTS",
 		"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest --config=jest.config.ts",
-		"watch": "npm run cleanDist && (concurrently -n babel,tsc -c yellow,blue \"npm run build -- --watch\" \"npm run declarations -- --watch\")",
-		"watchnew": "npm run cleanDist && (concurrently -n babel,tsc -c yellow,blue \"npm run build -- --watch\")"
+		"test:watch": "npm test -- --watch",
+		"watch": "npm run nuke:dist && npm run build -- --watch"
 	},
 	"repository": {
 		"type": "git",
diff --git a/modules/server/.npmignore b/modules/server/.npmignore
@@ -1,8 +1,9 @@
-configs/
+configTemplates/
 src/
 
-.eslintrc*
+.env*
+*config.js*
+*config.ts*
 
-./index.js
-./index.ts
-tsconfig*
+index.ts
+tsconfig*
diff --git a/modules/server/package.json b/modules/server/package.json
@@ -13,14 +13,15 @@
 		"access": "public"
 	},
 	"scripts": {
-		"build": "tsc --build",
-		"build:production": "tsc --project tsconfig.release.json",
-		"cleanDist": "rm -rf dist",
+		"build": "tsc --project tsconfig.release.json",
+		"dev": "NODE_ENV=development tsx watch --include './src/**/*' ./index.ts",
+		"nuke:dist": "rm -rf dist",
 		"patchTS": "ts-patch install -s",
-		"start": "NODE_ENV=development tsx watch --include './src/**/*' ./index.ts",
-		"start:prod": "tsx ./index.ts",
+		"prepare": "npm run patchTS",
+		"start": "tsx ./index.ts",
 		"test": "tsx --test",
-		"watch": "npm run cleanDist && npm run build -- --watch"
+		"test:watch": "npm test -- --watch",
+		"watch": "npm run nuke:dist && npm run build -- --watch"
 	},
 	"repository": {
 		"type": "git",
diff --git a/modules/server/tsconfig.release.json b/modules/server/tsconfig.release.json
@@ -1,5 +1,5 @@
 {
-	"exclude": ["./index.ts"],
+	"exclude": ["./index.ts", "**/__tests__/*"],
 	"extends": "./tsconfig.json",
 	"compilerOptions": {
 		"baseUrl": "./" /* Specify the base directory to resolve non-relative module names. */,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,6 +3,7 @@
 		"@eslint/js": "^9.18.0",
 		"@tsconfig/node22": "^22.0.0",
 		"@types/node": "^22.13.10",
+		"concurrently": "^9.1.2",
 		"eslint": "^9.18.0",
 		"eslint-config-prettier": "^10.1.1",
 		"eslint-import-resolver-typescript": "^3.7.0",
@@ -23,19 +24,17 @@
 		"url": "https://github.com/overture-stack/arranger.git"
 	},
 	"scripts": {
-		"all": "npm run start --modules",
 		"components:watch": "npm run watch --w modules/components",
-		"watch": "npm run watch --ws",
-		"publish::ci": "npm publish --ws --if-present",
+		"modules:build": "npm run build --w modules",
+		"modules:tag": "npm version --ws --force-publish --yes",
+		"modules:watch": "npm run watch --w modules",
 		"nuke:nodeModules": "find . -name 'node_modules' -type d -prune -exec rm -rf '{}' +",
-		"prepare": "npm run build:production --w modules",
-		"reset": "npm run nuke:nodeModules && npm run nuke:Dist --ws --if-present",
+		"publish::ci": "npm publish --ws --if-present",
+		"reset": "npm run nuke:nodeModules && npm run nuke:dist --ws --if-present",
 		"test": "npm run test --ws --if-present",
-		"test:watch": "npm run test:watch --ws --if-present",
+		"test:watch": "concurrently --group \"npm:modules:watch\" --group \"npm:test:watch --w modules/components -w integration-tests/import\"",
 		"server": "npm run start --w modules/server",
-		"server:prod": "npm run start:prod --w modules/server",
-		"server:watch": "npm run watch --w modules/server",
-		"tag": "npm version --ws --force-publish --yes"
+		"server:watch": "npm run watch --w modules/server"
 	},
 	"type": "module",
 	"workspaces": [
