From a6fae61e35aca64dafb777a5e3a580140829c19c Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 10 Dec 2021 23:17:03 +0100 Subject: [PATCH] Towards publishing `monaco-editor-webpack-plugin` --- samples/browser-esm-parcel/package-lock.json | 6 +- samples/browser-esm-parcel/package.json | 2 +- .../browser-esm-vite-react/package-lock.json | 6 +- samples/browser-esm-vite-react/package.json | 2 +- samples/package-lock.json | 6 +- samples/package.json | 2 +- webpack-plugin/README.md | 1 + webpack-plugin/package-lock.json | 6 +- webpack-plugin/package.json | 4 +- webpack-plugin/src/index.ts | 5 +- webpack-plugin/src/metadata.d.ts | 195 ------------------ 11 files changed, 19 insertions(+), 216 deletions(-) delete mode 100644 webpack-plugin/src/metadata.d.ts diff --git a/samples/browser-esm-parcel/package-lock.json b/samples/browser-esm-parcel/package-lock.json index 686b3e6e..00436558 100644 --- a/samples/browser-esm-parcel/package-lock.json +++ b/samples/browser-esm-parcel/package-lock.json @@ -3862,9 +3862,9 @@ } }, "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 }, "ms": { diff --git a/samples/browser-esm-parcel/package.json b/samples/browser-esm-parcel/package.json index 5d72f894..1300c0a3 100644 --- a/samples/browser-esm-parcel/package.json +++ b/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" }, "devDependencies": { - "monaco-editor": "^0.30.1", + "monaco-editor": "^0.31.0", "parcel": "^2.0.1" } } diff --git a/samples/browser-esm-vite-react/package-lock.json b/samples/browser-esm-vite-react/package-lock.json index b283707d..ddaa71fb 100644 --- a/samples/browser-esm-vite-react/package-lock.json +++ b/samples/browser-esm-vite-react/package-lock.json @@ -698,9 +698,9 @@ "dev": true }, "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 }, "ms": { diff --git a/samples/browser-esm-vite-react/package.json b/samples/browser-esm-vite-react/package.json index 6329ca9b..e156caf3 100644 --- a/samples/browser-esm-vite-react/package.json +++ b/samples/browser-esm-vite-react/package.json @@ -8,7 +8,7 @@ }, "dependencies": {}, "devDependencies": { - "monaco-editor": "^0.30.1", + "monaco-editor": "^0.31.0", "react": "^17.0.2", "react-dom": "^17.0.2", "@types/react": "^17.0.35", diff --git a/samples/package-lock.json b/samples/package-lock.json index 115186f7..7bd5fe4b 100644 --- a/samples/package-lock.json +++ b/samples/package-lock.json @@ -2303,9 +2303,9 @@ } }, "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 }, "monaco-editor-webpack-plugin": { diff --git a/samples/package.json b/samples/package.json index 2a90c2c0..238dbccc 100644 --- a/samples/package.json +++ b/samples/package.json @@ -16,7 +16,7 @@ "glob": "^7.2.0", "html-webpack-plugin": "^5.5.0", "monaco-editor-webpack-plugin": "^6.0.0", - "monaco-editor": "^0.30.1", + "monaco-editor": "^0.31.0", "style-loader": "^3.3.1", "terser-webpack-plugin": "^5.2.5", "ts-loader": "^9.2.6", diff --git a/webpack-plugin/README.md b/webpack-plugin/README.md index 58e2e934..3dbc5d65 100644 --- a/webpack-plugin/README.md +++ b/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` | | ------------------------------ | -------------------------------------- | +| `7.*.*` | `>= 0.31.0` | | `6.*.*` | `0.30.*` | | `5.*.*` | `0.29.*` | | `4.*.*` | `0.25.*`, `0.26.*`, `0.27.*`, `0.28.*` | diff --git a/webpack-plugin/package-lock.json b/webpack-plugin/package-lock.json index c36c7a30..e159d28f 100644 --- a/webpack-plugin/package-lock.json +++ b/webpack-plugin/package-lock.json @@ -768,9 +768,9 @@ "dev": true }, "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 }, "nanoid": { diff --git a/webpack-plugin/package.json b/webpack-plugin/package.json index 121fe800..15a6303e 100644 --- a/webpack-plugin/package.json +++ b/webpack-plugin/package.json @@ -30,13 +30,13 @@ "homepage": "https://github.com/microsoft/monaco-editor#readme", "peerDependencies": { "webpack": "^4.5.0 || 5.x", - "monaco-editor": "0.30.x" + "monaco-editor": ">= 0.31.0" }, "devDependencies": { "css-loader": "^6.5.1", "file-loader": "^6.2.0", "glob": "^7.2.0", - "monaco-editor": "^0.30.1", + "monaco-editor": "^0.31.0", "style-loader": "^3.3.1", "typescript": "^4.4.4", "webpack": "^5.64.1", diff --git a/webpack-plugin/src/index.ts b/webpack-plugin/src/index.ts index e5a7e304..1b679b9b 100644 --- a/webpack-plugin/src/index.ts +++ b/webpack-plugin/src/index.ts @@ -5,10 +5,7 @@ import * as fs from 'fs'; import { AddWorkerEntryPointPlugin } from './plugins/AddWorkerEntryPointPlugin'; import { IFeatureDefinition } from './types'; 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'); diff --git a/webpack-plugin/src/metadata.d.ts b/webpack-plugin/src/metadata.d.ts deleted file mode 100644 index 4b52dde4..00000000 --- a/webpack-plugin/src/metadata.d.ts +++ /dev/null @@ -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';