Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
209 changes: 123 additions & 86 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/lsp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"dependencies": {
"@coderline/alphatab": "^1.9.0",
"vscode-languageserver": "^9.0.1",
"vscode-languageserver": "^10.1.0",
"vscode-languageserver-textdocument": "^1.0.12"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/lsp/src/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ import {
BrowserMessageReader,
BrowserMessageWriter,
createConnection as createBrowserConnection
} from 'vscode-languageserver/lib/browser/main.js';
} from 'vscode-languageserver/browser';
import {
createConnection as createNodeConnection,
ProposedFeatures as NodeProposedFeatures
} from 'vscode-languageserver/lib/node/main.js';
} from 'vscode-languageserver/node';

function startLanguageServer(serverConnection: Connection) {
const documents = new TextDocuments<AlphaTexTextDocument>(TextDocument);
Expand Down
4 changes: 2 additions & 2 deletions packages/lsp/src/server/types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type * as alphaTab from '@coderline/alphatab';
import type { createConnection as createBrowserConnection } from 'vscode-languageserver/lib/browser/main.js';
import type { createConnection as createNodeConnection } from 'vscode-languageserver/lib/node/main.js';
import type { createConnection as createBrowserConnection } from 'vscode-languageserver/browser';
import type { createConnection as createNodeConnection } from 'vscode-languageserver/node';
import type { TextDocument } from 'vscode-languageserver-textdocument';
import type { Diagnostic } from '@coderline/alphatab-language-server/server/types';

Expand Down
2 changes: 1 addition & 1 deletion packages/monaco/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"dependencies": {
"@coderline/alphatab": "^1.9.0",
"@coderline/alphatab-language-server": "^1.9.0",
"monaco-editor": "^0.55.1",
"monaco-editor": "^0.56.0",
"vscode-languageserver-types": "^3.17.5",
"vscode-oniguruma": "^2.0.1",
"vscode-textmate": "^9.3.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/monaco/src/lspMonacoMappings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export type MonacoLocation = Pick<
export function lspToMonacoMarker(diagnostic: Diagnostic): monaco.editor.IMarkerData {
return {
severity: lspToMonacoSeverity(diagnostic.severity),
message: diagnostic.message,
message: typeof diagnostic.message === 'string' ? diagnostic.message : diagnostic.message.value,
...lspToMonacoRange(diagnostic.range),
code: diagnostic.code?.toString(),
tags: diagnostic.tags,
Expand Down
8 changes: 4 additions & 4 deletions packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"type": "module",
"dependencies": {
"@coderline/alphatab": "*",
"@fontsource/noto-sans": "^5.2.10",
"@fontsource/noto-serif": "^5.2.9",
"@fontsource/noto-sans": "^5.3.0",
"@fontsource/noto-serif": "^5.3.0",
"@popperjs/core": "^2.11.8",
"@types/serve-static": "^2.2.0",
"lucide": "^1.24.0",
"monaco-editor": "^0.55.1",
"lucide": "^1.27.0",
"monaco-editor": "^0.56.0",
"serve-static": "^2.2.1"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/tooling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"devDependencies": {
"@microsoft/api-extractor": "^7.58.9",
"@rollup/plugin-terser": "^1.0.0",
"magic-string": "^1.0.0",
"magic-string": "^1.1.0",
"rollup-plugin-license": "^3.7.0",
"rollup-plugin-node-externals": "^9.0.1",
"typescript": "^6.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"test-web": "npm run test"
},
"dependencies": {
"magic-string": "^1.0.0"
"magic-string": "^1.1.0"
},
"peerDependencies": {
"vite": "^7 || ^8"
Expand Down
5 changes: 3 additions & 2 deletions packages/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"test": "vitest run",
"test-web": "npm run test"
},
"dependencies": {
"webpack": "^5.108.1"
"peerDependencies": {
"webpack": "^5.0.0"
},
"engines": {
"node": ">=20.19.0"
Expand All @@ -57,6 +57,7 @@
"tsx": "^4.22.4",
"typescript": "^6.0.3",
"vitest": "^4.1.10",
"webpack": "^5.109.2",
"webpack-cli": "^7.2.1"
},
"files": [
Expand Down
8 changes: 6 additions & 2 deletions packages/webpack/src/AlphaTabAudioWorklet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,18 @@ export function configureAudioWorklet(
}
});

block.loc = expr.loc;
// webpack 5.109+ stops populating node.loc during traversal — consumers
// must call parser.getLocation(node) to derive it from the range. Older
// webpack lacks getLocation but does set expr.loc directly.
const loc = parser.getLocation ? parser.getLocation(expr) : expr.loc;
block.loc = loc;

const workletBootstrap = webPackWithAlphaTab.alphaTab.createWorkletDependency(
url.string,
[expr.range![0], expr.range![1]],
compiler.options.output.workerPublicPath
);
workletBootstrap.loc = expr.loc!;
workletBootstrap.loc = loc;
block.addDependency(workletBootstrap);
parser.state.module.addBlock(block);

Expand Down
10 changes: 7 additions & 3 deletions packages/webpack/src/AlphaTabWebWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,26 @@ export function configureWebWorker(
}
});

block.loc = expr.loc;
// webpack 5.109+ stops populating node.loc during traversal — consumers
// must call parser.getLocation(node) to derive it from the range. Older
// webpack lacks getLocation but does set expr.loc directly.
const loc = parser.getLocation ? parser.getLocation(expr) : expr.loc;
block.loc = loc;

const workletBootstrap = webPackWithAlphaTab.alphaTab.createWebWorkerDependency(
url.string,
range,
compiler.options.output.workerPublicPath
);
workletBootstrap.loc = expr.loc!;
workletBootstrap.loc = loc;
block.addDependency(workletBootstrap);
parser.state.module.addBlock(block);

const dep1 = new webPackWithAlphaTab.webpack.dependencies.ConstDependency(
`{ type: ${compilation.options.output.module ? '"module"' : 'undefined'} }`,
arg2.range!
);
dep1.loc = expr.loc!;
dep1.loc = loc;
parser.state.module.addPresentationalDependency(dep1);

parser.walkExpression(expr.callee);
Expand Down
Loading