Răsfoiți Sursa

Towards publishing `monaco-editor-webpack-plugin`

Alex Dima 3 ani în urmă
părinte
comite
a6fae61e35

+ 3 - 3
samples/browser-esm-parcel/package-lock.json

@@ -3862,9 +3862,9 @@
 			}
 			}
 		},
 		},
 		"monaco-editor": {
 		"monaco-editor": {
-			"version": "0.30.1",
-			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz",
-			"integrity": "sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg==",
+			"version": "0.31.0",
+			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.31.0.tgz",
+			"integrity": "sha512-H3QmysEwxxY8oxmFhIFcY9JkuwilUDa6txdAxb797cVr7XFZX27a3SDwcGJmTlV9iGPwdh132r3KKCS5aNL4Gg==",
 			"dev": true
 			"dev": true
 		},
 		},
 		"ms": {
 		"ms": {

+ 1 - 1
samples/browser-esm-parcel/package.json

@@ -11,7 +11,7 @@
 		"build-worker": "parcel build node_modules/monaco-editor/esm/vs/editor/editor.worker.js --no-source-maps --no-optimize"
 		"build-worker": "parcel build node_modules/monaco-editor/esm/vs/editor/editor.worker.js --no-source-maps --no-optimize"
 	},
 	},
 	"devDependencies": {
 	"devDependencies": {
-		"monaco-editor": "^0.30.1",
+		"monaco-editor": "^0.31.0",
 		"parcel": "^2.0.1"
 		"parcel": "^2.0.1"
 	}
 	}
 }
 }

+ 3 - 3
samples/browser-esm-vite-react/package-lock.json

