From 851e891d0a5b34bca2062ea87e0a2822443a8446 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Thu, 28 Aug 2025 19:23:18 +0200 Subject: [PATCH] Updates monaco-editor-core dependency & fixes basic-languages amd file --- .github/workflows/ci.yml | 58 ++++++++++++++++++++-------------------- build/amd/vite.config.js | 4 +++ package-lock.json | 17 ++++++------ package.json | 2 +- 4 files changed, 43 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85a6568f..4fffbca4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,43 +60,43 @@ jobs: # run: npm link monaco-editor-core # # - # # TODO: prettier formatting - # # - name: Check prettier - # # run: npm run prettier-check + # TODO: prettier formatting + # - name: Check prettier + # run: npm run prettier-check - # - name: Build - # run: npm run build + - name: Build + run: npm run build - # - name: Run unit tests - # run: npm test + - name: Run unit tests + run: npm test - # - name: Compile webpack plugin - # run: npm run compile --prefix webpack-plugin + - name: Compile webpack plugin + run: npm run compile --prefix webpack-plugin - # - name: Package using webpack plugin - # run: npm run package-for-smoketest-webpack + - name: Package using webpack plugin + run: npm run package-for-smoketest-webpack - # - name: Package using esbuild - # run: npm run package-for-smoketest-esbuild + - name: Package using esbuild + run: npm run package-for-smoketest-esbuild - # - name: Package using vite - # run: npm run package-for-smoketest-vite + - name: Package using vite + run: npm run package-for-smoketest-vite - # # - name: Package using parcel - # # run: npm run package-for-smoketest-parcel --prefix test/smoke/parcel - # # Disabled for now, as the parcel bundler cannot deal with VS Code process variable + # - name: Package using parcel + # run: npm run package-for-smoketest-parcel --prefix test/smoke/parcel + # Disabled for now, as the parcel bundler cannot deal with VS Code process variable - # - name: Run smoke test - # run: npm run smoketest + - name: Run smoke test + run: npm run smoketest - # # - name: Install website node modules - # # working-directory: website - # # run: yarn install --frozen-lockfile + # - name: Install website node modules + # working-directory: website + # run: yarn install --frozen-lockfile - # # - name: Build website - # # working-directory: website - # # run: yarn run build + # - name: Build website + # working-directory: website + # run: yarn run build - # # - name: Test website - # # working-directory: website - # # run: yarn test + # - name: Test website + # working-directory: website + # run: yarn test diff --git a/build/amd/vite.config.js b/build/amd/vite.config.js index 9f2eed49..8e0a9eab 100644 --- a/build/amd/vite.config.js +++ b/build/amd/vite.config.js @@ -28,6 +28,10 @@ export default defineConfig(async (args) => { ...nlsEntries, 'nls.messages-loader': resolve(__dirname, 'src/nls.messages-loader.js'), 'editor/editor.main': resolve(__dirname, 'src/editor.main.js'), + 'basic-languages/monaco.contribution': resolve( + __dirname, + '../../src/basic-languages/monaco.contribution.ts' + ), 'language/css/monaco.contribution': resolve( __dirname, '../../src/language/css/monaco.contribution.ts' diff --git a/package-lock.json b/package-lock.json index 97dee6ff..2a29d1e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.52.0-rc2", + "monaco-editor-core": "^0.53.0-dev-20250828", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "prettier": "^2.5.1", @@ -5496,10 +5496,11 @@ "dev": true }, "node_modules/monaco-editor-core": { - "version": "0.52.0-rc2", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.52.0-rc2.tgz", - "integrity": "sha512-buoH7pURwcTnmnO+aQ69jlbJ1Nop7w3sQm1pmBJ6pr/M9/WhAD2GsgL/bOf7kK+Vzd9FlzitlThImezQ28s9+g==", - "dev": true + "version": "0.53.0-dev-20250828", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.53.0-dev-20250828.tgz", + "integrity": "sha512-KDlcU32Fe+stH/FSInNbcGdE0Vi9INYwH0I6veTc2IC9xuiLL9JsmYQ0zLIeFXjfYEtsQWyj0BJYixxCV4GeLg==", + "dev": true, + "license": "MIT" }, "node_modules/mri": { "version": "1.2.0", @@ -11294,9 +11295,9 @@ } }, "monaco-editor-core": { - "version": "0.52.0-rc2", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.52.0-rc2.tgz", - "integrity": "sha512-buoH7pURwcTnmnO+aQ69jlbJ1Nop7w3sQm1pmBJ6pr/M9/WhAD2GsgL/bOf7kK+Vzd9FlzitlThImezQ28s9+g==", + "version": "0.53.0-dev-20250828", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.53.0-dev-20250828.tgz", + "integrity": "sha512-KDlcU32Fe+stH/FSInNbcGdE0Vi9INYwH0I6veTc2IC9xuiLL9JsmYQ0zLIeFXjfYEtsQWyj0BJYixxCV4GeLg==", "dev": true }, "mri": { diff --git a/package.json b/package.json index 349d586b..d0fd5b1c 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.52.0-rc2", + "monaco-editor-core": "^0.53.0-dev-20250828", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "prettier": "^2.5.1",