This repository has been archived by the owner on Mar 24, 2024. It is now read-only.
Bump three and @types/three #5182
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
Bumps [three](https://github.com/mrdoob/three.js) and [@types/three](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/three). These dependencies needed to be updated together. Updates `three` from 0.140.2 to 0.148.0 - [Release notes](https://github.com/mrdoob/three.js/releases) - [Commits](https://github.com/mrdoob/three.js/commits) Updates `@types/three` from 0.140.0 to 0.148.0 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/three) --- updated-dependencies: - dependency-name: three dependency-type: direct:development update-type: version-update:semver-minor - dependency-name: "@types/three" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
jtbandes
previously approved these changes
Jan 20, 2023
jtbandes
reviewed
Jan 20, 2023
Comment on lines
-40
to
-72
| _getShaderCacheForMaterial(material) { | ||
| const cache = this.materialCache; | ||
| + let set = cache.get(material); | ||
|
|
||
| - if (cache.has(material) === false) { | ||
| - cache.set(material, new Set()); | ||
| + if (set == undefined) { | ||
| + set = new Set(); | ||
| + cache.set(material, set); | ||
| } | ||
|
|
||
| - return cache.get(material); | ||
| + return set; | ||
| } | ||
|
|
||
| - _getShaderStage(code) { | ||
| + _getShaderStage(key, code) { | ||
| const cache = this.shaderCache; | ||
| + let stage = cache.get(key); | ||
|
|
||
| - if (cache.has(code) === false) { | ||
| - const stage = new WebGLShaderStage(code); | ||
| - cache.set(code, stage); | ||
| + if (stage == undefined) { | ||
| + stage = new WebGLShaderStage(code); | ||
| + cache.set(key, stage); | ||
| } | ||
|
|
||
| - return cache.get(code); | ||
| + return stage; | ||
| } | ||
|
|
||
| } |
There was a problem hiding this comment.
Some of this patch has now been upstreamed in mrdoob/three.js#24457. The rest is being tracked as mrdoob/three.js#24451
See also: #4021
…rn/three-and-types/three-0.148.0
Merged
jtbandes
approved these changes
Jan 23, 2023
jtbandes
deleted the
dependabot/npm_and_yarn/three-and-types/three-0.148.0
branch
jtbandes
added a commit
that referenced
this pull request
Jan 24, 2023
**User-Facing Changes** None **Description** Attempt to address build failure on #5182. May be related to yarn's built-in TS patch which was supposedly updated in 3.3.1 (yarnpkg/berry#5146 / yarnpkg/berry#5125).
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps three and @types/three. These dependencies needed to be updated together.
Updates
threefrom 0.140.2 to 0.148.0Commits
Updates
@types/threefrom 0.140.0 to 0.148.0Commits
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)