From 8ef66650fbf8e1a715f1f72367052fd3b880692d Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Thu, 25 Jul 2024 07:42:45 -0600 Subject: [PATCH] chore: Update package.json dependencies for CommonProject --- .github/workflows/compile.yml | 13 ++++ Accounts/package-lock.json | 55 +++++++------- Accounts/package.json | 2 +- AdminDashboard/package-lock.json | 41 +++++----- AdminDashboard/package.json | 2 +- App/FeatureSet/Docs/Index.ts | 2 +- App/package-lock.json | 11 ++- App/package.json | 2 +- CommonProject/package-lock.json | 4 +- CommonServer/package-lock.json | 8 +- CommonServer/package.json | 4 +- CommonUI/package-lock.json | 8 +- CommonUI/package.json | 2 +- Copilot/package-lock.json | 6 +- Copilot/package.json | 2 +- Dashboard/package-lock.json | 41 +++++----- Dashboard/package.json | 2 +- E2E/package-lock.json | 3 +- E2E/package.json | 2 +- Ingestor/package-lock.json | 79 ++++++++++--------- Ingestor/package.json | 2 +- IsolatedVM/package-lock.json | 6 +- IsolatedVM/package.json | 2 +- Model/package-lock.json | 9 +-- Model/package.json | 2 +- Nginx/package-lock.json | 8 +- Nginx/package.json | 2 +- Probe/package-lock.json | 11 ++- Probe/package.json | 2 +- Scripts/package-lock.json | 10 +-- Scripts/package.json | 2 +- StatusPage/package-lock.json | 114 +++++++--------------------- StatusPage/package.json | 2 +- TelemetryIngestor/package-lock.json | 6 +- TelemetryIngestor/package.json | 2 +- TestServer/package-lock.json | 72 ++++++++++-------- TestServer/package.json | 1 - 37 files changed, 256 insertions(+), 286 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index af586e1247..ab0e3e13f7 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -54,6 +54,19 @@ jobs: - run: cd Model && npm install - run: cd CommonServer && npm install && npm run compile && npm run dep-check + compile-common-project: + 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 Model && npm install + - run: cd CommonProject && npm install && npm run compile && npm run dep-check + compile-common-ui: runs-on: ubuntu-latest env: diff --git a/Accounts/package-lock.json b/Accounts/package-lock.json index db3267b205..b427aa77e3 100644 --- a/Accounts/package-lock.json +++ b/Accounts/package-lock.json @@ -9,7 +9,6 @@ "version": "0.1.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "CommonUI": "file:../CommonUI", "css-loader": "^6.11.0", @@ -42,12 +41,12 @@ "dependencies": { "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.116.6", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", @@ -79,25 +78,28 @@ "@opentelemetry/sdk-metrics": "^1.21.0", "@opentelemetry/sdk-node": "^0.48.0", "@opentelemetry/sdk-trace-node": "^1.21.0", + "@types/crypto-js": "^4.2.2", "acme-client": "^5.3.0", "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", + "crypto-js": "^4.2.0", "dotenv": "^16.4.4", "ejs": "^3.1.10", "express": "^4.19.2", "ioredis": "^5.3.2", "json2csv": "^5.0.7", "jsonwebtoken": "^9.0.0", - "markdown-it": "^13.0.1", + "marked": "^12.0.2", "Model": "file:../Model", "node-cron": "^3.0.3", "nodemailer": "^6.9.10", "pg": "^8.7.3", + "redis-semaphore": "^5.5.1", "socket.io": "^4.7.4", "stripe": "^10.17.0", "twilio": "^4.22.0", @@ -113,7 +115,6 @@ "@types/jest": "^27.4.1", "@types/json2csv": "^5.0.3", "@types/jsonwebtoken": "^8.5.9", - "@types/markdown-it": "^12.2.3", "@types/node": "^17.0.22", "@types/node-cron": "^3.0.7", "@types/nodemailer": "^6.4.7", @@ -127,43 +128,46 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.24.1", + "@babel/runtime": "^7.24.6", "@monaco-editor/react": "^4.4.6", - "@nivo/core": "^0.85.1", - "@nivo/line": "^0.85.1", - "@opentelemetry/api": "^1.8.0", - "@opentelemetry/context-zone": "^1.22.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.49.1", - "@opentelemetry/instrumentation": "^0.49.1", - "@opentelemetry/instrumentation-fetch": "^0.49.1", - "@opentelemetry/instrumentation-xml-http-request": "^0.49.1", - "@opentelemetry/resources": "^1.21.0", - "@opentelemetry/sdk-trace-web": "^1.21.0", - "@opentelemetry/semantic-conventions": "^1.21.0", + "@nivo/core": "^0.87.0", + "@nivo/line": "^0.87.0", + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/context-zone": "^1.25.0", + "@opentelemetry/exporter-trace-otlp-http": "^0.52.0", + "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/instrumentation-fetch": "^0.52.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.52.1", + "@opentelemetry/resources": "^1.25.0", + "@opentelemetry/sdk-trace-web": "^1.23.0", + "@opentelemetry/semantic-conventions": "^1.25.0", "@tippyjs/react": "^4.2.6", "@types/react-highlight": "^0.12.8", + "@types/react-syntax-highlighter": "^15.5.13", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", - "formik": "^2.2.9", + "CommonProject": "file:../CommonProject", + "formik": "^2.4.6", "history": "^5.3.0", + "jwt-decode": "^4.0.0", "lodash": "^4.17.21", "Model": "file:../Model", "moment-timezone": "^0.5.45", "prop-types": "^15.8.1", - "react": "^18.2.0", + "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", - "react-big-calendar": "^1.11.2", + "react-big-calendar": "^1.13.0", "react-color": "^2.19.3", - "react-dom": "^18.1.0", + "react-dom": "^18.3.1", "react-dropzone": "^14.2.2", "react-error-boundary": "^4.0.13", "react-highlight": "^0.15.0", "react-markdown": "^8.0.3", - "react-router-dom": "^6.22.3", + "react-router-dom": "^6.23.1", "react-select": "^5.4.0", "react-spinners": "^0.13.6", + "react-syntax-highlighter": "^15.5.0", "react-toggle": "^4.1.3", - "reactflow": "^11.10.4", + "reactflow": "^11.11.1", "remark-gfm": "^3.0.1", "socket.io-client": "^4.7.5", "tippy.js": "^6.3.7", @@ -196,7 +200,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/Accounts/package.json b/Accounts/package.json index c3daa86bfe..3464474145 100644 --- a/Accounts/package.json +++ b/Accounts/package.json @@ -27,7 +27,7 @@ }, "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "CommonUI": "file:../CommonUI", "css-loader": "^6.11.0", diff --git a/AdminDashboard/package-lock.json b/AdminDashboard/package-lock.json index 12c9be1551..79b8716d1f 100644 --- a/AdminDashboard/package-lock.json +++ b/AdminDashboard/package-lock.json @@ -9,7 +9,6 @@ "version": "0.1.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "CommonUI": "file:../CommonUI", "dotenv": "^16.4.5", @@ -42,12 +41,12 @@ "dependencies": { "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.130.1", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", @@ -79,14 +78,16 @@ "@opentelemetry/sdk-metrics": "^1.21.0", "@opentelemetry/sdk-node": "^0.48.0", "@opentelemetry/sdk-trace-node": "^1.21.0", + "@types/crypto-js": "^4.2.2", "acme-client": "^5.3.0", "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", + "crypto-js": "^4.2.0", "dotenv": "^16.4.4", "ejs": "^3.1.10", "express": "^4.19.2", @@ -127,41 +128,44 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.24.1", + "@babel/runtime": "^7.24.6", "@monaco-editor/react": "^4.4.6", - "@nivo/core": "^0.86.0", - "@nivo/line": "^0.86.0", - "@opentelemetry/api": "^1.8.0", - "@opentelemetry/context-zone": "^1.23.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.51.0", - "@opentelemetry/instrumentation": "^0.51.0", - "@opentelemetry/instrumentation-fetch": "^0.51.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.51.0", - "@opentelemetry/resources": "^1.23.0", + "@nivo/core": "^0.87.0", + "@nivo/line": "^0.87.0", + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/context-zone": "^1.25.0", + "@opentelemetry/exporter-trace-otlp-http": "^0.52.0", + "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/instrumentation-fetch": "^0.52.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.52.1", + "@opentelemetry/resources": "^1.25.0", "@opentelemetry/sdk-trace-web": "^1.23.0", - "@opentelemetry/semantic-conventions": "^1.23.0", + "@opentelemetry/semantic-conventions": "^1.25.0", "@tippyjs/react": "^4.2.6", "@types/react-highlight": "^0.12.8", + "@types/react-syntax-highlighter": "^15.5.13", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "formik": "^2.4.6", "history": "^5.3.0", + "jwt-decode": "^4.0.0", "lodash": "^4.17.21", "Model": "file:../Model", "moment-timezone": "^0.5.45", "prop-types": "^15.8.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", - "react-big-calendar": "^1.11.2", + "react-big-calendar": "^1.13.0", "react-color": "^2.19.3", "react-dom": "^18.3.1", "react-dropzone": "^14.2.2", "react-error-boundary": "^4.0.13", "react-highlight": "^0.15.0", "react-markdown": "^8.0.3", - "react-router-dom": "^6.22.3", + "react-router-dom": "^6.23.1", "react-select": "^5.4.0", "react-spinners": "^0.13.6", + "react-syntax-highlighter": "^15.5.0", "react-toggle": "^4.1.3", "reactflow": "^11.11.1", "remark-gfm": "^3.0.1", @@ -196,7 +200,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/AdminDashboard/package.json b/AdminDashboard/package.json index 8db7b4ee4e..1b3c1666ab 100644 --- a/AdminDashboard/package.json +++ b/AdminDashboard/package.json @@ -4,7 +4,7 @@ "private": false, "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "CommonUI": "file:../CommonUI", "dotenv": "^16.4.5", diff --git a/App/FeatureSet/Docs/Index.ts b/App/FeatureSet/Docs/Index.ts index 4b5f37f348..fcdc44dbf9 100755 --- a/App/FeatureSet/Docs/Index.ts +++ b/App/FeatureSet/Docs/Index.ts @@ -107,4 +107,4 @@ const DocsFeatureSet: FeatureSet = { }, }; -export default DocsFeatureSet; \ No newline at end of file +export default DocsFeatureSet; diff --git a/App/package-lock.json b/App/package-lock.json index 2462b23a73..a31c462982 100644 --- a/App/package-lock.json +++ b/App/package-lock.json @@ -11,7 +11,6 @@ "dependencies": { "@sendgrid/mail": "^8.1.0", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "ejs": "^3.1.9", "handlebars": "^4.7.8", @@ -41,12 +40,12 @@ "dependencies": { "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.129.0", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", @@ -78,14 +77,16 @@ "@opentelemetry/sdk-metrics": "^1.21.0", "@opentelemetry/sdk-node": "^0.48.0", "@opentelemetry/sdk-trace-node": "^1.21.0", + "@types/crypto-js": "^4.2.2", "acme-client": "^5.3.0", "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", + "crypto-js": "^4.2.0", "dotenv": "^16.4.4", "ejs": "^3.1.10", "express": "^4.19.2", @@ -113,7 +114,6 @@ "@types/jest": "^27.4.1", "@types/json2csv": "^5.0.3", "@types/jsonwebtoken": "^8.5.9", - "@types/markdown-it": "^12.2.3", "@types/node": "^17.0.22", "@types/node-cron": "^3.0.7", "@types/nodemailer": "^6.4.7", @@ -128,7 +128,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/App/package.json b/App/package.json index e665c5e74a..1f35347008 100644 --- a/App/package.json +++ b/App/package.json @@ -18,7 +18,7 @@ "dependencies": { "@sendgrid/mail": "^8.1.0", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ejs": "^3.1.9", "handlebars": "^4.7.8", diff --git a/CommonProject/package-lock.json b/CommonProject/package-lock.json index 35e6ed7b50..4bf964ef6e 100644 --- a/CommonProject/package-lock.json +++ b/CommonProject/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "Model": "file:../Model" }, "devDependencies": { @@ -53,7 +53,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/CommonServer/package-lock.json b/CommonServer/package-lock.json index a17f04b6a3..1c363b9c8f 100644 --- a/CommonServer/package-lock.json +++ b/CommonServer/package-lock.json @@ -27,8 +27,8 @@ "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", - "CommonProject": "file:../CommonProject", + + "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", @@ -4666,7 +4666,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "Model": "file:../Model" }, "devDependencies": { @@ -4683,7 +4683,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/CommonServer/package.json b/CommonServer/package.json index eb079d9480..adcd1e6d05 100644 --- a/CommonServer/package.json +++ b/CommonServer/package.json @@ -32,7 +32,7 @@ "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", @@ -45,7 +45,7 @@ "jsonwebtoken": "^9.0.0", "marked": "^12.0.2", "Model": "file:../Model", - "CommonProject": "file:../CommonProject", + "node-cron": "^3.0.3", "nodemailer": "^6.9.10", "pg": "^8.7.3", diff --git a/CommonUI/package-lock.json b/CommonUI/package-lock.json index 8e057fce7a..464767b2a4 100644 --- a/CommonUI/package-lock.json +++ b/CommonUI/package-lock.json @@ -26,8 +26,8 @@ "@types/react-highlight": "^0.12.8", "@types/react-syntax-highlighter": "^15.5.13", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", - "CommonProject": "file:../CommonProject", + + "formik": "^2.4.6", "history": "^5.3.0", "jwt-decode": "^4.0.0", @@ -4670,7 +4670,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "Model": "file:../Model" }, "devDependencies": { @@ -8588,7 +8588,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/CommonUI/package.json b/CommonUI/package.json index 3aa76dfdb8..308f0d0a7c 100644 --- a/CommonUI/package.json +++ b/CommonUI/package.json @@ -31,8 +31,8 @@ "@types/react-highlight": "^0.12.8", "@types/react-syntax-highlighter": "^15.5.13", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonProject": "file:../CommonProject", + "formik": "^2.4.6", "history": "^5.3.0", "jwt-decode": "^4.0.0", diff --git a/Copilot/package-lock.json b/Copilot/package-lock.json index 003f20f080..3b14d13b14 100644 --- a/Copilot/package-lock.json +++ b/Copilot/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "dotenv": "^16.4.5", "Model": "file:../Model", @@ -4636,7 +4636,7 @@ "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", @@ -14174,7 +14174,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/Copilot/package.json b/Copilot/package.json index 2b21246222..99a69157fa 100644 --- a/Copilot/package.json +++ b/Copilot/package.json @@ -16,7 +16,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "dotenv": "^16.4.5", "Model": "file:../Model", diff --git a/Dashboard/package-lock.json b/Dashboard/package-lock.json index 5c4e4ae785..c62e90f5b7 100644 --- a/Dashboard/package-lock.json +++ b/Dashboard/package-lock.json @@ -11,7 +11,6 @@ "@stripe/react-stripe-js": "^1.15.0", "@stripe/stripe-js": "^1.44.1", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "CommonUI": "file:../CommonUI", "dotenv": "^16.4.5", @@ -48,12 +47,12 @@ "dependencies": { "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.130.0", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", @@ -4647,14 +4646,16 @@ "@opentelemetry/sdk-metrics": "^1.21.0", "@opentelemetry/sdk-node": "^0.48.0", "@opentelemetry/sdk-trace-node": "^1.21.0", + "@types/crypto-js": "^4.2.2", "acme-client": "^5.3.0", "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", + "crypto-js": "^4.2.0", "dotenv": "^16.4.4", "ejs": "^3.1.10", "express": "^4.19.2", @@ -14179,41 +14180,44 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.24.1", + "@babel/runtime": "^7.24.6", "@monaco-editor/react": "^4.4.6", - "@nivo/core": "^0.85.1", - "@nivo/line": "^0.85.1", - "@opentelemetry/api": "^1.8.0", - "@opentelemetry/context-zone": "^1.23.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.51.0", - "@opentelemetry/instrumentation": "^0.50.0", - "@opentelemetry/instrumentation-fetch": "^0.51.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.51.0", - "@opentelemetry/resources": "^1.23.0", + "@nivo/core": "^0.87.0", + "@nivo/line": "^0.87.0", + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/context-zone": "^1.25.0", + "@opentelemetry/exporter-trace-otlp-http": "^0.52.0", + "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/instrumentation-fetch": "^0.52.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.52.1", + "@opentelemetry/resources": "^1.25.0", "@opentelemetry/sdk-trace-web": "^1.23.0", - "@opentelemetry/semantic-conventions": "^1.23.0", + "@opentelemetry/semantic-conventions": "^1.25.0", "@tippyjs/react": "^4.2.6", "@types/react-highlight": "^0.12.8", + "@types/react-syntax-highlighter": "^15.5.13", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "formik": "^2.4.6", "history": "^5.3.0", + "jwt-decode": "^4.0.0", "lodash": "^4.17.21", "Model": "file:../Model", "moment-timezone": "^0.5.45", "prop-types": "^15.8.1", "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", - "react-big-calendar": "^1.11.2", + "react-big-calendar": "^1.13.0", "react-color": "^2.19.3", "react-dom": "^18.3.1", "react-dropzone": "^14.2.2", "react-error-boundary": "^4.0.13", "react-highlight": "^0.15.0", "react-markdown": "^8.0.3", - "react-router-dom": "^6.22.3", + "react-router-dom": "^6.23.1", "react-select": "^5.4.0", "react-spinners": "^0.13.6", + "react-syntax-highlighter": "^15.5.0", "react-toggle": "^4.1.3", "reactflow": "^11.11.1", "remark-gfm": "^3.0.1", @@ -22861,7 +22865,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/Dashboard/package.json b/Dashboard/package.json index 53863f0a62..eac1740f05 100644 --- a/Dashboard/package.json +++ b/Dashboard/package.json @@ -31,7 +31,7 @@ "@stripe/react-stripe-js": "^1.15.0", "@stripe/stripe-js": "^1.44.1", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "CommonUI": "file:../CommonUI", "dotenv": "^16.4.5", diff --git a/E2E/package-lock.json b/E2E/package-lock.json index 89759a1805..f038d59869 100644 --- a/E2E/package-lock.json +++ b/E2E/package-lock.json @@ -12,7 +12,6 @@ "dependencies": { "@playwright/test": "^1.43.1", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "playwright": "^1.43.1", "typescript": "^5.4.5" }, @@ -32,7 +31,7 @@ "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.133.0", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", diff --git a/E2E/package.json b/E2E/package.json index 3151ad1ba5..0c775e302d 100644 --- a/E2E/package.json +++ b/E2E/package.json @@ -20,7 +20,7 @@ "dependencies": { "@playwright/test": "^1.43.1", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "playwright": "^1.43.1", "typescript": "^5.4.5" } diff --git a/Ingestor/package-lock.json b/Ingestor/package-lock.json index 089577aef3..1437826a10 100644 --- a/Ingestor/package-lock.json +++ b/Ingestor/package-lock.json @@ -10,7 +10,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "Model": "file:../Model", @@ -26,21 +25,21 @@ } }, "../Common": { - "name": "common", + "name": "@oneuptime/common", "version": "1.0.0", - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "@types/crypto-js": "^4.1.1", + "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.2", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", - "moment": "^2.29.2", - "moment-timezone": "^0.5.40", - "posthog-js": "^1.77.0", - "reflect-metadata": "^0.1.13", + "moment": "^2.30.1", + "moment-timezone": "^0.5.45", + "posthog-js": "^1.139.6", + "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", - "typeorm": "^0.3.6", + "typeorm": "^0.3.20", "uuid": "^8.3.2" }, "devDependencies": { @@ -52,41 +51,50 @@ } }, "../CommonServer": { - "name": "common-server", + "name": "@oneuptime/common-server", "version": "1.0.0", - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "@clickhouse/client": "^0.2.1", - "@elastic/elasticsearch": "^8.1.0", + "@clickhouse/client": "^0.2.10", + "@elastic/elasticsearch": "^8.12.1", "@opentelemetry/api": "^1.7.0", - "@opentelemetry/auto-instrumentations-node": "^0.40.1", - "@opentelemetry/sdk-node": "^0.45.1", - "@socket.io/redis-adapter": "^8.2.1", + "@opentelemetry/api-logs": "^0.49.1", + "@opentelemetry/auto-instrumentations-node": "^0.43.0", + "@opentelemetry/exporter-logs-otlp-http": "^0.49.1", + "@opentelemetry/exporter-metrics-otlp-proto": "^0.49.1", + "@opentelemetry/exporter-trace-otlp-proto": "^0.49.1", + "@opentelemetry/id-generator-aws-xray": "^1.2.1", + "@opentelemetry/sdk-logs": "^0.49.1", + "@opentelemetry/sdk-metrics": "^1.21.0", + "@opentelemetry/sdk-node": "^0.48.0", + "@opentelemetry/sdk-trace-node": "^1.21.0", + "@types/crypto-js": "^4.2.2", + "acme-client": "^5.3.0", "airtable": "^0.12.2", - "axios": "^1.6.2", - "bullmq": "^3.6.6", + "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", - "dotenv": "^16.0.0", - "ejs": "^3.1.8", - "express": "^4.17.3", + "crypto-js": "^4.2.0", + "dotenv": "^16.4.4", + "ejs": "^3.1.10", + "express": "^4.19.2", "ioredis": "^5.3.2", "json2csv": "^5.0.7", "jsonwebtoken": "^9.0.0", - "markdown-it": "^13.0.1", + "marked": "^12.0.2", "Model": "file:../Model", - "nodemailer": "^6.7.3", + "node-cron": "^3.0.3", + "nodemailer": "^6.9.10", "pg": "^8.7.3", - "socket.io": "^4.7.2", + "redis-semaphore": "^5.5.1", + "socket.io": "^4.7.4", "stripe": "^10.17.0", - "twilio": "^4.19.3", - "typeorm": "^0.3.10", - "typeorm-extension": "^2.2.13", - "vm2": "^3.9.14", - "winston": "^3.6.0" + "twilio": "^4.22.0", + "typeorm": "^0.3.20", + "typeorm-extension": "^2.2.13" }, "devDependencies": { "@faker-js/faker": "^6.3.1", @@ -97,8 +105,8 @@ "@types/jest": "^27.4.1", "@types/json2csv": "^5.0.3", "@types/jsonwebtoken": "^8.5.9", - "@types/markdown-it": "^12.2.3", "@types/node": "^17.0.22", + "@types/node-cron": "^3.0.7", "@types/nodemailer": "^6.4.7", "jest": "^27.5.1", "jest-mock-extended": "^3.0.5", @@ -106,13 +114,12 @@ } }, "../Model": { - "name": "model", + "name": "@oneuptime/model", "version": "1.0.0", - "license": "ISC", + "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", - "typeorm": "^0.3.17" + "typeorm": "^0.3.20" }, "devDependencies": { "@types/jest": "^27.4.1", diff --git a/Ingestor/package.json b/Ingestor/package.json index 0589064fd9..59b726daf9 100644 --- a/Ingestor/package.json +++ b/Ingestor/package.json @@ -16,7 +16,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "Model": "file:../Model", diff --git a/IsolatedVM/package-lock.json b/IsolatedVM/package-lock.json index da54816d83..c93a7151a1 100644 --- a/IsolatedVM/package-lock.json +++ b/IsolatedVM/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ts-node": "^10.9.1" }, @@ -70,7 +70,7 @@ "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", @@ -116,7 +116,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/IsolatedVM/package.json b/IsolatedVM/package.json index 4878cbe59d..47cfc63d60 100644 --- a/IsolatedVM/package.json +++ b/IsolatedVM/package.json @@ -16,7 +16,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ts-node": "^10.9.1" }, diff --git a/Model/package-lock.json b/Model/package-lock.json index 8d152cdbf6..7df8f71b78 100644 --- a/Model/package-lock.json +++ b/Model/package-lock.json @@ -10,7 +10,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "typeorm": "^0.3.20" }, "devDependencies": { @@ -27,12 +26,12 @@ "dependencies": { "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.116.6", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", @@ -6068,13 +6067,13 @@ "@types/jest": "^27.5.2", "@types/node": "^17.0.22", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "jest": "^27.5.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.116.6", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "ts-jest": "^27.1.4", diff --git a/Model/package.json b/Model/package.json index e0217822ab..88dd6b8940 100644 --- a/Model/package.json +++ b/Model/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/Nginx/package-lock.json b/Nginx/package-lock.json index 9c60cf8a24..ff0cb286aa 100644 --- a/Nginx/package-lock.json +++ b/Nginx/package-lock.json @@ -10,7 +10,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "Model": "file:../Model", "ts-node": "^10.9.1" @@ -26,12 +25,12 @@ "dependencies": { "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.131.4", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", @@ -68,7 +67,7 @@ "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", @@ -114,7 +113,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/Nginx/package.json b/Nginx/package.json index 8ef77dbe6e..c832e91df2 100644 --- a/Nginx/package.json +++ b/Nginx/package.json @@ -13,7 +13,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "Model": "file:../Model", "ts-node": "^10.9.1" diff --git a/Probe/package-lock.json b/Probe/package-lock.json index 080c26f3c0..685ae24624 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", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "Model": "file:../Model", @@ -35,12 +34,12 @@ "dependencies": { "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.130.0", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", @@ -72,14 +71,16 @@ "@opentelemetry/sdk-metrics": "^1.21.0", "@opentelemetry/sdk-node": "^0.48.0", "@opentelemetry/sdk-trace-node": "^1.21.0", + "@types/crypto-js": "^4.2.2", "acme-client": "^5.3.0", "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", + "crypto-js": "^4.2.0", "dotenv": "^16.4.4", "ejs": "^3.1.10", "express": "^4.19.2", @@ -91,7 +92,6 @@ "node-cron": "^3.0.3", "nodemailer": "^6.9.10", "pg": "^8.7.3", - "playwright": "^1.44.0", "redis-semaphore": "^5.5.1", "socket.io": "^4.7.4", "stripe": "^10.17.0", @@ -122,7 +122,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/Probe/package.json b/Probe/package.json index d235f0b0d7..d232bfd829 100644 --- a/Probe/package.json +++ b/Probe/package.json @@ -20,7 +20,7 @@ "@types/ping": "^0.4.4", "axios": "^1.7.2", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "Model": "file:../Model", diff --git a/Scripts/package-lock.json b/Scripts/package-lock.json index c4d27a46e9..0f55928746 100644 --- a/Scripts/package-lock.json +++ b/Scripts/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "Model": "file:../Model", @@ -72,7 +72,7 @@ "axios": "^1.3.3", "bullmq": "^3.6.6", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "cors": "^2.8.5", "cron-parser": "^4.8.1", "dotenv": "^16.0.0", @@ -114,7 +114,7 @@ "license": "ISC", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "typeorm": "^0.3.7" }, "devDependencies": { @@ -5702,7 +5702,7 @@ "axios": "^1.3.3", "bullmq": "^3.6.6", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "cors": "^2.8.5", "cron-parser": "^4.8.1", "dotenv": "^16.0.0", @@ -7030,7 +7030,7 @@ "@types/jest": "^27.4.1", "@types/node": "^17.0.22", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "jest": "^27.5.1", "ts-jest": "^27.1.4", "typeorm": "^0.3.7" diff --git a/Scripts/package.json b/Scripts/package.json index b4fb6f013e..4c9081218b 100644 --- a/Scripts/package.json +++ b/Scripts/package.json @@ -7,7 +7,7 @@ }, "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "Model": "file:../Model", diff --git a/StatusPage/package-lock.json b/StatusPage/package-lock.json index 6dd8905735..2137e3be3d 100644 --- a/StatusPage/package-lock.json +++ b/StatusPage/package-lock.json @@ -9,7 +9,6 @@ "version": "0.1.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "CommonUI": "file:../CommonUI", "css-loader": "^6.11.0", @@ -44,12 +43,12 @@ "dependencies": { "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.8", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", "moment": "^2.30.1", "moment-timezone": "^0.5.45", - "posthog-js": "^1.116.6", + "posthog-js": "^1.139.6", "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", "typeorm": "^0.3.20", @@ -4647,21 +4646,23 @@ "@opentelemetry/sdk-metrics": "^1.21.0", "@opentelemetry/sdk-node": "^0.48.0", "@opentelemetry/sdk-trace-node": "^1.21.0", + "@types/crypto-js": "^4.2.2", "acme-client": "^5.3.0", "airtable": "^0.12.2", "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", + "crypto-js": "^4.2.0", "dotenv": "^16.4.4", "ejs": "^3.1.10", "express": "^4.19.2", "ioredis": "^5.3.2", "json2csv": "^5.0.7", "jsonwebtoken": "^9.0.0", - "markdown-it": "^13.0.1", + "marked": "^12.0.2", "Model": "file:../Model", "node-cron": "^3.0.3", "nodemailer": "^6.9.10", @@ -4682,7 +4683,6 @@ "@types/jest": "^27.4.1", "@types/json2csv": "^5.0.3", "@types/jsonwebtoken": "^8.5.9", - "@types/markdown-it": "^12.2.3", "@types/node": "^17.0.22", "@types/node-cron": "^3.0.7", "@types/nodemailer": "^6.4.7", @@ -7259,25 +7259,6 @@ "@types/koa": "*" } }, - "../CommonServer/node_modules/@types/linkify-it": { - "version": "3.0.5", - "dev": true, - "license": "MIT" - }, - "../CommonServer/node_modules/@types/markdown-it": { - "version": "12.2.3", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/linkify-it": "*", - "@types/mdurl": "*" - } - }, - "../CommonServer/node_modules/@types/mdurl": { - "version": "1.0.5", - "dev": true, - "license": "MIT" - }, "../CommonServer/node_modules/@types/memcached": { "version": "2.2.10", "license": "MIT", @@ -8422,16 +8403,6 @@ } } }, - "../CommonServer/node_modules/entities": { - "version": "3.0.1", - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.12" - }, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "../CommonServer/node_modules/error-ex": { "version": "1.3.2", "dev": true, @@ -10255,13 +10226,6 @@ "dev": true, "license": "MIT" }, - "../CommonServer/node_modules/linkify-it": { - "version": "4.0.1", - "license": "MIT", - "dependencies": { - "uc.micro": "^1.0.1" - } - }, "../CommonServer/node_modules/locate-path": { "version": "5.0.0", "dev": true, @@ -10427,28 +10391,6 @@ "tmpl": "1.0.5" } }, - "../CommonServer/node_modules/markdown-it": { - "version": "13.0.2", - "license": "MIT", - "dependencies": { - "argparse": "^2.0.1", - "entities": "~3.0.1", - "linkify-it": "^4.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - }, - "bin": { - "markdown-it": "bin/markdown-it.js" - } - }, - "../CommonServer/node_modules/markdown-it/node_modules/argparse": { - "version": "2.0.1", - "license": "Python-2.0" - }, - "../CommonServer/node_modules/mdurl": { - "version": "1.0.1", - "license": "MIT" - }, "../CommonServer/node_modules/media-typer": { "version": "0.3.0", "license": "MIT", @@ -12206,10 +12148,6 @@ "node": ">=4.2.0" } }, - "../CommonServer/node_modules/uc.micro": { - "version": "1.0.6", - "license": "MIT" - }, "../CommonServer/node_modules/undici": { "version": "5.28.2", "license": "MIT", @@ -12529,41 +12467,44 @@ "version": "1.0.0", "license": "Apache-2.0", "dependencies": { - "@babel/runtime": "^7.24.1", + "@babel/runtime": "^7.24.6", "@monaco-editor/react": "^4.4.6", - "@nivo/core": "^0.85.1", - "@nivo/line": "^0.85.1", - "@opentelemetry/api": "^1.8.0", - "@opentelemetry/context-zone": "^1.23.0", - "@opentelemetry/exporter-trace-otlp-http": "^0.49.1", - "@opentelemetry/instrumentation": "^0.49.1", - "@opentelemetry/instrumentation-fetch": "^0.50.0", - "@opentelemetry/instrumentation-xml-http-request": "^0.49.1", - "@opentelemetry/resources": "^1.23.0", - "@opentelemetry/sdk-trace-web": "^1.21.0", - "@opentelemetry/semantic-conventions": "^1.21.0", + "@nivo/core": "^0.87.0", + "@nivo/line": "^0.87.0", + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/context-zone": "^1.25.0", + "@opentelemetry/exporter-trace-otlp-http": "^0.52.0", + "@opentelemetry/instrumentation": "^0.52.0", + "@opentelemetry/instrumentation-fetch": "^0.52.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.52.1", + "@opentelemetry/resources": "^1.25.0", + "@opentelemetry/sdk-trace-web": "^1.23.0", + "@opentelemetry/semantic-conventions": "^1.25.0", "@tippyjs/react": "^4.2.6", "@types/react-highlight": "^0.12.8", + "@types/react-syntax-highlighter": "^15.5.13", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", - "formik": "^2.2.9", + "CommonProject": "file:../CommonProject", + "formik": "^2.4.6", "history": "^5.3.0", + "jwt-decode": "^4.0.0", "lodash": "^4.17.21", "Model": "file:../Model", "moment-timezone": "^0.5.45", "prop-types": "^15.8.1", - "react": "^18.2.0", + "react": "^18.3.1", "react-beautiful-dnd": "^13.1.1", - "react-big-calendar": "^1.11.2", + "react-big-calendar": "^1.13.0", "react-color": "^2.19.3", - "react-dom": "^18.1.0", + "react-dom": "^18.3.1", "react-dropzone": "^14.2.2", "react-error-boundary": "^4.0.13", "react-highlight": "^0.15.0", "react-markdown": "^8.0.3", - "react-router-dom": "^6.22.3", + "react-router-dom": "^6.23.1", "react-select": "^5.4.0", "react-spinners": "^0.13.6", + "react-syntax-highlighter": "^15.5.0", "react-toggle": "^4.1.3", "reactflow": "^11.11.1", "remark-gfm": "^3.0.1", @@ -20339,7 +20280,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "typeorm": "^0.3.20" }, "devDependencies": { diff --git a/StatusPage/package.json b/StatusPage/package.json index 2a1b67f224..37b20224d8 100644 --- a/StatusPage/package.json +++ b/StatusPage/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "CommonUI": "file:../CommonUI", "css-loader": "^6.11.0", diff --git a/TelemetryIngestor/package-lock.json b/TelemetryIngestor/package-lock.json index d6c2b40674..f8b762c252 100644 --- a/TelemetryIngestor/package-lock.json +++ b/TelemetryIngestor/package-lock.json @@ -10,7 +10,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "Model": "file:../Model", @@ -66,7 +66,7 @@ "axios": "^1.6.2", "bullmq": "^3.6.6", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", @@ -111,7 +111,7 @@ "license": "ISC", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "typeorm": "^0.3.17" }, "devDependencies": { diff --git a/TelemetryIngestor/package.json b/TelemetryIngestor/package.json index 9a7ec56c89..063f5bc488 100644 --- a/TelemetryIngestor/package.json +++ b/TelemetryIngestor/package.json @@ -16,7 +16,7 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "Model": "file:../Model", diff --git a/TestServer/package-lock.json b/TestServer/package-lock.json index a86744842d..48db80a599 100644 --- a/TestServer/package-lock.json +++ b/TestServer/package-lock.json @@ -10,7 +10,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "ts-node": "^10.9.1" @@ -24,21 +23,21 @@ } }, "../Common": { - "name": "common", + "name": "@oneuptime/common", "version": "1.0.0", - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "@types/crypto-js": "^4.1.1", + "@types/crypto-js": "^4.2.2", "@types/uuid": "^8.3.4", - "axios": "^1.6.2", + "axios": "^1.7.2", "crypto-js": "^4.1.1", "json5": "^2.2.3", - "moment": "^2.29.2", - "moment-timezone": "^0.5.40", - "posthog-js": "^1.77.0", - "reflect-metadata": "^0.1.13", + "moment": "^2.30.1", + "moment-timezone": "^0.5.45", + "posthog-js": "^1.139.6", + "reflect-metadata": "^0.2.2", "slugify": "^1.6.5", - "typeorm": "^0.3.6", + "typeorm": "^0.3.20", "uuid": "^8.3.2" }, "devDependencies": { @@ -50,41 +49,50 @@ } }, "../CommonServer": { - "name": "common-server", + "name": "@oneuptime/common-server", "version": "1.0.0", - "license": "MIT", + "license": "Apache-2.0", "dependencies": { - "@clickhouse/client": "^0.2.1", - "@elastic/elasticsearch": "^8.1.0", + "@clickhouse/client": "^0.2.10", + "@elastic/elasticsearch": "^8.12.1", "@opentelemetry/api": "^1.7.0", - "@opentelemetry/auto-instrumentations-node": "^0.40.1", - "@opentelemetry/sdk-node": "^0.45.1", - "@socket.io/redis-adapter": "^8.2.1", + "@opentelemetry/api-logs": "^0.49.1", + "@opentelemetry/auto-instrumentations-node": "^0.43.0", + "@opentelemetry/exporter-logs-otlp-http": "^0.49.1", + "@opentelemetry/exporter-metrics-otlp-proto": "^0.49.1", + "@opentelemetry/exporter-trace-otlp-proto": "^0.49.1", + "@opentelemetry/id-generator-aws-xray": "^1.2.1", + "@opentelemetry/sdk-logs": "^0.49.1", + "@opentelemetry/sdk-metrics": "^1.21.0", + "@opentelemetry/sdk-node": "^0.48.0", + "@opentelemetry/sdk-trace-node": "^1.21.0", + "@types/crypto-js": "^4.2.2", + "acme-client": "^5.3.0", "airtable": "^0.12.2", - "axios": "^1.6.2", - "bullmq": "^3.6.6", + "bullmq": "^5.3.3", "Common": "file:../Common", - "CommonProject": "file:../CommonProject", + "CommonProject": "file:../CommonProject", "cookie-parser": "^1.4.6", "cors": "^2.8.5", "cron-parser": "^4.8.1", - "dotenv": "^16.0.0", - "ejs": "^3.1.8", - "express": "^4.17.3", + "crypto-js": "^4.2.0", + "dotenv": "^16.4.4", + "ejs": "^3.1.10", + "express": "^4.19.2", "ioredis": "^5.3.2", "json2csv": "^5.0.7", "jsonwebtoken": "^9.0.0", - "markdown-it": "^13.0.1", + "marked": "^12.0.2", "Model": "file:../Model", - "nodemailer": "^6.7.3", + "node-cron": "^3.0.3", + "nodemailer": "^6.9.10", "pg": "^8.7.3", - "socket.io": "^4.7.2", + "redis-semaphore": "^5.5.1", + "socket.io": "^4.7.4", "stripe": "^10.17.0", - "twilio": "^4.19.3", - "typeorm": "^0.3.10", - "typeorm-extension": "^2.2.13", - "vm2": "^3.9.14", - "winston": "^3.6.0" + "twilio": "^4.22.0", + "typeorm": "^0.3.20", + "typeorm-extension": "^2.2.13" }, "devDependencies": { "@faker-js/faker": "^6.3.1", @@ -95,8 +103,8 @@ "@types/jest": "^27.4.1", "@types/json2csv": "^5.0.3", "@types/jsonwebtoken": "^8.5.9", - "@types/markdown-it": "^12.2.3", "@types/node": "^17.0.22", + "@types/node-cron": "^3.0.7", "@types/nodemailer": "^6.4.7", "jest": "^27.5.1", "jest-mock-extended": "^3.0.5", diff --git a/TestServer/package.json b/TestServer/package.json index 0ed0508caf..4aaa7a34b7 100644 --- a/TestServer/package.json +++ b/TestServer/package.json @@ -17,7 +17,6 @@ "license": "Apache-2.0", "dependencies": { "Common": "file:../Common", - "CommonProject": "file:../CommonProject", "CommonServer": "file:../CommonServer", "ejs": "^3.1.10", "ts-node": "^10.9.1"