Просмотр исходного кода

Updates monaco-editor-core dependency & fixes basic-languages amd file (#4965)

Henning Dieterichs 3 недель назад
Родитель
Сommit
3bfde9adce
4 измененных файлов с 43 добавлено и 38 удалено
  1. 29 29
      .github/workflows/ci.yml
  2. 4 0
      build/amd/vite.config.js
  3. 9 8
      package-lock.json
  4. 1 1
      package.json

+ 29 - 29
.github/workflows/ci.yml

@@ -60,43 +60,43 @@ jobs:
       #   run: npm link monaco-editor-core
       # # </building-from-source>
 
-      # # 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

+ 4 - 0
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'

+ 9 - 8
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": {

+ 1 - 1
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",