Consistently use build/ directory for built code

.dockerignore

@@ -18,6 +18,5 @@ coop.code-workspace
 server/coverage
 **/node_modules/
 server/reports
-**/transpiled/
 models-service
 **/build

.github/workflows/e2e.yaml

@@ -110,7 +110,7 @@ jobs:
         # Redirect output to files so the backgrounded processes don't hold this
         # step's stdout pipe open (which would hang the step).
         run: |
-          (cd server && node --env-file=.env transpiled/bin/www.js) > /tmp/server.log 2>&1 &
+          (cd server && node --env-file=.env build/bin/www.js) > /tmp/server.log 2>&1 &
           (cd client && npm start) > /tmp/client.log 2>&1 &
           # Wait (up to 120s) for the API (tcp 8080) and client (http 3000) to be
           # ready. A built-in shell loop avoids fetching an undeclared dependency

.gitignore

@@ -35,7 +35,6 @@ yarn-error.log*
 db/build
 .idea/
 
-transpiled
 build/
 .eslintcache
 *.tsbuildinfo

Dockerfile

@@ -23,7 +23,7 @@ WORKDIR /app
 RUN apt-get update && apt-get install -y --no-install-recommends dumb-init && rm -rf /var/lib/apt/lists/*
 COPY --from=build_backend ["/app/package.json", "/app/package-lock.json", "./"]
 RUN npm ci --omit=dev
-COPY --from=build_backend /app/transpiled ./
+COPY --from=build_backend /app/build ./
 
 # See https://github.com/Yelp/dumb-init
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]

client/package.json

@@ -16,7 +16,7 @@
     "knip": "knip"
   },
   "author": "Roostorg",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "dependencies": {
     "@apollo/client": "^3.14.1",
     "@googlemaps/js-api-loader": "^1.16.10",

db/package.json

@@ -16,7 +16,7 @@
     "knip": "knip"
   },
   "author": "Roostorg",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "dependencies": {
     "@clickhouse/client": "^1.23.1",
     "@roostorg/db-migrator": "^1.1.1",

migrator/package.json

@@ -23,7 +23,7 @@
     "directory": "migrator"
   },
   "author": "Roostorg",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "dependencies": {
     "@total-typescript/ts-reset": "^0.6.1",
     "cassandra-driver": "^4.8.0",

nodejs-instrumentation/Dockerfile

@@ -11,9 +11,9 @@
 #   used and must be availabe in the image.
 FROM node:24.21.0 AS build
 
-WORKDIR /operator-build
+WORKDIR /autoinstrumentation
 
-COPY package*.json .
+COPY ["package.json", "package-lock.json", "./"]
 
 RUN --mount=type=cache,target=/root/.npm npm ci --prefer-offline
 
@@ -25,8 +25,9 @@ RUN npm prune --omit=dev
 
 FROM busybox:1.38.0
 
-COPY --from=build /operator-build/node_modules /autoinstrumentation/node_modules
-COPY --from=build /operator-build/transpiled/ /autoinstrumentation
+COPY --from=build /autoinstrumentation/node_modules /autoinstrumentation/node_modules
+COPY --from=build /autoinstrumentation/build/ /autoinstrumentation
+COPY --from=build /autoinstrumentation/package*.json /autoinstrumentation/
 
 RUN chmod -R go+r /autoinstrumentation
 

nodejs-instrumentation/package.json

@@ -2,13 +2,13 @@
   "name": "nodejs-instrumentation",
   "version": "1.1.0",
   "description": "",
-  "main": "transpiled/autoinstrumentation.js",
+  "private": true,
   "scripts": {
     "build": "tsc",
-    "clean": "rm -rf transpiled *.tsbuildinfo"
+    "clean": "rm -rf build *.tsbuildinfo"
   },
   "author": "Roostorg",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/auto-instrumentations-node": "^0.80.0",

nodejs-instrumentation/tsconfig.json

@@ -5,7 +5,7 @@
     "moduleResolution": "NodeNext",
     "lib": ["ES2022"],
     "rootDir": "src",
-    "outDir": "transpiled",
+    "outDir": "build",
     "composite": true,
     "declaration": true,
     "declarationMap": true,

server/.eslintrc.cjs

@@ -392,7 +392,7 @@ module.exports = {
     '*.d.ts',
     '.eslintrc.cjs',
     '.eslintformat.js',
-    'transpiled/',
+    'build/',
     'coverage/',
   ],
   plugins: [

server/.gitignore

@@ -1,7 +1,6 @@
 node_modules/
 build/
 .eslintcache
-transpiled/
 reports
 
 # Playwright e2e artifacts

server/e2e/fixtures/coop.ts

@@ -7,14 +7,14 @@ import { jsonStringify } from '../../utils/encoding.js';
 export { jsonStringify };
 
 /**
- * Server runtime is loaded from the COMPILED output (`transpiled/`), not the TS
+ * Server runtime is loaded from the COMPILED output (`build/`), not the TS
  * source, so we have to do some ugly type casting here.
  */
