diff --git a/packages/backend/server/package.json b/packages/backend/server/package.json index 025b9dfa9e..6df9a685f6 100644 --- a/packages/backend/server/package.json +++ b/packages/backend/server/package.json @@ -23,7 +23,6 @@ "@apollo/server": "^4.11.2", "@aws-sdk/client-s3": "^3.709.0", "@fal-ai/serverless-client": "^0.15.0", - "@google-cloud/logging-winston": "^6.0.0", "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.20.0", "@google-cloud/opentelemetry-cloud-trace-exporter": "^2.4.1", "@google-cloud/opentelemetry-resource-util": "^2.4.0", diff --git a/packages/backend/server/src/plugins/gcloud/logging/service.ts b/packages/backend/server/src/plugins/gcloud/logging/service.ts index 5b3c59e57d..6305f058b4 100644 --- a/packages/backend/server/src/plugins/gcloud/logging/service.ts +++ b/packages/backend/server/src/plugins/gcloud/logging/service.ts @@ -1,4 +1,3 @@ -import { LoggingWinston } from '@google-cloud/logging-winston'; import { LoggerService, Provider } from '@nestjs/common'; import { createLogger, format, transports } from 'winston'; @@ -13,15 +12,9 @@ const moreMetadata = format(info => { export const loggerProvider: Provider = { provide: LoggerProvide, useFactory: () => { - const loggingWinston = new LoggingWinston(); - // Create a Winston logger that streams to Cloud Logging const instance = createLogger({ level: 'info', - transports: [ - new transports.Console(), - // Add Cloud Logging - loggingWinston, - ], + transports: [new transports.Console()], format: format.combine(moreMetadata(), format.json()), }); return new AFFiNELogger(instance); diff --git a/packages/frontend/i18n/tsconfig.json b/packages/frontend/i18n/tsconfig.json index 6581598694..583051529d 100644 --- a/packages/frontend/i18n/tsconfig.json +++ b/packages/frontend/i18n/tsconfig.json @@ -10,5 +10,9 @@ "outDir": "./dist", "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo" }, - "references": [{ "path": "../../common/debug" }] + "references": [ + { "path": "../../common/debug" }, + { "path": "../../../tools/cli" }, + { "path": "../../../tools/utils" } + ] } diff --git a/tools/utils/src/workspace.gen.ts b/tools/utils/src/workspace.gen.ts index 689e61d208..6dd6308e05 100644 --- a/tools/utils/src/workspace.gen.ts +++ b/tools/utils/src/workspace.gen.ts @@ -642,7 +642,11 @@ export const PackageList = [ { location: 'packages/frontend/i18n', name: '@affine/i18n', - workspaceDependencies: ['packages/common/debug'], + workspaceDependencies: [ + 'packages/common/debug', + 'tools/cli', + 'tools/utils', + ], }, { location: 'packages/frontend/native', diff --git a/yarn.lock b/yarn.lock index 74856a4f2b..bb783b59d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -774,7 +774,6 @@ __metadata: "@apollo/server": "npm:^4.11.2" "@aws-sdk/client-s3": "npm:^3.709.0" "@fal-ai/serverless-client": "npm:^0.15.0" - "@google-cloud/logging-winston": "npm:^6.0.0" "@google-cloud/opentelemetry-cloud-monitoring-exporter": "npm:^0.20.0" "@google-cloud/opentelemetry-cloud-trace-exporter": "npm:^2.4.1" "@google-cloud/opentelemetry-resource-util": "npm:^2.4.0" @@ -6254,61 +6253,6 @@ __metadata: languageName: node linkType: hard -"@google-cloud/common@npm:^5.0.0": - version: 5.0.2 - resolution: "@google-cloud/common@npm:5.0.2" - dependencies: - "@google-cloud/projectify": "npm:^4.0.0" - "@google-cloud/promisify": "npm:^4.0.0" - arrify: "npm:^2.0.1" - duplexify: "npm:^4.1.1" - extend: "npm:^3.0.2" - google-auth-library: "npm:^9.0.0" - html-entities: "npm:^2.5.2" - retry-request: "npm:^7.0.0" - teeny-request: "npm:^9.0.0" - checksum: 10/a21a07d5cb3ab7bbe8c2756dd5b853210eacdd11b7866610003c1c87b93d4ae176373b163fe80bd5dbdb6e8fae3e0a3f999f546ed5d1c177eeae2af9a4e7b701 - languageName: node - linkType: hard - -"@google-cloud/logging-winston@npm:^6.0.0": - version: 6.0.0 - resolution: "@google-cloud/logging-winston@npm:6.0.0" - dependencies: - "@google-cloud/logging": "npm:^11.0.0" - google-auth-library: "npm:^9.0.0" - lodash.mapvalues: "npm:^4.6.0" - winston-transport: "npm:^4.3.0" - peerDependencies: - winston: ">=3.2.1" - checksum: 10/276b3a392d30a27c0ad34e19494bbcb5543263a4e3bb1834348931eb47ad4c735233400fe66d394cbb78ad3a390812de6dd499a29f58913dc11dd293fbd24b98 - languageName: node - linkType: hard - -"@google-cloud/logging@npm:^11.0.0": - version: 11.2.0 - resolution: "@google-cloud/logging@npm:11.2.0" - dependencies: - "@google-cloud/common": "npm:^5.0.0" - "@google-cloud/paginator": "npm:^5.0.0" - "@google-cloud/projectify": "npm:^4.0.0" - "@google-cloud/promisify": "npm:^4.0.0" - "@opentelemetry/api": "npm:^1.7.0" - arrify: "npm:^2.0.1" - dot-prop: "npm:^6.0.0" - eventid: "npm:^2.0.0" - extend: "npm:^3.0.2" - gcp-metadata: "npm:^6.0.0" - google-auth-library: "npm:^9.0.0" - google-gax: "npm:^4.0.3" - on-finished: "npm:^2.3.0" - pumpify: "npm:^2.0.1" - stream-events: "npm:^1.0.5" - uuid: "npm:^9.0.0" - checksum: 10/45e9af8e0673ae1c6d40da8f4b40a5717abdfc14ab153694c38bb2e323cb08f02341658a259f4f4f43868f0a1af249bfb13632387c502818ad4eb01294f564b3 - languageName: node - linkType: hard - "@google-cloud/opentelemetry-cloud-monitoring-exporter@npm:^0.20.0": version: 0.20.0 resolution: "@google-cloud/opentelemetry-cloud-monitoring-exporter@npm:0.20.0" @@ -6355,16 +6299,6 @@ __metadata: languageName: node linkType: hard -"@google-cloud/paginator@npm:^5.0.0": - version: 5.0.2 - resolution: "@google-cloud/paginator@npm:5.0.2" - dependencies: - arrify: "npm:^2.0.0" - extend: "npm:^3.0.2" - checksum: 10/b64ba2029b77fdcf3c827aea0b6d128122fd1d2f4aa8c1ba70747cba0659d4216a283769fb3bbeb8f726176f5282624637f02c30f118a010e05838411da0cb76 - languageName: node - linkType: hard - "@google-cloud/precise-date@npm:^4.0.0": version: 4.0.0 resolution: "@google-cloud/precise-date@npm:4.0.0" @@ -6372,20 +6306,6 @@ __metadata: languageName: node linkType: hard -"@google-cloud/projectify@npm:^4.0.0": - version: 4.0.0 - resolution: "@google-cloud/projectify@npm:4.0.0" - checksum: 10/fdccdda0b50855c35541d71c46a6603f3302ff1a00108d946272cb2167435da00e2a2da5963fe489f4f5a4a9eb6320abeb97d3269974a972ae89f5df8451922d - languageName: node - linkType: hard - -"@google-cloud/promisify@npm:^4.0.0": - version: 4.0.0 - resolution: "@google-cloud/promisify@npm:4.0.0" - checksum: 10/c5de81321b3a5c567edcbe0b941fb32644611147f3ba22f20575918c225a979988a99bc2ebda05ac914fa8714b0a54c69be72c3f46c7a64c3b19db7d7fba8d04 - languageName: node - linkType: hard - "@googleapis/androidpublisher@npm:^22.0.0": version: 22.0.0 resolution: "@googleapis/androidpublisher@npm:22.0.0" @@ -7090,7 +7010,7 @@ __metadata: languageName: node linkType: hard -"@grpc/grpc-js@npm:^1.1.8, @grpc/grpc-js@npm:^1.10.9, @grpc/grpc-js@npm:^1.7.1": +"@grpc/grpc-js@npm:^1.1.8, @grpc/grpc-js@npm:^1.7.1": version: 1.12.5 resolution: "@grpc/grpc-js@npm:1.12.5" dependencies: @@ -9938,7 +9858,7 @@ __metadata: languageName: node linkType: hard -"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:^1.7.0, @opentelemetry/api@npm:^1.8, @opentelemetry/api@npm:^1.9.0": +"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:^1.8, @opentelemetry/api@npm:^1.9.0": version: 1.9.0 resolution: "@opentelemetry/api@npm:1.9.0" checksum: 10/a607f0eef971893c4f2ee2a4c2069aade6ec3e84e2a1f5c2aac19f65c5d9eeea41aa72db917c1029faafdd71789a1a040bdc18f40d63690e22ccae5d7070f194 @@ -14995,13 +14915,6 @@ __metadata: languageName: node linkType: hard -"@types/caseless@npm:*": - version: 0.12.5 - resolution: "@types/caseless@npm:0.12.5" - checksum: 10/f6a3628add76d27005495914c9c3873a93536957edaa5b69c63b46fe10b4649a6fecf16b676c1695f46aab851da47ec6047dcf3570fa8d9b6883492ff6d074e0 - languageName: node - linkType: hard - "@types/connect-history-api-fallback@npm:^1.5.4": version: 1.5.4 resolution: "@types/connect-history-api-fallback@npm:1.5.4" @@ -15691,18 +15604,6 @@ __metadata: languageName: node linkType: hard -"@types/request@npm:^2.48.8": - version: 2.48.12 - resolution: "@types/request@npm:2.48.12" - dependencies: - "@types/caseless": "npm:*" - "@types/node": "npm:*" - "@types/tough-cookie": "npm:*" - form-data: "npm:^2.5.0" - checksum: 10/a7b3f9f14cacc18fe235bb8e57eff1232a04bd3fa3dad29371f24a5d96db2cd295a0c8b6b34ed7efa3efbbcff845febb02c9635cd68c54811c947ea66ae22090 - languageName: node - linkType: hard - "@types/resolve@npm:^1.20.2": version: 1.20.6 resolution: "@types/resolve@npm:1.20.6" @@ -15849,7 +15750,7 @@ __metadata: languageName: node linkType: hard -"@types/tough-cookie@npm:*, @types/tough-cookie@npm:^4.0.5": +"@types/tough-cookie@npm:^4.0.5": version: 4.0.5 resolution: "@types/tough-cookie@npm:4.0.5" checksum: 10/01fd82efc8202670865928629697b62fe9bf0c0dcbc5b1c115831caeb073a2c0abb871ff393d7df1ae94ea41e256cb87d2a5a91fd03cdb1b0b4384e08d4ee482 @@ -17386,13 +17287,6 @@ __metadata: languageName: node linkType: hard -"arrify@npm:^2.0.0, arrify@npm:^2.0.1": - version: 2.0.1 - resolution: "arrify@npm:2.0.1" - checksum: 10/067c4c1afd182806a82e4c1cb8acee16ab8b5284fbca1ce29408e6e91281c36bb5b612f6ddfbd40a0f7a7e0c75bf2696eb94c027f6e328d6e9c52465c98e4209 - languageName: node - linkType: hard - "arrify@npm:^3.0.0": version: 3.0.0 resolution: "arrify@npm:3.0.0" @@ -19171,7 +19065,7 @@ __metadata: languageName: node linkType: hard -"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8": +"combined-stream@npm:^1.0.8": version: 1.0.8 resolution: "combined-stream@npm:1.0.8" dependencies: @@ -20645,15 +20539,6 @@ __metadata: languageName: node linkType: hard -"dot-prop@npm:^6.0.0": - version: 6.0.1 - resolution: "dot-prop@npm:6.0.1" - dependencies: - is-obj: "npm:^2.0.0" - checksum: 10/1200a4f6f81151161b8526c37966d60738cf12619b0ed1f55be01bdb55790bf0a5cd1398b8f2c296dcc07d0a7c2dd0e650baf0b069c367e74bb5df2f6603aba0 - languageName: node - linkType: hard - "dotenv-expand@npm:^11.0.6": version: 11.0.7 resolution: "dotenv-expand@npm:11.0.7" @@ -20713,18 +20598,6 @@ __metadata: languageName: node linkType: hard -"duplexify@npm:^4.0.0, duplexify@npm:^4.1.1": - version: 4.1.3 - resolution: "duplexify@npm:4.1.3" - dependencies: - end-of-stream: "npm:^1.4.1" - inherits: "npm:^2.0.3" - readable-stream: "npm:^3.1.1" - stream-shift: "npm:^1.0.2" - checksum: 10/b44b98ba0ffac3a658b4b1bf877219e996db288c5ae6f3dc55ca9b2cbef7df60c10eabfdd947f3d73a623eb9975a74a66d6d61e6f26bff90155315adb362aa77 - languageName: node - linkType: hard - "eastasianwidth@npm:^0.2.0": version: 0.2.0 resolution: "eastasianwidth@npm:0.2.0" @@ -22076,15 +21949,6 @@ __metadata: languageName: node linkType: hard -"eventid@npm:^2.0.0": - version: 2.0.1 - resolution: "eventid@npm:2.0.1" - dependencies: - uuid: "npm:^8.0.0" - checksum: 10/951957a9b23653fe4e6f2318e1469b35fcb46eef55ba18a0e40762c7d0ee9a2759efab4359055e36230bc6be22e4dac97a9fbff1c3dd211d2cd9b0210ea3594c - languageName: node - linkType: hard - "events@npm:^3.2.0": version: 3.3.0 resolution: "events@npm:3.3.0" @@ -22800,18 +22664,6 @@ __metadata: languageName: node linkType: hard -"form-data@npm:^2.5.0": - version: 2.5.2 - resolution: "form-data@npm:2.5.2" - dependencies: - asynckit: "npm:^0.4.0" - combined-stream: "npm:^1.0.6" - mime-types: "npm:^2.1.12" - safe-buffer: "npm:^5.2.1" - checksum: 10/ef602e52f0bfcc8f8c346b8783f6dbd2fb271596788d42cf929dddaa50bd61e97da21f01464b4524e77872682264765e53c75ac1ab1466ea23f5c96de585faff - languageName: node - linkType: hard - "form-data@npm:^4.0.0": version: 4.0.1 resolution: "form-data@npm:4.0.1" @@ -23623,7 +23475,7 @@ __metadata: languageName: node linkType: hard -"google-auth-library@npm:^9.0.0, google-auth-library@npm:^9.3.0, google-auth-library@npm:^9.7.0": +"google-auth-library@npm:^9.0.0, google-auth-library@npm:^9.7.0": version: 9.15.0 resolution: "google-auth-library@npm:9.15.0" dependencies: @@ -23637,26 +23489,6 @@ __metadata: languageName: node linkType: hard -"google-gax@npm:^4.0.3": - version: 4.4.1 - resolution: "google-gax@npm:4.4.1" - dependencies: - "@grpc/grpc-js": "npm:^1.10.9" - "@grpc/proto-loader": "npm:^0.7.13" - "@types/long": "npm:^4.0.0" - abort-controller: "npm:^3.0.0" - duplexify: "npm:^4.0.0" - google-auth-library: "npm:^9.3.0" - node-fetch: "npm:^2.7.0" - object-hash: "npm:^3.0.0" - proto3-json-serializer: "npm:^2.0.2" - protobufjs: "npm:^7.3.2" - retry-request: "npm:^7.0.0" - uuid: "npm:^9.0.1" - checksum: 10/c569e603b9191a1036b01daf442fbcc786c14c66abf7cc8d7451d396ee7d7ae1f52f7c020b22410b6e82e71807a6000bef582c7fb6e4faf9ff19b93f498cfdf0 - languageName: node - linkType: hard - "googleapis-common@npm:^7.0.0": version: 7.2.0 resolution: "googleapis-common@npm:7.2.0" @@ -24082,13 +23914,6 @@ __metadata: languageName: node linkType: hard -"html-entities@npm:^2.5.2": - version: 2.5.2 - resolution: "html-entities@npm:2.5.2" - checksum: 10/4ec12ebdf2d5ba8192c68e1aef3c1e4a4f36b29246a0a88464fe278a54517d0196d3489af46a3145c7ecacb4fc5fd50497be19eb713b810acab3f0efcf36fdc2 - languageName: node - linkType: hard - "html-escaper@npm:^2.0.0": version: 2.0.2 resolution: "html-escaper@npm:2.0.2" @@ -26413,13 +26238,6 @@ __metadata: languageName: node linkType: hard -"lodash.mapvalues@npm:^4.6.0": - version: 4.6.0 - resolution: "lodash.mapvalues@npm:4.6.0" - checksum: 10/566032abaacbc5dc7e74673e589830d2694ec03dc979ac134c93985b47409ac845cbd4eea3786cc0b4db4e80d726a32c1119af63d0151520e27789568aa76bd2 - languageName: node - linkType: hard - "lodash.memoize@npm:^4.1.2": version: 4.1.2 resolution: "lodash.memoize@npm:4.1.2" @@ -28759,7 +28577,7 @@ __metadata: languageName: node linkType: hard -"object-hash@npm:3.0.0, object-hash@npm:^3.0.0": +"object-hash@npm:3.0.0": version: 3.0.0 resolution: "object-hash@npm:3.0.0" checksum: 10/f498d456a20512ba7be500cef4cf7b3c183cc72c65372a549c9a0e6dd78ce26f375e9b1315c07592d3fde8f10d5019986eba35970570d477ed9a2a702514432a @@ -28850,7 +28668,7 @@ __metadata: languageName: node linkType: hard -"on-finished@npm:2.4.1, on-finished@npm:^2.3.0, on-finished@npm:^2.4.1": +"on-finished@npm:2.4.1, on-finished@npm:^2.4.1": version: 2.4.1 resolution: "on-finished@npm:2.4.1" dependencies: @@ -30525,16 +30343,7 @@ __metadata: languageName: node linkType: hard -"proto3-json-serializer@npm:^2.0.2": - version: 2.0.2 - resolution: "proto3-json-serializer@npm:2.0.2" - dependencies: - protobufjs: "npm:^7.2.5" - checksum: 10/d588337f9a24a94ac14a456261af48ea07e6d0a8a00faebb0b689e79e83925383b9d3ea713184d6336d0bb743dd803f188710e3e8fbfb316586cd1e3f7862a56 - languageName: node - linkType: hard - -"protobufjs@npm:^7.2.5, protobufjs@npm:^7.3.0, protobufjs@npm:^7.3.2": +"protobufjs@npm:^7.2.5, protobufjs@npm:^7.3.0": version: 7.4.0 resolution: "protobufjs@npm:7.4.0" dependencies: @@ -30597,17 +30406,6 @@ __metadata: languageName: node linkType: hard -"pumpify@npm:^2.0.1": - version: 2.0.1 - resolution: "pumpify@npm:2.0.1" - dependencies: - duplexify: "npm:^4.1.1" - inherits: "npm:^2.0.3" - pump: "npm:^3.0.0" - checksum: 10/54bfdd04a30f459de5f1d1d022dc729e7257748900adf567a3b009f5aefe4a862ca91f3fb272f86c621eae631c4cc41f0efe5ee270752e2f9a90e7e63a9f8570 - languageName: node - linkType: hard - "punycode.js@npm:^2.3.1": version: 2.3.1 resolution: "punycode.js@npm:2.3.1" @@ -31743,17 +31541,6 @@ __metadata: languageName: node linkType: hard -"retry-request@npm:^7.0.0": - version: 7.0.2 - resolution: "retry-request@npm:7.0.2" - dependencies: - "@types/request": "npm:^2.48.8" - extend: "npm:^3.0.2" - teeny-request: "npm:^9.0.0" - checksum: 10/8f4c927d41dd575fc460aad7b762fb0a33542097201c3c1a31529ad17fa8af3ac0d2a45bf4a2024d079913e9c2dd431566070fe33321c667ac87ebb400de5917 - languageName: node - linkType: hard - "retry@npm:0.13.1, retry@npm:^0.13.1": version: 0.13.1 resolution: "retry@npm:0.13.1" @@ -32036,7 +31823,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: 10/32872cd0ff68a3ddade7a7617b8f4c2ae8764d8b7d884c651b74457967a9e0e886267d3ecc781220629c44a865167b61c375d2da6c720c840ecd73f45d5d9451 @@ -33257,22 +33044,6 @@ __metadata: languageName: node linkType: hard -"stream-events@npm:^1.0.5": - version: 1.0.5 - resolution: "stream-events@npm:1.0.5" - dependencies: - stubs: "npm:^3.0.0" - checksum: 10/969ce82e34bfbef5734629cc06f9d7f3705a9ceb8fcd6a526332f9159f1f8bbfdb1a453f3ced0b728083454f7706adbbe8428bceb788a0287ca48ba2642dc3fc - languageName: node - linkType: hard - -"stream-shift@npm:^1.0.2": - version: 1.0.3 - resolution: "stream-shift@npm:1.0.3" - checksum: 10/a24c0a3f66a8f9024bd1d579a533a53be283b4475d4e6b4b3211b964031447bdf6532dd1f3c2b0ad66752554391b7c62bd7ca4559193381f766534e723d50242 - languageName: node - linkType: hard - "streamsearch@npm:^1.1.0": version: 1.1.0 resolution: "streamsearch@npm:1.1.0" @@ -33536,13 +33307,6 @@ __metadata: languageName: node linkType: hard -"stubs@npm:^3.0.0": - version: 3.0.0 - resolution: "stubs@npm:3.0.0" - checksum: 10/dec7b82186e3743317616235c59bfb53284acc312cb9f4c3e97e2205c67a5c158b0ca89db5927e52351582e90a2672822eeaec9db396e23e56893d2a8676e024 - languageName: node - linkType: hard - "style-loader@npm:^4.0.0": version: 4.0.0 resolution: "style-loader@npm:4.0.0" @@ -33865,19 +33629,6 @@ __metadata: languageName: node linkType: hard -"teeny-request@npm:^9.0.0": - version: 9.0.0 - resolution: "teeny-request@npm:9.0.0" - dependencies: - http-proxy-agent: "npm:^5.0.0" - https-proxy-agent: "npm:^5.0.0" - node-fetch: "npm:^2.6.9" - stream-events: "npm:^1.0.5" - uuid: "npm:^9.0.0" - checksum: 10/44daabb6c2e239c3daed0218ebdafb50c7141c16d7257a6cfef786dbff56d7853c2c02c97934f7ed57818ce5861ac16c5f52f3a16fa292bd4caf53483d386443 - languageName: node - linkType: hard - "temp-dir@npm:^3.0.0": version: 3.0.0 resolution: "temp-dir@npm:3.0.0" @@ -35231,7 +34982,7 @@ __metadata: languageName: node linkType: hard -"uuid@npm:^8.0.0, uuid@npm:^8.3.2": +"uuid@npm:^8.3.2": version: 8.3.2 resolution: "uuid@npm:8.3.2" bin: @@ -35889,7 +35640,7 @@ __metadata: languageName: node linkType: hard -"winston-transport@npm:^4.3.0, winston-transport@npm:^4.9.0": +"winston-transport@npm:^4.9.0": version: 4.9.0 resolution: "winston-transport@npm:4.9.0" dependencies: