Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
f78c3be
initial commit for verify
jasonmorais May 19, 2026
09e9ab0
staging changes for portless modification - using worktree as an env …
jasonmorais May 19, 2026
b4db123
fixes for e2e tests along with overall pattern cleanup
jasonmorais May 21, 2026
2d54c57
overall improvements to workspace files, along with implementation of…
jasonmorais May 26, 2026
6c415ea
small fixes for build file issue
jasonmorais May 26, 2026
395bfcd
small improvements based on my comments, simplified overcomplicated l…
jasonmorais May 27, 2026
628694e
Merge branch 'main' of github.com:CellixJs/cellixjs into jason/portle…
jasonmorais May 27, 2026
372b674
Merge remote-tracking branch 'origin/main' into jason/portless-worktrees
jasonmorais May 28, 2026
1522602
retrigger build
jasonmorais May 28, 2026
843f3d0
sourcery suggestions pt1
jasonmorais May 28, 2026
c184d92
sourcery suggestions reound 2 - reusability
jasonmorais May 28, 2026
fabfb36
Update readme.md
jasonmorais May 28, 2026
0b76477
undo tsc to tsgo
jasonmorais May 28, 2026
110f771
fix serenity pattern - use task pattern instead of interaction
jasonmorais May 29, 2026
ba94849
initial commit for verify
jasonmorais Jun 1, 2026
9be2b2d
modularize serenity framework in a way that can be more easily used b…
jasonmorais Jun 2, 2026
865a5c3
reviewed changes on local with opus 4.8, made some adjustments from j…
jasonmorais Jun 2, 2026
c0ab794
made changes regarding infrastructure patterns, simplified what was n…
jasonmorais Jun 3, 2026
de71fea
Merge remote-tracking branch 'origin/main' into jason/serenity-framew…
jasonmorais Jun 3, 2026
a44fbe9
small refactor for test server pattern in api
jasonmorais Jun 3, 2026
0c1ae41
small adjustments based on codex review
jasonmorais Jun 4, 2026
efa9134
initial commit for verify
jasonmorais Jun 4, 2026
dfdfb15
initial script extraction - wip
jasonmorais Jun 4, 2026
0f53ffc
progress - cleaned up cellix package and created ocom package for loc…
jasonmorais Jun 5, 2026
84b7285
made some improvements to patterns for server startup based on api, w…
jasonmorais Jun 9, 2026
b3d9969
some adjustments to package pattern
jasonmorais Jun 9, 2026
6ebc9ce
Merge remote-tracking branch 'origin/jason/serenity-framework-refacto…
jasonmorais Jun 9, 2026
b5840ea
Merge remote-tracking branch 'origin/main' into jason/portless-worktrees
jasonmorais Jun 9, 2026
b28f193
restart build - snyk error, unrelated
jasonmorais Jun 9, 2026
1fc06a6
Merge origin/jason/portless-worktrees into jason/serenity-framework-r…
jasonmorais Jun 9, 2026
58234a1
Merge remote-tracking branch 'origin/main' into jason/portless-worktrees
jasonmorais Jun 10, 2026
e6d1675
Merge remote-tracking branch 'origin/jason/serenity-framework-refacto…
jasonmorais Jun 10, 2026
8aa14d0
adjusted local dev patterns to follow object pattern and extract majo…
jasonmorais Jun 11, 2026
8d1edc2
small adjustents to pattern for easier readability
jasonmorais Jun 11, 2026
31cda3b
made clearer path for how worktree conversion was done - logic was a …
jasonmorais Jun 11, 2026
65c5cd4
Merge origin/jason/portless-worktrees into jason/serenity-framework-r…
jasonmorais Jun 11, 2026
81b337a
small adjustments for readability and stopped export of unused extern…
jasonmorais Jun 16, 2026
5c507b4
Merge remote-tracking branch 'origin/main' into jason/serenity-framew…
jasonmorais Jun 18, 2026
ea2b6a2
pipeline fix
jasonmorais Jun 22, 2026
4770730
small readabiliyy improvements
jasonmorais Jun 22, 2026
e5ba661
Merge remote-tracking branch 'origin/main' into jason/serenity-framew…
jasonmorais Jun 23, 2026
9c556be
copilot suggestions
jasonmorais Jun 23, 2026
2c14eec
retry pipeline due to non explicit error
jasonmorais Jun 23, 2026
7d0782e
Merge origin/jason/serenity-framework-refactor into jason/extract-loc…
jasonmorais Jun 23, 2026
7f099e6
Address PR #270 review feedback: exit-code clobbering and duplicated …
jasonmorais Jun 23, 2026
8a435b1
fix merge conflicts
jasonmorais Jun 24, 2026
4b2dcfd
small fixes
jasonmorais Jun 24, 2026
a9f581c
security fix
jasonmorais Jun 24, 2026
ad4a95a
second attempt for security fix
jasonmorais Jun 24, 2026
cbd2a9d
small adjustments based on gpt 5.5 internal review, fix import
jasonmorais Jun 26, 2026
c53e669
resolve merge conflicts
jasonmorais Jun 29, 2026
dd56e31
removal of redudant flag for worktree in worktree command
jasonmorais Jun 29, 2026
a20138e
Merge remote-tracking branch 'origin/main' into jason/extract-local-d…
jasonmorais Jun 29, 2026
0dd81fc
fix vulnerability
jasonmorais Jun 30, 2026
232c87b
small sourcery feedback adjustment, and small fix for storybook creat…
jasonmorais Jul 1, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
.pnpm-store
.DS_Store
**/coverage
# .gitignore template - https://github.com/github/gitignore/blob/main/Node.gitignore
Expand Down
47 changes: 47 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,58 @@ ignore:
expires: '2026-12-31T00:00:00.000Z'
created: '2026-06-25T00:00:00.000Z'
'SNYK-JS-IMAGESIZE-17295814':
- '* > image-size':
reason: 'Transitive dependency in @docusaurus/mdx-loader and dev build tooling; no upgrade or patch available from upstream. Not exploitable in current usage (build-time image dimension parsing only).'
expires: '2026-09-11T00:00:00.000Z'
created: '2026-06-11T00:00:00.000Z'
- '* > image-size@<=2.0.2':
reason: 'Transitive dependency in vitest@4.1.6; not exploitable in current usage.'
expires: '2026-07-11T00:00:00.000Z'
created: '2026-06-11T10:00:00.000Z'
'SNYK-JS-IMAGESIZE-17295816':
- '* > image-size':
reason: 'Transitive dependency in @docusaurus/mdx-loader and dev build tooling; no upgrade or patch available from upstream. Not exploitable in current usage (build-time image dimension parsing only).'
expires: '2026-09-11T00:00:00.000Z'
created: '2026-06-11T00:00:00.000Z'
- '* > image-size@<=2.0.2':
reason: 'Transitive dependency in vitest@4.1.6; not exploitable in current usage.'
expires: '2026-07-11T00:00:00.000Z'
created: '2026-06-11T10:00:00.000Z'
'SNYK-JS-AZUREIDENTITY-7964589':
- '* > @azure/identity@3.4.2':
reason: 'Transitive dependency via azurite>tedious; upgrade to 4.x is a breaking major-version change incompatible with azurite. Not exploitable in dev-only local storage emulation context.'
expires: '2026-09-16T00:00:00.000Z'
created: '2026-06-16T00:00:00.000Z'
'SNYK-JS-XML2JS-5414874':
- '* > xml2js@0.4.23':
reason: 'Transitive dependency via azurite>@azure/ms-rest-js; 0.4→0.5 is a breaking major change incompatible with @azure/ms-rest-js. Not exploitable in dev-only local storage emulation context.'
expires: '2026-09-16T00:00:00.000Z'
created: '2026-06-16T00:00:00.000Z'
'SNYK-JS-TOUGHCOOKIE-5672873':
- '* > tough-cookie@2.5.5':
reason: 'Transitive dependency via azurite>@azure/ms-rest-js; 2.x→4.x is a breaking major change. Not exploitable in dev-only local storage emulation context.'
expires: '2026-09-16T00:00:00.000Z'
created: '2026-06-16T00:00:00.000Z'
'SNYK-JS-OPENTELEMETRYCORE-17000000':
- '* > @opentelemetry/core':
reason: 'OTEL core 2.8.0+ requires sdk-node upgrade which has TypeScript compilation errors. Tracked alongside SNYK-JS-OPENTELEMETRYEXPORTERPROMETHEUS-16758050 for resolution in the planned OTEL 2.x migration.'
expires: '2026-09-16T00:00:00.000Z'
created: '2026-06-16T00:00:00.000Z'
'SNYK-JS-BABELCORE-17342497':
- '* > @babel/core@7.29.0':
reason: 'No 7.29.x fix release exists; next release is major v8.0.0 which is a breaking change for all transitive consumers. Low severity, dev tooling only.'
expires: '2026-09-16T00:00:00.000Z'
created: '2026-06-16T00:00:00.000Z'
'SNYK-JS-JOI-17317897':
- '* > joi':
reason: 'No upgrade or patch available per Snyk; overridden to 17.13.4 which fixes the pnpm advisory. Accepting residual Snyk finding until a patched release is published.'
expires: '2026-09-16T00:00:00.000Z'
created: '2026-06-16T00:00:00.000Z'
'SNYK-JS-JSYAML-17342520':
- '* > js-yaml@3.14.2':
reason: 'js-yaml 3.x→4.x is a breaking major change for all transitive consumers (gray-matter/Docusaurus chain). js-yaml@4.1.1 patched to 4.2.0 via pnpm override; 3.x path has no safe upgrade.'
expires: '2026-09-16T00:00:00.000Z'
created: '2026-06-16T00:00:00.000Z'
- '* > js-yaml':
reason: 'Transitive in Docusaurus build tooling (gray-matter pins js-yaml@3.x; fix is in 4.2.0, a major bump blocked by gray-matter). Build-time parsing of repository-controlled input only.'
expires: '2026-09-18T00:00:00.000Z'
Expand All @@ -126,3 +168,8 @@ ignore:
reason: 'The fix requires migrating the Azure Functions telemetry stack from OpenTelemetry 1.x to 2.8.0 or newer. The current Azure exporter and 0.57.x SDK packages require the 1.x API family; a forced major override is type-compatible at build time but leaves mixed SDK internals. Accepted temporarily while the existing OTEL 2.x migration is completed.'
expires: '2026-07-18T00:00:00.000Z'
created: '2026-06-18T00:00:00.000Z'
'SNYK-JS-BRACEEXPANSION-17706650':
- '* > brace-expansion@1.1.13':
reason: 'Transitive in Docusaurus serve-handler for local static docs serving. The fixed brace-expansion 5.x line requires minimatch 10, whose named-export API is incompatible with serve-handler 6.1.7.'
expires: '2026-09-30T00:00:00.000Z'
created: '2026-06-30T00:00:00.000Z'
14 changes: 8 additions & 6 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"scripts": {
"prebuild": "pnpm run lint",
"build": "tsgo --build && tsgo --noEmit --project tsconfig.rolldown.json && rolldown -c rolldown.config.ts",
"predev": "pnpm run prepare:deploy && pnpm run sync-local-settings",
"dev": "pnpm exec portless data-access.ownercommunity.localhost --force node start-dev.mjs",
"predev:worktree": "pnpm run prepare:deploy && pnpm run sync-local-settings",
"dev:worktree": "pnpm exec portless data-access.ownercommunity.${WORKTREE_NAME}.localhost --force node start-dev.mjs",
"predev": "pnpm run prepare:deploy",
"dev": "pnpm exec portless data-access.ownercommunity.localhost --force node start-dev.ts",
"predev:worktree": "pnpm run prepare:deploy",
"dev:worktree": "pnpm exec portless data-access.ownercommunity.${WORKTREE_NAME}.localhost --force node start-dev.ts",
"prepare:deploy": "cellix-prepare-func-deploy",
"watch": "tsgo --watch",
"test": "vitest run --silent --reporter=dot",
Expand All @@ -24,8 +24,8 @@
"clean": "rimraf dist deploy",
"prestart": "pnpm run prepare:deploy && pnpm run sync-local-settings",
"start": "func start --typescript --script-root deploy/",
"sync-local-settings": "node scripts/sync-local-settings.mjs",
"azurite": "node start-azurite.mjs"
"sync-local-settings": "node sync-local-settings.ts",
"azurite": "node start-azurite.ts"
},
"dependencies": {
"@azure/functions": "catalog:",
Expand All @@ -50,6 +50,8 @@
"@cellix/config-rolldown": "workspace:*",
"@cellix/config-typescript": "workspace:*",
"@cellix/config-vitest": "workspace:*",
"@cellix/local-dev": "workspace:*",
"@ocom/local-dev-config": "workspace:*",
"@vitest/coverage-istanbul": "catalog:",
"archunit": "catalog:",
"azurite": "^3.35.0",
Expand Down
1 change: 0 additions & 1 deletion apps/api/rolldown.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* By adding this reference directive, we can ensure that the NodeJS types are available for use in this file without causing phantom errors in the rest of the project.
*/
/// <reference types="node" />

import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { createCellixAzureFunctionsRolldownConfig } from '@cellix/config-rolldown';
Expand Down
63 changes: 0 additions & 63 deletions apps/api/scripts/sync-local-settings.mjs

This file was deleted.

6 changes: 2 additions & 4 deletions apps/api/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import './service-config/otel-starter.ts';

import type { ApplicationServices } from '@ocom/application-services';
import { buildApplicationServicesFactory } from '@ocom/application-services';
import { type ApplicationServices, buildApplicationServicesFactory } from '@ocom/application-services';
import type { ApiContextSpec } from '@ocom/context-spec';
import { RegisterEventHandlers } from '@ocom/event-handler';
import type { GraphContext } from '@ocom/graphql-handler';
import { graphHandlerCreator } from '@ocom/graphql-handler';
import { type GraphContext, graphHandlerCreator } from '@ocom/graphql-handler';
import { restHandlerCreator } from '@ocom/rest';
import { ServiceApolloServer } from '@ocom/service-apollo-server';
import { ServiceBlobStorage, ServiceClientBlobStorage } from '@ocom/service-blob-storage';
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/service-config/apollo-server/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ServiceApolloServerOptions } from '@ocom/service-apollo-server';
import { combinedSchema, permissions } from '@ocom/graphql';
import type { ServiceApolloServerOptions } from '@ocom/service-apollo-server';

