Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[pull] dev from mrdoob:dev #605

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 22, 2025
Merged

[pull] dev from mrdoob:dev #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87c88a4
[email protected] (#31300)
linbingquan Jun 22, 2025
5ad8fee
Manual: Fix links to homepage. (#31301)
Mugen87 Jun 22, 2025
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
4 changes: 2 additions & 2 deletions examples/webgpu_tsl_editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<div id="source"></div>
<div id="result"></div>
<div id="renderer"></div>
<script src="https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs/loader.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs/loader.js"></script>

<script type="importmap">
{
Expand Down Expand Up @@ -99,7 +99,7 @@

// editor

window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.48.0/min/vs' } } );
window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs' } } );

require( [ 'vs/editor/editor.main' ], () => {

Expand Down
4 changes: 2 additions & 2 deletions examples/webgpu_tsl_transpiler.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<div id="source"></div>
<div id="result"></div>
<script src="https://cdn.jsdelivr.net/npm/monaco-editor@latest/min/vs/loader.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs/loader.js"></script>

<script type="importmap">
{
Expand All @@ -51,7 +51,7 @@

// editor

window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.48.0/min/vs' } } );
window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs' } } );

require( [ 'vs/editor/editor.main' ], () => {

Expand Down
4 changes: 2 additions & 2 deletions manual/examples/resources/editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
<button class="button-fullscreen">&nbsp;</button>
</div>
<div class="panelogo">
<div><a href="/"><span data-subst="textContent|name"></span>&nbsp;</a><a href="/"><img data-subst="src|icon" width="32" height="32"/></a></div>
<div><a href="/" target="_blank"><span data-subst="textContent|name"></span>&nbsp;</a><a href="/" target="_blank"><img data-subst="src|icon" width="32" height="32"/></a></div>
</div>
</div>
<div class="panes">
Expand Down Expand Up @@ -277,7 +277,7 @@
</div>
</div>
</body>
<script src="https://cdn.jsdelivr.net/npm/monaco-editor@0.40.0/min/vs/loader.js"></script>
<script src="https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs/loader.js"></script>
<script src="editor-settings.js"></script>
<script src="editor.js"></script>

Expand Down
2 changes: 1 addition & 1 deletion manual/examples/resources/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,7 +1961,7 @@ async function openInStackBlitz() {
} else {

applySubstitutions();
require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.34.1/min/vs' } } );
require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs' } } );
require( [ 'vs/editor/editor.main' ], main );

}
Expand Down
2 changes: 1 addition & 1 deletion playground/elements/CodeEditorElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class CodeEditorElement extends Element {

this.editor = null; // async

window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.48.0/min/vs' } } );
window.require.config( { paths: { 'vs': 'https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs' } } );

require( [ 'vs/editor/editor.main' ], () => {

Expand Down
2 changes: 1 addition & 1 deletion playground/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
</head>
<body>

<script src="https://cdn.jsdelivr.net/npm/monaco-editor@0.48.0/min/vs/loader.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/monaco-editor@0.52.2/min/vs/loader.js"></script>

<script type="importmap">
{
Expand Down