-const TRANSPILED = '../../transpiled';
+const BUILD_DIR = '../../build';
 
 async function importIocContainer() {
   return (await import(
-    `${TRANSPILED}/iocContainer/index.js`
+    `${BUILD_DIR}/iocContainer/index.js`
   )) as typeof import('../../iocContainer/index.js');
 }
 
@@ -28,27 +28,27 @@ async function importSeedHelpers() {
     createMrtQueue,
     itemSubmissionQueue,
   ] = await Promise.all([
-    import(`${TRANSPILED}/test/fixtureHelpers/createOrg.js`) as Promise<
+    import(`${BUILD_DIR}/test/fixtureHelpers/createOrg.js`) as Promise<
       typeof import('../../test/fixtureHelpers/createOrg.js')
     >,
-    import(`${TRANSPILED}/services/userManagementService/index.js`) as Promise<
+    import(`${BUILD_DIR}/services/userManagementService/index.js`) as Promise<
       typeof import('../../services/userManagementService/index.js')
     >,
     import(
-      `${TRANSPILED}/graphql/datasources/userKyselyPersistence.js`
+      `${BUILD_DIR}/graphql/datasources/userKyselyPersistence.js`
     ) as Promise<
       typeof import('../../graphql/datasources/userKyselyPersistence.js')
     >,
-    import(`${TRANSPILED}/graphql/datasources/rolePersistence.js`) as Promise<
+    import(`${BUILD_DIR}/graphql/datasources/rolePersistence.js`) as Promise<
       typeof import('../../graphql/datasources/rolePersistence.js')
     >,
-    import(`${TRANSPILED}/test/fixtureHelpers/createRule.js`) as Promise<
+    import(`${BUILD_DIR}/test/fixtureHelpers/createRule.js`) as Promise<
       typeof import('../../test/fixtureHelpers/createRule.js')
     >,
-    import(`${TRANSPILED}/test/fixtureHelpers/createMrtQueue.js`) as Promise<
+    import(`${BUILD_DIR}/test/fixtureHelpers/createMrtQueue.js`) as Promise<
       typeof import('../../test/fixtureHelpers/createMrtQueue.js')
     >,
-    import(`${TRANSPILED}/queues/itemSubmissionQueue.js`) as Promise<
+    import(`${BUILD_DIR}/queues/itemSubmissionQueue.js`) as Promise<
       typeof import('../../queues/itemSubmissionQueue.js')
     >,
   ]);

server/eslint.config.mjs

@@ -29,7 +29,7 @@ export default [
       'eslint.config.mjs',
       '.eslintrc.cjs',
       '.eslintformat.js',
-      'transpiled/**',
+      'build/**',
       'coverage/**',
       'lib/cache/**',
     ],

server/jest.config.cjs