@@ -698,9 +698,9 @@
 			"dev": true
 			"dev": true
 		},
 		},
 		"monaco-editor": {
 		"monaco-editor": {
-			"version": "0.30.1",
-			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz",
-			"integrity": "sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg==",
+			"version": "0.31.0",
+			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.31.0.tgz",
+			"integrity": "sha512-H3QmysEwxxY8oxmFhIFcY9JkuwilUDa6txdAxb797cVr7XFZX27a3SDwcGJmTlV9iGPwdh132r3KKCS5aNL4Gg==",
 			"dev": true
 			"dev": true
 		},
 		},
 		"ms": {
 		"ms": {

+ 1 - 1
samples/browser-esm-vite-react/package.json

@@ -8,7 +8,7 @@
 	},
 	},
 	"dependencies": {},
 	"dependencies": {},
 	"devDependencies": {
 	"devDependencies": {
-		"monaco-editor": "^0.30.1",
+		"monaco-editor": "^0.31.0",
 		"react": "^17.0.2",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"@types/react": "^17.0.35",
 		"@types/react": "^17.0.35",

+ 3 - 3
samples/package-lock.json

@@ -2303,9 +2303,9 @@
 			}
 			}
 		},
 		},
 		"monaco-editor": {
 		"monaco-editor": {
-			"version": "0.30.1",
-			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz",
-			"integrity": "sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg==",
+			"version": "0.31.0",
+			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.31.0.tgz",
+			"integrity": "sha512-H3QmysEwxxY8oxmFhIFcY9JkuwilUDa6txdAxb797cVr7XFZX27a3SDwcGJmTlV9iGPwdh132r3KKCS5aNL4Gg==",
 			"dev": true
 			"dev": true
 		},
 		},
 		"monaco-editor-webpack-plugin": {
 		"monaco-editor-webpack-plugin": {

+ 1 - 1
samples/package.json

@@ -16,7 +16,7 @@
 		"glob": "^7.2.0",
 		"glob": "^7.2.0",
 		"html-webpack-plugin": "^5.5.0",
 		"html-webpack-plugin": "^5.5.0",
 		"monaco-editor-webpack-plugin": "^6.0.0",
 		"monaco-editor-webpack-plugin": "^6.0.0",
-		"monaco-editor": "^0.30.1",
+		"monaco-editor": "^0.31.0",
 		"style-loader": "^3.3.1",
 		"style-loader": "^3.3.1",
 		"terser-webpack-plugin": "^5.2.5",
 		"terser-webpack-plugin": "^5.2.5",
 		"ts-loader": "^9.2.6",
 		"ts-loader": "^9.2.6",

+ 1 - 0
webpack-plugin/README.md

@@ -78,6 +78,7 @@ Options can be passed in to `MonacoWebpackPlugin`. They can be used to generate
 
 
 | `monaco-editor-webpack-plugin` | `monaco-editor`                        |
 | `monaco-editor-webpack-plugin` | `monaco-editor`                        |
 | ------------------------------ | -------------------------------------- |
 | ------------------------------ | -------------------------------------- |
+| `7.*.*`                        | `>= 0.31.0`                            |
 | `6.*.*`                        | `0.30.*`                               |
 | `6.*.*`                        | `0.30.*`                               |
 | `5.*.*`                        | `0.29.*`                               |
 | `5.*.*`                        | `0.29.*`                               |
 | `4.*.*`                        | `0.25.*`, `0.26.*`, `0.27.*`, `0.28.*` |
 | `4.*.*`                        | `0.25.*`, `0.26.*`, `0.27.*`, `0.28.*` |

+ 3 - 3
webpack-plugin/package-lock.json

@@ -768,9 +768,9 @@
 			"dev": true
 			"dev": true
 		},
 		},
 		"monaco-editor": {
 		"monaco-editor": {
-			"version": "0.30.1",
-			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.30.1.tgz",
-			"integrity": "sha512-B/y4+b2O5G2gjuxIFtCE2EkM17R2NM7/3F8x0qcPsqy4V83bitJTIO4TIeZpYlzu/xy6INiY/+84BEm6+7Cmzg==",
+			"version": "0.31.0",
+			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.31.0.tgz",
+			"integrity": "sha512-H3QmysEwxxY8oxmFhIFcY9JkuwilUDa6txdAxb797cVr7XFZX27a3SDwcGJmTlV9iGPwdh132r3KKCS5aNL4Gg==",
 			"dev": true
 			"dev": true
 		},
 		},
 		"nanoid": {
 		"nanoid": {

+ 2 - 2
webpack-plugin/package.json

@@ -30,13 +30,13 @@
 	"homepage": "https://github.com/microsoft/monaco-editor#readme",
 	"homepage": "https://github.com/microsoft/monaco-editor#readme",
 	"peerDependencies": {
 	"peerDependencies": {
 		"webpack": "^4.5.0 || 5.x",
 		"webpack": "^4.5.0 || 5.x",
-		"monaco-editor": "0.30.x"
+		"monaco-editor": ">= 0.31.0"
 	},
 	},
 	"devDependencies": {
 	"devDependencies": {
 		"css-loader": "^6.5.1",
 		"css-loader": "^6.5.1",
 		"file-loader": "^6.2.0",
 		"file-loader": "^6.2.0",
 		"glob": "^7.2.0",
 		"glob": "^7.2.0",
-		"monaco-editor": "^0.30.1",
+		"monaco-editor": "^0.31.0",
 		"style-loader": "^3.3.1",
 		"style-loader": "^3.3.1",
 		"typescript": "^4.4.4",
 		"typescript": "^4.4.4",
 		"webpack": "^5.64.1",
 		"webpack": "^5.64.1",

+ 1 - 4
webpack-plugin/src/index.ts

@@ -5,10 +5,7 @@ import * as fs from 'fs';
 import { AddWorkerEntryPointPlugin } from './plugins/AddWorkerEntryPointPlugin';
 import { AddWorkerEntryPointPlugin } from './plugins/AddWorkerEntryPointPlugin';
 import { IFeatureDefinition } from './types';
 import { IFeatureDefinition } from './types';
 import { ILoaderOptions } from './loaders/include';
 import { ILoaderOptions } from './loaders/include';
-
-// TODO: replace once a new monaco-editor version is published
-// import { EditorLanguage, EditorFeature, NegatedEditorFeature } from 'monaco-editor/esm/metadata';
-import { EditorLanguage, EditorFeature, NegatedEditorFeature } from './metadata';
+import { EditorLanguage, EditorFeature, NegatedEditorFeature } from 'monaco-editor/esm/metadata';
 
 
 const INCLUDE_LOADER_PATH = require.resolve('./loaders/include');
 const INCLUDE_LOADER_PATH = require.resolve('./loaders/include');
 
 

+ 0 - 195
webpack-plugin/src/metadata.d.ts

@@ -1,195 +0,0 @@
-export interface IWorkerDefinition {
-	id: string;
-	entry: string;
-}
-
-export interface IFeatureDefinition {
-	label: string;
-	entry: string | string[] | undefined;
-	worker?: IWorkerDefinition;
-}
-
-export const features: IFeatureDefinition[];
-
-export const languages: IFeatureDefinition[];
-
-export type EditorLanguage =
-	| 'abap'
-	| 'apex'
-	| 'azcli'
-	| 'bat'
-	| 'bicep'
-	| 'cameligo'
-	| 'clojure'
-	| 'coffee'
-	| 'cpp'
-	| 'csharp'
-	| 'csp'
-	| 'css'
-	| 'dart'
-	| 'dockerfile'
-	| 'ecl'
-	| 'elixir'
-	| 'flow9'
-	| 'fsharp'
-	| 'go'
-	| 'graphql'
-	| 'handlebars'
-	| 'hcl'
-	| 'html'
-	| 'ini'
-	| 'java'
-	| 'javascript'
-	| 'json'
-	| 'julia'
-	| 'kotlin'
-	| 'less'
-	| 'lexon'
-	| 'liquid'
-	| 'lua'
-	| 'm3'
-	| 'markdown'
-	| 'mips'
-	| 'msdax'
-	| 'mysql'
-	| 'objective-c'
-	| 'pascal'
-	| 'pascaligo'
-	| 'perl'
-	| 'pgsql'
-	| 'php'
-	| 'pla'
-	| 'postiats'
-	| 'powerquery'
-	| 'powershell'
-	| 'protobuf'
-	| 'pug'
-	| 'python'
-	| 'qsharp'
-	| 'r'
-	| 'razor'
-	| 'redis'
-	| 'redshift'
-	| 'restructuredtext'
-	| 'ruby'
-	| 'rust'
-	| 'sb'
-	| 'scala'
-	| 'scheme'
-	| 'scss'
-	| 'shell'
-	| 'solidity'
-	| 'sophia'
-	| 'sparql'
-	| 'sql'
-	| 'st'
-	| 'swift'
-	| 'systemverilog'
-	| 'tcl'
-	| 'twig'
-	| 'typescript'
-	| 'vb'
-	| 'xml'
-	| 'yaml';
-
-export type EditorFeature =
-	| 'accessibilityHelp'
-	| 'anchorSelect'
-	| 'bracketMatching'
-	| 'caretOperations'
-	| 'clipboard'
-	| 'codeAction'
-	| 'codelens'
-	| 'colorPicker'
-	| 'comment'
-	| 'contextmenu'
-	| 'coreCommands'
-	| 'cursorUndo'
-	| 'dnd'
-	| 'documentSymbols'
-	| 'find'
-	| 'folding'
-	| 'fontZoom'
-	| 'format'
-	| 'gotoError'
-	| 'gotoLine'
-	| 'gotoSymbol'
-	| 'hover'
-	| 'iPadShowKeyboard'
-	| 'inPlaceReplace'
-	| 'indentation'
-	| 'inlayHints'
-	| 'inlineCompletions'
-	| 'inspectTokens'
-	| 'linesOperations'
-	| 'linkedEditing'
-	| 'links'
-	| 'multicursor'
-	| 'parameterHints'
-	| 'quickCommand'
-	| 'quickHelp'
-	| 'quickOutline'
-	| 'referenceSearch'
-	| 'rename'
-	| 'smartSelect'
-	| 'snippets'
-	| 'suggest'
-	| 'toggleHighContrast'
-	| 'toggleTabFocusMode'
-	| 'transpose'
-	| 'unusualLineTerminators'
-	| 'viewportSemanticTokens'
-	| 'wordHighlighter'
-	| 'wordOperations'
-	| 'wordPartOperations';
-
-export type NegatedEditorFeature =
-	| '!accessibilityHelp'
-	| '!anchorSelect'
-	| '!bracketMatching'
-	| '!caretOperations'
-	| '!clipboard'
-	| '!codeAction'
-	| '!codelens'
-	| '!colorPicker'
-	| '!comment'
-	| '!contextmenu'
-	| '!coreCommands'
-	| '!cursorUndo'
-	| '!dnd'
-	| '!documentSymbols'
-	| '!find'
-	| '!folding'
-	| '!fontZoom'
-	| '!format'
-	| '!gotoError'
-	| '!gotoLine'
-	| '!gotoSymbol'
-	| '!hover'
-	| '!iPadShowKeyboard'
-	| '!inPlaceReplace'
-	| '!indentation'
-	| '!inlayHints'
-	| '!inlineCompletions'
-	| '!inspectTokens'
-	| '!linesOperations'
-	| '!linkedEditing'
-	| '!links'
-	| '!multicursor'
-	| '!parameterHints'
-	| '!quickCommand'
-	| '!quickHelp'
-	| '!quickOutline'
-	| '!referenceSearch'
-	| '!rename'
-	| '!smartSelect'
-	| '!snippets'
-	| '!suggest'
-	| '!toggleHighContrast'
-	| '!toggleTabFocusMode'
-	| '!transpose'
-	| '!unusualLineTerminators'
-	| '!viewportSemanticTokens'
-	| '!wordHighlighter'
-	| '!wordOperations'
-	| '!wordPartOperations';