From 67fe5926da6dc5ed0ea04f0784f3bf8f19333cd5 Mon Sep 17 00:00:00 2001
From: bas <3939334+basgroot@users.noreply.github.com>
Date: Mon, 12 Sep 2022 22:35:47 +0200
Subject: [PATCH 1/3] Update CDN (RawGit EOL) (#1806)
Issue: #1794
---
README.md | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 18ac16dd3..b88c0229f 100644
--- a/README.md
+++ b/README.md
@@ -65,16 +65,16 @@ $> npm install protobufjs-cli [--save --save-prefix=~]
Development:
```
-
+
```
Production:
```
-
+
```
-**Remember** to replace the version tag with the exact [release](https://github.com/dcodeIO/protobuf.js/tags) your project depends upon.
+**Remember** to replace the version tag with the exact [release](https://github.com/protobufjs/protobuf.js/tags) your project depends upon.
The library supports CommonJS and AMD loaders and also exports globally as `protobuf`.
@@ -94,9 +94,11 @@ Where bundle size is a factor, there are additional stripped-down versions of th
var protobuf = require("protobufjs/minimal");
```
-[dist-full]: https://github.com/dcodeIO/protobuf.js/tree/master/dist
-[dist-light]: https://github.com/dcodeIO/protobuf.js/tree/master/dist/light
-[dist-minimal]: https://github.com/dcodeIO/protobuf.js/tree/master/dist/minimal
+| Distribution | Location
+|------------|-----------------------------------
+| Full |
+| Light |
+| Minimal |
Usage
-----
From 119d90aa1ce14d7bff20bb1dcc1ddc4544a80c23 Mon Sep 17 00:00:00 2001
From: Alexander Fenster
Date: Thu, 22 Sep 2022 11:28:36 -0700
Subject: [PATCH 2/3] fix(types): nested object can be a oneof (#1812)
---
index.d.ts | 2 +-
src/namespace.js | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/index.d.ts b/index.d.ts
index f112654b0..750ad2f73 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -863,7 +863,7 @@ export interface INamespace {
type AnyExtensionField = (IExtensionField|IExtensionMapField);
/** Any nested object descriptor. */
-type AnyNestedObject = (IEnum|IType|IService|AnyExtensionField|INamespace);
+type AnyNestedObject = (IEnum|IType|IService|AnyExtensionField|INamespace|IOneOf);
/** Base class of all reflection objects. */
export abstract class ReflectionObject {
diff --git a/src/namespace.js b/src/namespace.js
index 0f0ba6306..731afc75f 100644
--- a/src/namespace.js
+++ b/src/namespace.js
@@ -143,9 +143,8 @@ Object.defineProperty(Namespace.prototype, "nestedArray", {
/**
* Any nested object descriptor.
* @typedef AnyNestedObject
- * @type {IEnum|IType|IService|AnyExtensionField|INamespace}
+ * @type {IEnum|IType|IService|AnyExtensionField|INamespace|IOneOf}
*/
-// ^ BEWARE: VSCode hangs forever when using more than 5 types (that's why AnyExtensionField exists in the first place)
/**
* Converts this namespace to a namespace descriptor.
From d0268490cb08d2f88e0aafd1d0eb673bd2d3c714 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 11:32:37 -0700
Subject: [PATCH 3/3] chore: release master (#1813)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
.release-please-manifest.json | 2 +-
CHANGELOG.md | 7 +++++++
package-lock.json | 4 ++--
package.json | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 4f5e16ed4..b671781b3 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1 +1 @@
-{".":"7.1.1","cli":"1.0.2"}
+{".":"7.1.2","cli":"1.0.2"}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d53f9b1ca..20e843373 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [7.1.2](https://github.com/protobufjs/protobuf.js/compare/protobufjs-v7.1.1...protobufjs-v7.1.2) (2022-09-22)
+
+
+### Bug Fixes
+
+* **types:** nested object can be a oneof ([#1812](https://github.com/protobufjs/protobuf.js/issues/1812)) ([119d90a](https://github.com/protobufjs/protobuf.js/commit/119d90aa1ce14d7bff20bb1dcc1ddc4544a80c23))
+
## [7.1.1](https://github.com/protobufjs/protobuf.js/compare/protobufjs-v7.1.0...protobufjs-v7.1.1) (2022-09-09)
diff --git a/package-lock.json b/package-lock.json
index 3bb5762a7..f66529dc4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "protobufjs",
- "version": "7.1.1",
+ "version": "7.1.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "protobufjs",
- "version": "7.1.1",
+ "version": "7.1.2",
"hasInstallScript": true,
"license": "BSD-3-Clause",
"dependencies": {
diff --git a/package.json b/package.json
index 6a97a7cf8..864357000 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "protobufjs",
- "version": "7.1.1",
+ "version": "7.1.2",
"versionScheme": "~",
"description": "Protocol Buffers for JavaScript (& TypeScript).",
"author": "Daniel Wirtz ",