Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add long dep to ts-proto-descriptors. #275

Merged
merged 1 commit into from
Apr 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ If you want to package these source files into an npm package to distribute to c
- Interfaces over classes
- As much as possible, types are just interfaces, so you can work with messages just like regular hashes/data structures.
- Only supports codegen `*.proto`-to-`*.ts` workflow, currently no runtime reflection/loading of dynamic `.proto` files
- Currently ambivalent about browser support, current focus is on Node/server-side use cases

# Example Types

Expand Down
2 changes: 1 addition & 1 deletion integration/codegen.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CodeGeneratorRequest } from 'ts-proto-descriptors/google/protobuf/compiler/plugin';
import { CodeGeneratorRequest } from 'ts-proto-descriptors';
import { mkdir, readFile, writeFile } from 'fs';
import { parse } from 'path';
import { promisify } from 'util';
Expand Down
2 changes: 1 addition & 1 deletion integration/meta-typings/google/protobuf/timestamp.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable */
import { FileDescriptorProto } from 'ts-proto-descriptors/google/protobuf/descriptor';
import { FileDescriptorProto } from 'ts-proto-descriptors';
import { util, configure, Writer, Reader } from 'protobufjs/minimal';
import * as Long from 'long';

Expand Down
2 changes: 1 addition & 1 deletion integration/meta-typings/google/protobuf/wrappers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable */
import { FileDescriptorProto } from 'ts-proto-descriptors/google/protobuf/descriptor';
import { FileDescriptorProto } from 'ts-proto-descriptors';
import { util, configure, Writer, Reader } from 'protobufjs/minimal';
import * as Long from 'long';

Expand Down
2 changes: 1 addition & 1 deletion integration/meta-typings/google/type/date.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable */
import { FileDescriptorProto } from 'ts-proto-descriptors/google/protobuf/descriptor';
import { FileDescriptorProto } from 'ts-proto-descriptors';
import { util, configure, Writer, Reader } from 'protobufjs/minimal';
import * as Long from 'long';

Expand Down
2 changes: 1 addition & 1 deletion integration/meta-typings/import_dir/thing.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable */
import { FileDescriptorProto } from 'ts-proto-descriptors/google/protobuf/descriptor';
import { FileDescriptorProto } from 'ts-proto-descriptors';
import { util, configure, Writer, Reader } from 'protobufjs/minimal';
import * as Long from 'long';
import { protoMetadata as protoMetadata1, Timestamp } from '../google/protobuf/timestamp';
Expand Down
2 changes: 1 addition & 1 deletion integration/meta-typings/simple.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable */
import { FileDescriptorProto } from 'ts-proto-descriptors/google/protobuf/descriptor';
import { FileDescriptorProto } from 'ts-proto-descriptors';
import { util, configure, Reader, Writer } from 'protobufjs/minimal';
import * as Long from 'long';
import { protoMetadata as protoMetadata1, DateMessage } from './google/type/date';
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
"object-hash": "^1.3.1",
"protobufjs": "^6.8.8",
"ts-poet": "^4.5.0",
"ts-proto-descriptors": "^1.2.0"
"ts-proto-descriptors": "^1.2.1"
}
}
1 change: 1 addition & 0 deletions protos/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
*.js
2 changes: 2 additions & 0 deletions protos/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
protoc \
--plugin=./node_modules/ts-proto/protoc-gen-ts_proto \
--ts_proto_out=. \
--ts_proto_opt=exportCommonSymbols=false \
./google/protobuf/descriptor.proto \
./google/protobuf/compiler/plugin.proto

./node_modules/.bin/tsc \
./index.ts \
./google/protobuf/descriptor.ts \
./google/protobuf/compiler/plugin.ts

Expand Down
Loading