const { NODE_ENV } = process.env;
const isDev = NODE_ENV !== 'production';
Expand Down
48 changes: 0 additions & 48 deletions apps/api/start-azurite.mjs

This file was deleted.

3 changes: 3 additions & 0 deletions apps/api/start-azurite.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { AzuriteDevRunner } from '@cellix/local-dev';

new AzuriteDevRunner().start();
47 changes: 0 additions & 47 deletions apps/api/start-dev.mjs

This file was deleted.

6 changes: 6 additions & 0 deletions apps/api/start-dev.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { AzureFunctionsDevRunner } from '@cellix/local-dev';
import { buildOcomApiLocalSettings } from '@ocom/local-dev-config';

new AzureFunctionsDevRunner({
localSettings: buildOcomApiLocalSettings(),
}).start();
4 changes: 4 additions & 0 deletions apps/api/sync-local-settings.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { AzureFunctionsLocalSettings } from '@cellix/local-dev';
import { buildOcomApiLocalSettings } from '@ocom/local-dev-config';

new AzureFunctionsLocalSettings(buildOcomApiLocalSettings()).sync();
2 changes: 1 addition & 1 deletion apps/api/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"build": {
"cache": true,
"dependsOn": ["^build", "//#gen"],
"inputs": ["$TURBO_EXTENDS$", "rolldown.config.ts", "host.json", "$TURBO_ROOT$/scripts/local-dev/**"],
"inputs": ["$TURBO_EXTENDS$", "rolldown.config.ts", "host.json"],
"outputs": ["$TURBO_EXTENDS$", "deploy/**"]
},
"dev": {
Expand Down
5 changes: 3 additions & 2 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"private": true,
"scripts": {
"docusaurus": "docusaurus",
"dev": "pnpm exec portless docs.ownercommunity.localhost --force node start-dev.mjs",
"dev:worktree": "pnpm exec portless docs.ownercommunity.${WORKTREE_NAME}.localhost --force node start-dev.mjs",
"dev": "pnpm exec portless docs.ownercommunity.localhost --force node start-dev.ts",
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
"dev:worktree": "pnpm exec portless docs.ownercommunity.${WORKTREE_NAME}.localhost --force node start-dev.ts",
"start": "docusaurus start --port 3001",
"build": "docusaurus build",
"swizzle": "docusaurus swizzle",
Expand All @@ -32,6 +32,7 @@
"devDependencies": {
"@cellix/config-typescript": "workspace:*",
"@cellix/config-vitest": "workspace:*",
"@cellix/local-dev": "workspace:*",
"@docusaurus/module-type-aliases": "^3.10.1",
"@docusaurus/tsconfig": "^3.10.1",
"@docusaurus/types": "^3.10.1",
Expand Down
10 changes: 0 additions & 10 deletions apps/docs/start-dev.mjs

This file was deleted.

3 changes: 3 additions & 0 deletions apps/docs/start-dev.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { DocusaurusDevRunner } from '@cellix/local-dev';

new DocusaurusDevRunner().start();
4 changes: 2 additions & 2 deletions apps/docs/turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"dependsOn": [],
"persistent": true,
"interruptible": false,
"inputs": [".env", "package.json", "start-dev.mjs", "docusaurus.config.ts", "sidebars.ts", "tsconfig.json"]
"inputs": [".env", "package.json", "docusaurus.config.ts", "sidebars.ts", "tsconfig.json"]
},
"dev:worktree": {
"dependsOn": [],
"persistent": true,
"interruptible": false,
"inputs": [".env", "package.json", "start-dev.mjs", "docusaurus.config.ts", "sidebars.ts", "tsconfig.json"]
"inputs": [".env", "package.json", "start-dev.ts", "docusaurus.config.ts", "sidebars.ts", "tsconfig.json"]
},
"test": {
"inputs": ["$TURBO_EXTENDS$", "!docs/**", "!blog/**", "!static/**"]
Expand Down
6 changes: 3 additions & 3 deletions apps/server-mongodb-memory-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"format": "biome format --write",
"format:check": "biome format .",
"start": "node dist/index.js",
"dev": "tsx src/index.ts",
"dev:worktree": "node start-mongo.mjs"
"dev": "node src/index.ts",
"dev:worktree": "node start-dev.ts"
},
"dependencies": {
"@cellix/server-mongodb-memory-mock-seedwork": "workspace:*",
Expand All @@ -22,9 +22,9 @@
"mongoose": "catalog:"
},
"devDependencies": {
"@cellix/local-dev": "workspace:*",
"@cellix/config-typescript": "workspace:*",
"rimraf": "catalog:",
"tsx": "catalog:",
"typescript": "catalog:"
}
}
Loading
Loading