diff --git a/package.json b/package.json index 86ed76c..828128c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@cldcvr/protobufjs-typescript-gen", - "version": "1.0.0", + "version": "1.0.1", "main": "dist/index.js", "author": "Nikhil Verma ", "license": "MIT", @@ -25,7 +25,7 @@ "typescript": "^4.7.3" }, "dependencies": { - "@cldcvr/protobufjs": "^6.11.4", + "protobufjs": "^7.0.0", "fs-extra": "^10.1.0", "glob": "^8.0.3", "prettier": "^2.6.2" diff --git a/src/enums.ts b/src/enums.ts index 0934050..404f2bf 100644 --- a/src/enums.ts +++ b/src/enums.ts @@ -1,4 +1,4 @@ -import { Enum } from '@cldcvr/protobufjs'; +import { Enum } from 'protobufjs'; import { getCommentBlock } from './utils'; export function getEnumCode(enum_: Enum) { diff --git a/src/index.ts b/src/index.ts index cd6bdf1..d482c66 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,4 @@ -import protobuf, { Enum, Namespace, Service, Type } from '@cldcvr/protobufjs'; +import protobuf, { Enum, Namespace, Service, Type } from 'protobufjs'; import { emptyDirSync, outputFileSync } from 'fs-extra'; import { glob } from 'glob'; import path from 'path'; diff --git a/src/services.ts b/src/services.ts index 3332d84..acb72f3 100644 --- a/src/services.ts +++ b/src/services.ts @@ -1,4 +1,4 @@ -import { Method, Service, Type } from '@cldcvr/protobufjs'; +import { Method, Service, Type } from 'protobufjs'; import { getCommentBlock, getImport, Import, toLowerCaseFirstLetter } from './utils'; export function getServiceInfo(service: Service) { diff --git a/src/types.ts b/src/types.ts index 9fbae36..02df1db 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,4 @@ -import { Type } from '@cldcvr/protobufjs'; +import { Type } from 'protobufjs'; import { getEnumCode } from './enums'; import { ProtoGenOptions } from './options'; import { diff --git a/src/utils.ts b/src/utils.ts index 502265a..d882cb1 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,4 +1,4 @@ -import { Enum, FieldBase, Namespace, ReflectionObject, Service, Type } from '@cldcvr/protobufjs'; +import { Enum, FieldBase, Namespace, ReflectionObject, Service, Type } from 'protobufjs'; import { ProtoGenOptions } from './options'; export function getCommentBlock(object: ReflectionObject) { diff --git a/yarn.lock b/yarn.lock index 3351de1..8066394 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,25 +2,6 @@ # yarn lockfile v1 -"@cldcvr/protobufjs@^6.11.4": - version "6.11.4" - resolved "https://registry.yarnpkg.com/@cldcvr/protobufjs/-/protobufjs-6.11.4.tgz#04677a9de822b9b81dcd0efa5c3069e947d2ef59" - integrity sha512-O3Ib9vvfroQQs3PvMu7hymd8030Ay3b013HdlqE++R+/Teca+B6NG9uyVYewXRSYYH0ctUQo1U2pAskXHXsgHQ== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.1" - "@types/node" ">=13.7.0" - long "^4.0.0" - "@cspotcode/source-map-support@^0.8.0": version "0.8.1" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" @@ -810,10 +791,10 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== +long@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/long/-/long-5.2.0.tgz#2696dadf4b4da2ce3f6f6b89186085d94d52fd61" + integrity sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w== lru-cache@^6.0.0: version "6.0.0" @@ -920,6 +901,25 @@ prettier@^2.6.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032" integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew== +protobufjs@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-7.0.0.tgz#8c678e1351fd926178fce5a4213913e8d990974f" + integrity sha512-ffNIEm+quOcYtQvHdW406v1NQmZSuqVklxsXk076BtuFnlYZfigLU+JOMrTD8TUOyqHYbRI/fSVNvgd25YeN3w== + dependencies: + "@protobufjs/aspromise" "^1.1.2" + "@protobufjs/base64" "^1.1.2" + "@protobufjs/codegen" "^2.0.4" + "@protobufjs/eventemitter" "^1.1.0" + "@protobufjs/fetch" "^1.1.0" + "@protobufjs/float" "^1.0.2" + "@protobufjs/inquire" "^1.1.0" + "@protobufjs/path" "^1.1.2" + "@protobufjs/pool" "^1.1.0" + "@protobufjs/utf8" "^1.1.0" + "@types/long" "^4.0.1" + "@types/node" ">=13.7.0" + long "^5.0.0" + punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"