diff --git a/.github/workflows/test.common-server.yaml b/.github/workflows/test.common-server.yaml deleted file mode 100644 index 0fa5efff77..0000000000 --- a/.github/workflows/test.common-server.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: Common Server Test - -on: - pull_request: - push: - branches-ignore: - - 'hotfix-*' # excludes hotfix branches - - 'release' - -jobs: - test: - runs-on: ubuntu-latest - env: - CI_PIPELINE_ID: ${{github.run_number}} - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: 18.3.0 - - run: cd Common && npm install - - run: cd CommonServer && bash test-setup.sh - - run: export $(grep -v '^#' config.env | xargs) && cd CommonServer && rm -rf build && npm run test \ No newline at end of file diff --git a/.github/workflows/test.common.yaml b/.github/workflows/test.common.yaml index 2dba33ce98..bd5158e038 100644 --- a/.github/workflows/test.common.yaml +++ b/.github/workflows/test.common.yaml @@ -17,5 +17,6 @@ jobs: - uses: actions/setup-node@v2 with: node-version: 18.3.0 + - run: cd Common/Tests && bash test-setup.sh - run: cd Common && npm install && npm run test \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index 97ad4f257e..4f5ffce1b8 100644 --- a/.prettierignore +++ b/.prettierignore @@ -51,6 +51,3 @@ licenses/* certifications/* ApiReference/public/assets/* JavaScriptSDK/src/cli/server-monitor/out/scripts/prettify/* - - -CommonServer/Tests/TestingUtils/__mocks__/Stripe.mock.ts \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json index 0a6020ea8f..d7386ee0ae 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -218,12 +218,12 @@ "autoAttachChildProcesses": true }, { - "name": "CommonServer: Debug Tests", + "name": "Common: Debug Tests", "type": "node", "restart": true, "autoAttachChildProcesses": true, "request": "launch", - "cwd": "${workspaceRoot}/CommonServer", + "cwd": "${workspaceRoot}/Common", "runtimeExecutable": "npm", "runtimeArgs": [ "run-script", diff --git a/Accounts/package-lock.json b/Accounts/package-lock.json index 28cbb1a0cb..b09713cb61 100644 --- a/Accounts/package-lock.json +++ b/Accounts/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "css-loader": "^6.11.0", "dotenv": "^16.4.5", "express": "^4.19.2", diff --git a/Accounts/package.json b/Accounts/package.json index 2745892dcc..87c393a7f3 100644 --- a/Accounts/package.json +++ b/Accounts/package.json @@ -27,7 +27,6 @@ }, "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "css-loader": "^6.11.0", "dotenv": "^16.4.5", "express": "^4.19.2", diff --git a/AdminDashboard/package-lock.json b/AdminDashboard/package-lock.json index 5480c63e2a..4daee278f6 100644 --- a/AdminDashboard/package-lock.json +++ b/AdminDashboard/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "dotenv": "^16.4.5", "file-loader": "^6.2.0", "react": "^18.3.1", diff --git a/AdminDashboard/package.json b/AdminDashboard/package.json index ead39cf566..0dda8d8cee 100644 --- a/AdminDashboard/package.json +++ b/AdminDashboard/package.json @@ -5,7 +5,6 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "dotenv": "^16.4.5", "file-loader": "^6.2.0", "react": "^18.3.1", diff --git a/App/nodemon.json b/App/nodemon.json index 41fee26571..2689720d16 100644 --- a/App/nodemon.json +++ b/App/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["./","../Common", "../CommonServer", "../Model"], + "watch": ["./","../Common"], "ext": "ts,json,tsx,env,js,jsx,hbs", "ignore": [ "greenlock.d/*" diff --git a/App/package-lock.json b/App/package-lock.json index 23ef020b3a..4092da5df5 100644 --- a/App/package-lock.json +++ b/App/package-lock.json @@ -11,7 +11,6 @@ "dependencies": { "@sendgrid/mail": "^8.1.0", "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "ejs": "^3.1.9", "handlebars": "^4.7.8", "nodemailer": "^6.9.7", diff --git a/App/package.json b/App/package.json index 5c6c8ac24c..0134b4ac02 100644 --- a/App/package.json +++ b/App/package.json @@ -19,7 +19,7 @@ "@sendgrid/mail": "^8.1.0", "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "ejs": "^3.1.9", "handlebars": "^4.7.8", "nodemailer": "^6.9.7", diff --git a/Common/Server/Utils/Environment.ts b/Common/Server/Utils/Environment.ts index 088ae910dc..6a456eab06 100644 --- a/Common/Server/Utils/Environment.ts +++ b/Common/Server/Utils/Environment.ts @@ -12,7 +12,7 @@ if (Env === AppEnvironment.Development || Env === AppEnvironment.Test) { path: "../Common/.env", }); dotenv.config({ - path: "../CommonServer/.env", + path: "../Common/Server/.env", }); dotenv.config({ path: "./.env", diff --git a/Common/Tests/Server/TestingUtils/Init.ts b/Common/Tests/Server/TestingUtils/Init.ts index 12732534f6..fe917116e5 100644 --- a/Common/Tests/Server/TestingUtils/Init.ts +++ b/Common/Tests/Server/TestingUtils/Init.ts @@ -1,5 +1,5 @@ import "../../../Server/Utils/Environment"; -// Env vars are actually changed in CommonServer/test-setup.sh +// Env vars are actually changed in Common/Server/test-setup.sh process.env["NODE_ENV"] = "test"; diff --git a/Common/Server/test-setup.sh b/Common/Tests/test-setup.sh similarity index 100% rename from Common/Server/test-setup.sh rename to Common/Tests/test-setup.sh diff --git a/Copilot/nodemon.json b/Copilot/nodemon.json index bf7a1b8a2f..531caee36b 100644 --- a/Copilot/nodemon.json +++ b/Copilot/nodemon.json @@ -1,9 +1,7 @@ { "watch": [ "./", - "../Common", - "../CommonServer", - "../Model" + "../Common" ], "ext": "ts,json,tsx,env,js,jsx,hbs", "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts" diff --git a/Copilot/package-lock.json b/Copilot/package-lock.json index 3b14d13b14..e2ba58541f 100644 --- a/Copilot/package-lock.json +++ b/Copilot/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "dotenv": "^16.4.5", "Model": "file:../Model", "openai": "^4.52.5", diff --git a/Copilot/package.json b/Copilot/package.json index 0af0d54c77..3ffb0daf3e 100644 --- a/Copilot/package.json +++ b/Copilot/package.json @@ -17,7 +17,6 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "dotenv": "^16.4.5", "openai": "^4.52.5", "ts-node": "^10.9.1" diff --git a/Dashboard/package-lock.json b/Dashboard/package-lock.json index a78317c2e7..8f16afcef6 100644 --- a/Dashboard/package-lock.json +++ b/Dashboard/package-lock.json @@ -11,7 +11,7 @@ "@stripe/react-stripe-js": "^1.15.0", "@stripe/stripe-js": "^1.44.1", "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "dotenv": "^16.4.5", "file-loader": "^6.2.0", "react": "^18.3.1", diff --git a/Dashboard/package.json b/Dashboard/package.json index e08dcdb704..bb542d2640 100644 --- a/Dashboard/package.json +++ b/Dashboard/package.json @@ -32,7 +32,6 @@ "@stripe/stripe-js": "^1.44.1", "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "dotenv": "^16.4.5", "file-loader": "^6.2.0", "react": "^18.3.1", diff --git a/Ingestor/nodemon.json b/Ingestor/nodemon.json index a7d154ee51..1ba1b01e26 100644 --- a/Ingestor/nodemon.json +++ b/Ingestor/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["./","../Common", "../CommonServer", "../Model"], + "watch": ["./","../Common"], "ext": "ts,json,tsx,env,js,jsx,hbs", "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts" } \ No newline at end of file diff --git a/Ingestor/package-lock.json b/Ingestor/package-lock.json index 1437826a10..7e559b81d8 100644 --- a/Ingestor/package-lock.json +++ b/Ingestor/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "ejs": "^3.1.10", "Model": "file:../Model", "protobufjs": "^7.3.2", diff --git a/Ingestor/package.json b/Ingestor/package.json index 94bff8a1e5..00b90fd48d 100644 --- a/Ingestor/package.json +++ b/Ingestor/package.json @@ -17,7 +17,6 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "protobufjs": "^7.3.2", "ts-node": "^10.9.1" diff --git a/IsolatedVM/nodemon.json b/IsolatedVM/nodemon.json index a7d154ee51..1ba1b01e26 100644 --- a/IsolatedVM/nodemon.json +++ b/IsolatedVM/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["./","../Common", "../CommonServer", "../Model"], + "watch": ["./","../Common"], "ext": "ts,json,tsx,env,js,jsx,hbs", "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts" } \ No newline at end of file diff --git a/IsolatedVM/package-lock.json b/IsolatedVM/package-lock.json index c93a7151a1..f7f264696d 100644 --- a/IsolatedVM/package-lock.json +++ b/IsolatedVM/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "ts-node": "^10.9.1" }, "devDependencies": { diff --git a/IsolatedVM/package.json b/IsolatedVM/package.json index 47cfc63d60..469d29ce55 100644 --- a/IsolatedVM/package.json +++ b/IsolatedVM/package.json @@ -17,7 +17,6 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "ts-node": "^10.9.1" }, "devDependencies": { diff --git a/Nginx/package-lock.json b/Nginx/package-lock.json index e20acb2e10..3d6868a644 100644 --- a/Nginx/package-lock.json +++ b/Nginx/package-lock.json @@ -10,7 +10,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "ts-node": "^10.9.1" }, "devDependencies": { diff --git a/Nginx/package.json b/Nginx/package.json index 089ca722a7..e88697e67a 100644 --- a/Nginx/package.json +++ b/Nginx/package.json @@ -14,7 +14,7 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "ts-node": "^10.9.1" }, "devDependencies": { diff --git a/Probe/nodemon.json b/Probe/nodemon.json index 7492d3da34..5f761bb1bf 100644 --- a/Probe/nodemon.json +++ b/Probe/nodemon.json @@ -1,5 +1,5 @@ { -"watch": ["./","../Common", "../CommonServer", "../Model"], +"watch": ["./","../Common"], "ext": "ts,json,tsx,env,js,jsx,hbs", "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts" } \ No newline at end of file diff --git a/Probe/package-lock.json b/Probe/package-lock.json index c18cc5fc32..a18d7d0f41 100644 --- a/Probe/package-lock.json +++ b/Probe/package-lock.json @@ -12,7 +12,6 @@ "@types/ping": "^0.4.4", "axios": "^1.7.2", "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "ping": "^0.4.4", "playwright": "^1.45.1", diff --git a/Probe/package.json b/Probe/package.json index b8a0489f15..5e1ca1ab82 100644 --- a/Probe/package.json +++ b/Probe/package.json @@ -21,7 +21,7 @@ "axios": "^1.7.2", "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "ejs": "^3.1.10", "ping": "^0.4.4", "playwright": "1.45.1", diff --git a/Scripts/package-lock.json b/Scripts/package-lock.json index 6e03e4291e..67b631889c 100644 --- a/Scripts/package-lock.json +++ b/Scripts/package-lock.json @@ -11,7 +11,6 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "ts-node": "^10.9.2" }, diff --git a/Scripts/package.json b/Scripts/package.json index f36a93c156..29a1ac1572 100644 --- a/Scripts/package.json +++ b/Scripts/package.json @@ -8,7 +8,7 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "ejs": "^3.1.10", "ts-node": "^10.9.2" }, diff --git a/StatusPage/package-lock.json b/StatusPage/package-lock.json index 7f895871cd..eeb0b8a228 100644 --- a/StatusPage/package-lock.json +++ b/StatusPage/package-lock.json @@ -9,7 +9,6 @@ "version": "0.1.0", "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "css-loader": "^6.11.0", "dotenv": "^16.4.5", "express": "^4.19.2", diff --git a/StatusPage/package.json b/StatusPage/package.json index d96c14fa7f..67f1f54944 100644 --- a/StatusPage/package.json +++ b/StatusPage/package.json @@ -29,7 +29,7 @@ "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "css-loader": "^6.11.0", "dotenv": "^16.4.5", "express": "^4.19.2", diff --git a/TestServer/nodemon.json b/TestServer/nodemon.json index a7d154ee51..1ba1b01e26 100644 --- a/TestServer/nodemon.json +++ b/TestServer/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["./","../Common", "../CommonServer", "../Model"], + "watch": ["./","../Common"], "ext": "ts,json,tsx,env,js,jsx,hbs", "exec": "node --inspect=0.0.0.0:9229 --require ts-node/register Index.ts" } \ No newline at end of file diff --git a/TestServer/package-lock.json b/TestServer/package-lock.json index 48db80a599..a91ae87d13 100644 --- a/TestServer/package-lock.json +++ b/TestServer/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", + "ejs": "^3.1.10", "ts-node": "^10.9.1" }, diff --git a/TestServer/package.json b/TestServer/package.json index 4aaa7a34b7..7f43777c80 100644 --- a/TestServer/package.json +++ b/TestServer/package.json @@ -17,7 +17,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "ts-node": "^10.9.1" }, diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b0aae3b54e..bc1b8bf914 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -57,9 +57,9 @@ services: - /usr/src/app/dev-env - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + build: network: host @@ -80,9 +80,9 @@ services: - /usr/src/app/dev-env - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + build: network: host @@ -104,9 +104,9 @@ services: - /usr/src/app/dev-env - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + build: network: host @@ -127,9 +127,9 @@ services: - /usr/src/app/dev-env - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + build: network: host @@ -144,9 +144,9 @@ services: # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + extends: file: ./docker-compose.base.yml @@ -167,9 +167,9 @@ services: # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + extends: file: ./docker-compose.base.yml @@ -189,9 +189,9 @@ services: # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + extends: file: ./docker-compose.base.yml @@ -210,9 +210,9 @@ services: # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + extends: file: ./docker-compose.base.yml @@ -231,9 +231,9 @@ services: # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + ports: - '9974:9229' # Debugging port. @@ -252,9 +252,9 @@ services: # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + ports: - '9932:9229' # Debugging port. @@ -314,9 +314,9 @@ services: # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder - /usr/src/app/node_modules/ - ./Common:/usr/src/Common - - ./CommonServer:/usr/src/CommonServer + - /usr/src/Common/node_modules/ - - /usr/src/CommonServer/node_modules/ + ports: - '9985:9229' # Debugging port. diff --git a/migration-run.sh b/migration-run.sh index ccba120583..305de57a22 100644 --- a/migration-run.sh +++ b/migration-run.sh @@ -5,4 +5,4 @@ export DATABASE_HOST=$DATABASE_MIGRATIONS_HOST export DATABASE_PORT=$DATABASE_MIGRATIONS_PORT sudo npm i -g ts-node -npx typeorm-ts-node-esm migration:run --dataSource=./CommonServer/Infrastructure/PostgresConfig.ts \ No newline at end of file +npx typeorm-ts-node-esm migration:run --dataSource=./Common/Server/Infrastructure/PostgresConfig.ts \ No newline at end of file diff --git a/package.json b/package.json index 4d9596efca..d5170ac8a9 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "deploy-test": "kubectl config use-context oneuptime-test && helm upgrade oneuptime ./HelmChart/Public/oneuptime -f ./HelmChart/Public/oneuptime/values.yaml -f ./HelmChart/Values/test.values.yaml", "template-deploy-test": "kubectl config use-context oneuptime-test && helm template oneuptime ./HelmChart/Public/oneuptime -f ./HelmChart/Public/oneuptime/values.yaml -f ./HelmChart/Values/test.values.yaml --debug", "deploy-prod": "kubectl config use-context oneuptime-prod && helm upgrade oneuptime ./HelmChart/Public/oneuptime -f ./HelmChart/Public/oneuptime/values.yaml -f ./HelmChart/Values/prod.values.yaml", - "generate-postgres-migration": "export $(grep -v '^#' config.env | xargs) && node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate ./CommonServer/Infrastructure/Postgres/SchemaMigrations/MigrationName -d ./CommonServer/Infrastructure/Postgres/LocalMigrationGenerationDataSource.ts" + "generate-postgres-migration": "export $(grep -v '^#' config.env | xargs) && node --require ts-node/register ./node_modules/typeorm/cli.js migration:generate ./Common/Server/Infrastructure/Postgres/SchemaMigrations/MigrationName -d ./Common/Server/Infrastructure/Postgres/LocalMigrationGenerationDataSource.ts" }, "repository": { "type": "git",