Skip to content

Commit 3b3a8ab

Browse files
authored
Merge pull request #140 from dibenede/release-bugs
Fix typos in asserts and add LICENSE-asserts.md to package.json
2 parents b792840 + d99e404 commit 3b3a8ab

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

asserts.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ jspb.asserts.fail = function(opt_message, ...args) {
132132
*/
133133
jspb.asserts.assertInstanceof = function(value, type, opt_message, ...args) {
134134
if (!(value instanceof type)) {
135-
jspb.assert.doAssertFailure(
135+
jspb.asserts.doAssertFailure(
136136
'Expected instanceof %s but got %s.',
137-
[jspb.asserts.getType(type), jspb.asseerts.getType(value)],
137+
[jspb.asserts.getType(type), jspb.asserts.getType(value)],
138138
opt_message, args);
139139
}
140140
return value;

package.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
"description": "Protocol Buffers for JavaScript",
55
"main": "google-protobuf.js",
66
"files": [
7-
"google"
7+
"google/protobuf/*_pb.js",
8+
"google/protobuf/compiler/*_pb.js",
9+
"google-protobuf.js",
10+
"LICENSE.md",
11+
"LICENSE-asserts.md",
12+
"package.json",
13+
"README.md"
814
],
915
"dependencies": {},
1016
"devDependencies": {
@@ -24,5 +30,5 @@
2430
"url": "https://github.com/protocolbuffers/protobuf-javascript"
2531
},
2632
"author": "Google Protocol Buffers Team",
27-
"license": "BSD-3-Clause"
33+
"license": "(BSD-3-Clause AND Apache-2.0)"
2834
}

0 commit comments

Comments
 (0)