diff --git a/theia-extensions/theia-spring-boot/.gitignore b/theia-extensions/theia-spring-boot/.gitignore index a0160d6e8..7b8d83309 100644 --- a/theia-extensions/theia-spring-boot/.gitignore +++ b/theia-extensions/theia-spring-boot/.gitignore @@ -1,6 +1,7 @@ node_modules .browser_modules lib +server *.log *-app/* !*-app/package.json diff --git a/theia-extensions/theia-spring-boot/spring-boot/images/boot-icon.png b/theia-extensions/theia-spring-boot/spring-boot/images/boot-icon.png new file mode 100644 index 000000000..de88ef0d5 Binary files /dev/null and b/theia-extensions/theia-spring-boot/spring-boot/images/boot-icon.png differ diff --git a/theia-extensions/theia-spring-boot/spring-boot/package.json b/theia-extensions/theia-spring-boot/spring-boot/package.json index 2c9c8b01e..32258949d 100644 --- a/theia-extensions/theia-spring-boot/spring-boot/package.json +++ b/theia-extensions/theia-spring-boot/spring-boot/package.json @@ -6,11 +6,13 @@ "version": "0.0.0", "files": [ "lib", - "src" + "src", + "images" ], "dependencies": { "@theia/core": "latest", "@theia/languages": "latest", + "@theia/editor": "latest", "@theia/monaco": "latest", "@theia/java": "latest", "@pivotal-tools/jvm-launch-utils": "0.0.11", diff --git a/theia-extensions/theia-spring-boot/spring-boot/src/browser/highlight-service.ts b/theia-extensions/theia-spring-boot/spring-boot/src/browser/highlight-service.ts new file mode 100644 index 000000000..57c7ab83b --- /dev/null +++ b/theia-extensions/theia-spring-boot/spring-boot/src/browser/highlight-service.ts @@ -0,0 +1,57 @@ +import { injectable, inject } from 'inversify'; +import { NotificationType } from 'vscode-jsonrpc'; +import { TextDocumentIdentifier, Range } from 'vscode-base-languageclient/lib/base'; +import { EditorDecorationsService, SetDecorationParams, EditorDecorationStyle } from '@theia/editor/lib/browser'; + +export const HIGHLIGHTS_NOTIFICATION_TYPE = new NotificationType("sts/highlight"); + +const BOOT_LIVE_HINTS = 'Boot-Live-Hints'; + +const INLINE_BOOT_HINT_DECORATION_STYLE = new EditorDecorationStyle('inline-boot-hint-decoration', style => { + style.borderStyle = 'dotted'; + style.borderColor = '#32BA56'; + style.borderWidth = '1px'; +}); + +// const LINE_BOOT_HINT_DECORATION_STYLE = new EditorDecorationStyle('line-boot-hint-decoration', style => { +// style.content = '../../images/boot-icon.png'; +// style.display = 'block'; +// style.width = '10px'; +// style.height = '1em'; +// style.margin = '0 2px 0 0'; +// }); + +@injectable() +export class HighlightService { + + constructor( + @inject(EditorDecorationsService) protected readonly decorationService: EditorDecorationsService + ) {} + + highlight(params: HighlightParams) { + const decorationParams: SetDecorationParams = { + uri: params.doc.uri, + kind: BOOT_LIVE_HINTS, + newDecorations: params.ranges.map(r => { + return { + range: Range.create(r.start.line, r.start.character, r.end.line, r.end.character), + options: { + inlineClassName: INLINE_BOOT_HINT_DECORATION_STYLE.className, + // linesDecorationsClassName: LINE_BOOT_HINT_DECORATION_STYLE.className, + hoverMessage: 'Ho-ho, Boot Hint!', + isWholeLine: false + } + } + }) + }; + this.decorationService.setDecorations(decorationParams); + + } + +} + +export interface HighlightParams { + doc: TextDocumentIdentifier + ranges: Range[] +} + diff --git a/theia-extensions/theia-spring-boot/spring-boot/src/browser/language-client-contribution.ts b/theia-extensions/theia-spring-boot/spring-boot/src/browser/language-client-contribution.ts index 85beeded3..80d92447f 100644 --- a/theia-extensions/theia-spring-boot/spring-boot/src/browser/language-client-contribution.ts +++ b/theia-extensions/theia-spring-boot/spring-boot/src/browser/language-client-contribution.ts @@ -8,6 +8,7 @@ import { } from '../common'; import { DocumentSelector } from '@theia/languages/lib/common'; import { JAVA_LANGUAGE_ID } from '@theia/java/lib/common'; +import {HIGHLIGHTS_NOTIFICATION_TYPE, HighlightService} from "./highlight-service"; @injectable() export class SpringBootClientContribution extends BaseLanguageClientContribution { @@ -19,8 +20,12 @@ export class SpringBootClientContribution extends BaseLanguageClientContribution @inject(Workspace) protected readonly workspace: Workspace, @inject(Languages) protected readonly languages: Languages, @inject(LanguageClientFactory) protected readonly languageClientFactory: LanguageClientFactory, + @inject(HighlightService) protected readonly highlightService: HighlightService ) { super(workspace, languages, languageClientFactory); + this.languageClient.then(client => { + client.onNotification(HIGHLIGHTS_NOTIFICATION_TYPE, (params) => this.highlightService.highlight(params)) + }) } protected get documentSelector(): DocumentSelector | undefined { @@ -36,4 +41,5 @@ export class SpringBootClientContribution extends BaseLanguageClientContribution '**/bootstrap*.properties' ]; } + } diff --git a/theia-extensions/theia-spring-boot/spring-boot/src/browser/spring-boot-frontend-module.ts b/theia-extensions/theia-spring-boot/spring-boot/src/browser/spring-boot-frontend-module.ts index 926e7d39b..5ceb04f64 100644 --- a/theia-extensions/theia-spring-boot/spring-boot/src/browser/spring-boot-frontend-module.ts +++ b/theia-extensions/theia-spring-boot/spring-boot/src/browser/spring-boot-frontend-module.ts @@ -4,8 +4,10 @@ import { ContainerModule } from 'inversify'; import './monaco-yaml-contribution'; import './monaco-properties-contribution'; +import {HighlightService} from "./highlight-service"; export default new ContainerModule(bind => { // add your contribution bindings here + bind(HighlightService).toSelf().inSingletonScope(); bind(LanguageClientContribution).to(SpringBootClientContribution).inSingletonScope(); }); \ No newline at end of file diff --git a/theia-extensions/theia-spring-boot/yarn.lock b/theia-extensions/theia-spring-boot/yarn.lock index 84525f578..fc654a4f3 100644 --- a/theia-extensions/theia-spring-boot/yarn.lock +++ b/theia-extensions/theia-spring-boot/yarn.lock @@ -455,12 +455,12 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" "@types/node@*": - version "10.0.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.0.4.tgz#130598ee56e9a1210a53f557d64935571f05390d" + version "10.0.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.0.5.tgz#08c97d0e8ef6ea8ed1df119c839834ffb9e0321a" "@types/node@^8.0.24": - version "8.10.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.12.tgz#dcb66f6de39074a296534bd1a256a3c6a1c8f5b5" + version "8.10.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.13.tgz#786153acbe3e8e0b844053e72c9d9f2db71c796a" "@types/request@^2.0.3": version "2.47.0" @@ -512,115 +512,115 @@ version "8.0.3" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-8.0.3.tgz#6f0ad77792762fc69d209716dbab3201dcba56fb" -"@webassemblyjs/ast@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.3.0.tgz#524246cd578c30ff792d0c7b49bb0a0f89191dd2" +"@webassemblyjs/ast@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.3.1.tgz#3081b4b3ff0af733aa5ba573af998f33711293f8" dependencies: - "@webassemblyjs/helper-wasm-bytecode" "1.3.0" - "@webassemblyjs/wast-parser" "1.3.0" - webassemblyjs "1.3.0" + "@webassemblyjs/helper-wasm-bytecode" "1.3.1" + "@webassemblyjs/wast-parser" "1.3.1" + webassemblyjs "1.3.1" -"@webassemblyjs/floating-point-hex-parser@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.3.0.tgz#a32574e1327a946c78711179fda8bcc808285913" +"@webassemblyjs/floating-point-hex-parser@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.3.1.tgz#82646903ba25c3e5d88dec41ecb4e4d770615bfc" -"@webassemblyjs/helper-buffer@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.3.0.tgz#790599218673099863b6f5f84d36cc8caab861b2" +"@webassemblyjs/helper-buffer@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.3.1.tgz#aa66bb6c274a7e5610d7468f94a2702186713bc6" -"@webassemblyjs/helper-code-frame@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.3.0.tgz#8f7d4cd9a2aed3c633cdd79aa660e96279a349bf" +"@webassemblyjs/helper-code-frame@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.3.1.tgz#b5eba87cf37992e8a62c402545aed87dfd02be83" dependencies: - "@webassemblyjs/wast-printer" "1.3.0" + "@webassemblyjs/wast-printer" "1.3.1" -"@webassemblyjs/helper-fsm@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.3.0.tgz#515141ec51c47b892def606dfc706e7708d4398a" +"@webassemblyjs/helper-fsm@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.3.1.tgz#297113d09a9541613eaeb265d7f948c5e03eb0a2" -"@webassemblyjs/helper-wasm-bytecode@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.3.0.tgz#d23d55fcef04e4f24d6728e31bda8f1257293f91" +"@webassemblyjs/helper-wasm-bytecode@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.3.1.tgz#53b0308988e3a0cad836c83fc0801255906608f8" -"@webassemblyjs/helper-wasm-section@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.3.0.tgz#a8c9435faca44734fc67dfaee4911ac8e6627bd7" +"@webassemblyjs/helper-wasm-section@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.3.1.tgz#3df13898e89a376ffb89439d216d9f0001bf9632" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/helper-buffer" "1.3.0" - "@webassemblyjs/helper-wasm-bytecode" "1.3.0" - "@webassemblyjs/wasm-gen" "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/helper-buffer" "1.3.1" + "@webassemblyjs/helper-wasm-bytecode" "1.3.1" + "@webassemblyjs/wasm-gen" "1.3.1" -"@webassemblyjs/leb128@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.3.0.tgz#b9995160f0f94d785579a149716bb2cb0d102f08" +"@webassemblyjs/leb128@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.3.1.tgz#e0cf1c585c72955637eeeabab1e2ab37c12c2338" dependencies: leb "^0.3.0" -"@webassemblyjs/validation@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.3.0.tgz#0a1261f414607a04e2ffebb1b3ea9777b35c97af" +"@webassemblyjs/validation@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.3.1.tgz#ed0129d7ccca7858a3f46e7e47a6889008547a39" dependencies: - "@webassemblyjs/ast" "1.3.0" + "@webassemblyjs/ast" "1.3.1" -"@webassemblyjs/wasm-edit@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.3.0.tgz#48551c391aebb07e82634cd4ecf257456208a0d3" +"@webassemblyjs/wasm-edit@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.3.1.tgz#a16ca4d9a12144b1b28d4e66ad1ad66ec65e479e" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/helper-buffer" "1.3.0" - "@webassemblyjs/helper-wasm-bytecode" "1.3.0" - "@webassemblyjs/helper-wasm-section" "1.3.0" - "@webassemblyjs/wasm-gen" "1.3.0" - "@webassemblyjs/wasm-opt" "1.3.0" - "@webassemblyjs/wasm-parser" "1.3.0" - "@webassemblyjs/wast-printer" "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/helper-buffer" "1.3.1" + "@webassemblyjs/helper-wasm-bytecode" "1.3.1" + "@webassemblyjs/helper-wasm-section" "1.3.1" + "@webassemblyjs/wasm-gen" "1.3.1" + "@webassemblyjs/wasm-opt" "1.3.1" + "@webassemblyjs/wasm-parser" "1.3.1" + "@webassemblyjs/wast-printer" "1.3.1" debug "^3.1.0" -"@webassemblyjs/wasm-gen@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.3.0.tgz#acf45b38159f351178aa14135e5efa4172931e9a" +"@webassemblyjs/wasm-gen@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.3.1.tgz#43263fc56a0570e0564e407bbcd4c02e85167398" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/helper-wasm-bytecode" "1.3.0" - "@webassemblyjs/leb128" "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/helper-wasm-bytecode" "1.3.1" + "@webassemblyjs/leb128" "1.3.1" -"@webassemblyjs/wasm-opt@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.3.0.tgz#958150b0d631eb407fc9b85b9a852526c849c015" +"@webassemblyjs/wasm-opt@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.3.1.tgz#172601dcdaaacd6b0b002df1252033198c65eceb" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/helper-buffer" "1.3.0" - "@webassemblyjs/wasm-gen" "1.3.0" - "@webassemblyjs/wasm-parser" "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/helper-buffer" "1.3.1" + "@webassemblyjs/wasm-gen" "1.3.1" + "@webassemblyjs/wasm-parser" "1.3.1" -"@webassemblyjs/wasm-parser@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.3.0.tgz#66dd5ac632e0f938b1656bd46f01fe5f5f9488d0" +"@webassemblyjs/wasm-parser@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.3.1.tgz#76727be6c313a9b775170ed38a126558eed7e8ef" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/helper-wasm-bytecode" "1.3.0" - "@webassemblyjs/leb128" "1.3.0" - "@webassemblyjs/wasm-parser" "1.3.0" - webassemblyjs "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/helper-wasm-bytecode" "1.3.1" + "@webassemblyjs/leb128" "1.3.1" + "@webassemblyjs/wasm-parser" "1.3.1" + webassemblyjs "1.3.1" -"@webassemblyjs/wast-parser@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.3.0.tgz#bfc692d8a159d5fde7c1fee0f4e6d848d5bbcb71" +"@webassemblyjs/wast-parser@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.3.1.tgz#62b6eba09580477868dd394cee3e3f5c64e1f3f8" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/floating-point-hex-parser" "1.3.0" - "@webassemblyjs/helper-code-frame" "1.3.0" - "@webassemblyjs/helper-fsm" "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/floating-point-hex-parser" "1.3.1" + "@webassemblyjs/helper-code-frame" "1.3.1" + "@webassemblyjs/helper-fsm" "1.3.1" long "^3.2.0" - webassemblyjs "1.3.0" + webassemblyjs "1.3.1" -"@webassemblyjs/wast-printer@1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.3.0.tgz#b4ed84f0fea9f222d540e25b262cd5eabfee84d4" +"@webassemblyjs/wast-printer@1.3.1": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.3.1.tgz#3e75b889e6f1ba2dfa854e4436b4287e7687e82c" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/wast-parser" "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/wast-parser" "1.3.1" long "^3.2.0" JSONStream@^1.0.4: @@ -1855,8 +1855,8 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000835" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000835.tgz#6556931cdf035903d8655d6303f9501b5915fbe9" + version "1.0.30000836" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000836.tgz#788b6c8f6f02991743b18cdbbd54f96d05b4b95a" caseless@~0.12.0: version "0.12.0" @@ -3326,12 +3326,12 @@ filenamify@^2.0.0: trim-repeated "^1.0.0" fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" + version "2.2.4" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" dependencies: is-number "^2.1.0" isobject "^2.0.0" - randomatic "^1.1.3" + randomatic "^3.0.0" repeat-element "^1.1.2" repeat-string "^1.5.2" @@ -4032,8 +4032,8 @@ iconv-lite@0.4.19: resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" iconv-lite@^0.4.17, iconv-lite@^0.4.4: - version "0.4.22" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.22.tgz#c6b16b9d05bc6c307dc9303a820412995d2eea95" + version "0.4.23" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" dependencies: safer-buffer ">= 2.1.2 < 3" @@ -4919,8 +4919,8 @@ lowercase-keys@^1.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" + version "4.1.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" dependencies: pseudomap "^1.0.2" yallist "^2.1.2" @@ -4957,6 +4957,10 @@ math-expression-evaluator@^1.2.14: version "1.2.17" resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" +math-random@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" + md5.js@^1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" @@ -6325,12 +6329,13 @@ quick-lru@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" -randomatic@^1.1.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" +randomatic@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923" dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" + is-number "^4.0.0" + kind-of "^6.0.0" + math-random "^1.0.1" randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: version "2.0.6" @@ -6933,8 +6938,8 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" shelljs@^0.8.0: - version "0.8.1" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.1.tgz#729e038c413a2254c4078b95ed46e0397154a9f1" + version "0.8.2" + resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35" dependencies: glob "^7.0.0" interpret "^1.0.0" @@ -7927,14 +7932,14 @@ wcwidth@^1.0.0: dependencies: defaults "^1.0.3" -webassemblyjs@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.3.0.tgz#970ca465d5ee45ebe611c5c6f7d461900c3e10b2" +webassemblyjs@1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/webassemblyjs/-/webassemblyjs-1.3.1.tgz#2bb8ebc724d0fe09b9562ab20e32ce3f5bac5c74" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/validation" "1.3.0" - "@webassemblyjs/wasm-parser" "1.3.0" - "@webassemblyjs/wast-parser" "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/validation" "1.3.1" + "@webassemblyjs/wasm-parser" "1.3.1" + "@webassemblyjs/wast-parser" "1.3.1" long "^3.2.0" webpack-addons@^1.1.5: @@ -7981,12 +7986,12 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0: source-map "~0.6.1" webpack@^4.0.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.8.0.tgz#4faef32daf17db89be76b1cb90434508aeec8d3a" + version "4.8.1" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.8.1.tgz#59e38f99f2751c931dd09a035aba7bec4b5f916e" dependencies: - "@webassemblyjs/ast" "1.3.0" - "@webassemblyjs/wasm-edit" "1.3.0" - "@webassemblyjs/wasm-parser" "1.3.0" + "@webassemblyjs/ast" "1.3.1" + "@webassemblyjs/wasm-edit" "1.3.1" + "@webassemblyjs/wasm-parser" "1.3.1" acorn "^5.0.0" acorn-dynamic-import "^3.0.0" ajv "^6.1.0"