@@ -122,7 +122,7 @@ module.exports = {
   // `/e2e/` holds Playwright specs (their own runner); never run them under jest.
   testPathIgnorePatterns: [
     '/node_modules/',
-    '/transpiled/',
+    '/build/',
     '/e2e/',
     '.integ.test.ts$',
   ],

server/jest.integ.config.cjs

@@ -121,7 +121,7 @@ module.exports = {
   // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
   // We ignore integration tests here, as they should only be run explicitly.
   // `/e2e/` holds Playwright specs (their own runner); never run them under jest.
-  testPathIgnorePatterns: ['/node_modules/', '/transpiled/', '/e2e/'],
+  testPathIgnorePatterns: ['/node_modules/', '/build/', '/e2e/'],
 
   // This option allows the use of a custom results processor
   // testResultsProcessor: undefined,

server/package.json

@@ -5,8 +5,8 @@
   "type": "module",
   "scripts": {
     "build": "tsc",
-    "start": "tsc-watch --onSuccess \"node --trace-warnings --env-file-if-exists=.env ./transpiled/bin/www.js\"",
-    "start:trace": "tsc-watch --onSuccess \"node --trace-warnings --env-file-if-exists=.env --require ../nodejs-instrumentation/transpiled/autoinstrumentation.js ./transpiled/bin/www.js\"",
+    "start": "tsc-watch --onSuccess \"node --trace-warnings --env-file-if-exists=.env ./build/bin/www.js\"",
+    "start:trace": "tsc-watch --onSuccess \"node --trace-warnings --env-file-if-exists=.env --require ../nodejs-instrumentation/build/autoinstrumentation.js ./build/bin/www.js\"",
     "test": "npm run test:local",
     "test:local": "NODE_OPTIONS=\"--no-warnings --loader ts-node/esm\" node --env-file-if-exists=.env node_modules/.bin/jest --watch --detectOpenHandles",
     "test:prepush": "NODE_OPTIONS=\"--no-warnings --loader ts-node/esm\" node --env-file-if-exists=.env node_modules/.bin/jest --detectOpenHandles --no-cache --forceExit",
@@ -25,7 +25,7 @@
     "knip": "knip"
   },
   "author": "Roostorg",
-  "license": "ISC",
+  "license": "Apache-2.0",
   "dependencies": {
     "@apollo/server": "^5.5.0",
     "@as-integrations/express5": "^1.1.2",

server/tsconfig.json

@@ -7,7 +7,12 @@
       "ES2022",
       "DOM" /* needed for s3 sdk, which references dom readablestream */
     ],
-    "outDir": "./transpiled",
+    "outDir": "./build",
+    // Pin the source root so the layout under `outDir` is explicit rather than
+    // inferred from the common ancestor of the input files (which shifts if a
+    // file is ever added outside the current root). Also required once
+    // `package.json` `imports` entries are resolved against `outDir`.
+    "rootDir": ".",
     "declaration": false,
     "strict": true,
     "esModuleInterop": true,

types/package.json

@@ -3,12 +3,12 @@
   "type": "module",
   "version": "2.4.0",
   "description": "Shared TypeScript types for Coop: schema primitives, signal data maps, and integration contracts.",
-  "module": "transpiled/index.js",
-  "typings": "./transpiled/index.d.ts",
+  "module": "build/index.js",
+  "typings": "./build/index.d.ts",
   "scripts": {
     "build": "tsc",
     "prepublishOnly": "npm run build",
-    "test": "npm run build && node --test transpiled/test_scripts/"
+    "test": "npm run build && node --test build/test_scripts/"
   },
   "repository": {
     "type": "git",
@@ -17,9 +17,9 @@
   },
   "author": "Roostorg",
   "files": [
-    "transpiled"
+    "build"
   ],
-  "license": "ISC",
+  "license": "Apache-2.0",
   "devDependencies": {
     "@types/node": "^20.3.1",
     "typescript": "^4.9.3"
@@ -29,8 +29,8 @@
   },
   "exports": {
     ".": {
-      "import": "./transpiled/index.js",
-      "types": "./transpiled/index.d.ts"
+      "import": "./build/index.js",
+      "types": "./build/index.d.ts"
     }
   },
   "dependencies": {

types/tsconfig.json

@@ -4,7 +4,7 @@
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "lib": ["ES2022"],
-    "outDir": "./transpiled",
+    "outDir": "./build",
     "declaration": true,
     "strict": true,
     "esModuleInterop": true,
@@ -18,5 +18,5 @@
     "typeRoots": ["./node_modules/@types"]
   },
   "include": ["./**/*.ts", "./**/*.cts", "./**/*.mts"],
-  "exclude": ["node_modules", "package.json", "package-lock.json", "transpiled"]
+  "exclude": ["node_modules", "package.json", "package-lock.json", "build"]
 }