Update to latest and simplify docker

package.json

@@ -18,12 +18,12 @@
     "url": "https://github.com/Microsoft/monaco-languages/issues"
   },
   "devDependencies": {
-    "jsdom": "^13.0.0",
-    "mocha": "^5.2.0",
-    "monaco-editor-core": "0.15.0",
+    "jsdom": "^13.2.0",
+    "mocha": "^6.0.2",
+    "monaco-editor-core": "0.16.0",
     "monaco-plugin-helpers": "^1.0.2",
     "requirejs": "^2.3.6",
-    "typescript": "3.1.6",
+    "typescript": "3.3.3333",
     "uglify-js": "^3.4.9"
   }
 }

src/dockerfile/dockerfile.ts

@@ -34,12 +34,6 @@ export const language = <ILanguage>{
 	defaultToken: '',
 	tokenPostfix: '.dockerfile',
 
-	instructions: /FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|ARG|VOLUME|LABEL|USER|WORKDIR|COPY|CMD|STOPSIGNAL|SHELL|HEALTHCHECK|ENTRYPOINT/,
-
-	instructionAfter: /ONBUILD/,
-
-	variableAfter: /ENV/,
-
 	variable: /\${?[\w]+}?/,
 
 	tokenizer: {
@@ -47,13 +41,9 @@ export const language = <ILanguage>{
 			{ include: '@whitespace' },
 			{ include: '@comment' },
 
-			[/(@instructionAfter)(\s+)/, ['keyword', { token: '', next: '@instructions' }]],
-			['', 'keyword', '@instructions']
-		],
-
-		instructions: [
-			[/(@variableAfter)(\s+)([\w]+)/, ['keyword', '', { token: 'variable', next: '@arguments' }]],
-			[/(@instructions)/, 'keyword', '@arguments']
+			[/(ONBUILD)(\s+)/, ['keyword', '']],
+			[/(ENV)(\s+)([\w]+)/, ['keyword', '', { token: 'variable', next: '@arguments' }]],
+			[/(FROM|MAINTAINER|RUN|EXPOSE|ENV|ADD|ARG|VOLUME|LABEL|USER|WORKDIR|COPY|CMD|STOPSIGNAL|SHELL|HEALTHCHECK|ENTRYPOINT)/, { token: 'keyword', next: '@arguments' }]
 		],
 
 		arguments: [