SystemSh0cker/monaco-editor
1
0
Fork 0
mirror of https://github.com/microsoft/monaco-editor.git synced 2025-12-22 15:05:39 +01:00
Code Issues Projects Releases Packages Activity

Update to latest and simplify docker

Browse source
This commit is contained in:
Alex Dima 2019-03-04 12:58:13 +01:00
parent e174b96db8
commit 5f5ad5056f
3 changed files with 2043 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

2199
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

8
package.json
View file

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

16
src/dockerfile/dockerfile.ts
View file

@ -34,12 +34,6 @@ export const language = <ILanguage>{
defaultToken: '', defaultToken: '',
tokenPostfix: '.dockerfile', 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]+}?/, variable: /\${?[\w]+}?/,
tokenizer: { tokenizer: {
@ -47,13 +41,9 @@ export const language = <ILanguage>{
{ include: '@whitespace' }, { include: '@whitespace' },
{ include: '@comment' }, { include: '@comment' },
[/(@instructionAfter)(\s+)/, ['keyword', { token: '', next: '@instructions' }]], [/(ONBUILD)(\s+)/, ['keyword', '']],
['', 'keyword', '@instructions'] [/(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' }]
instructions: [
[/(@variableAfter)(\s+)([\w]+)/, ['keyword', '', { token: 'variable', next: '@arguments' }]],
[/(@instructions)/, 'keyword', '@arguments']
], ],
arguments: [ arguments: [