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

stephenh · Apr 16, 2021 · 0d20827 · 0d20827
1 parent 1a8951c
commit 0d20827
Show file tree

Hide file tree

Showing 28 changed files with 36 additions and 4,514 deletions.
diff --git a/README.markdown b/README.markdown
@@ -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
 

diff --git a/integration/codegen.ts b/integration/codegen.ts
@@ -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';

diff --git a/integration/meta-typings/google/protobuf/timestamp.ts b/integration/meta-typings/google/protobuf/timestamp.ts
@@ -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';
 

diff --git a/integration/meta-typings/google/protobuf/wrappers.ts b/integration/meta-typings/google/protobuf/wrappers.ts
@@ -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';
 

diff --git a/integration/meta-typings/google/type/date.ts b/integration/meta-typings/google/type/date.ts
@@ -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';
 

diff --git a/integration/meta-typings/import_dir/thing.ts b/integration/meta-typings/import_dir/thing.ts
@@ -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';

diff --git a/integration/meta-typings/simple.ts b/integration/meta-typings/simple.ts
@@ -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';

diff --git a/package.json b/package.json
@@ -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"
   }
 }
diff --git a/protos/.gitignore b/protos/.gitignore
@@ -1 +1,2 @@
 node_modules/
+*.js
diff --git a/protos/build.sh b/protos/build.sh
@@ -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