diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-10-16 17:48:45 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-10-16 17:48:45 +0300 |
| commit | b69861c204a6295a413802255f18606bb8c71db9 (patch) | |
| tree | bc27af69e9a35f7cbcbb0392b7e3bfd577ed39ab /config/webpack.config.js | |
| parent | 42a69d7522ea0d5efc16b202a3d110ca00185a6e (diff) | |
| parent | 077ecf8a80733878fd35a407bdd623273598c3e2 (diff) | |
Merge branch 'ide-update-monaco' into 'master'
Upgrading Monaco
Closes #38607
See merge request gitlab-org/gitlab-ce!14629
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index a71794b379d..f7a7182a627 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -236,7 +236,7 @@ var config = { from: path.join(ROOT_PATH, `node_modules/monaco-editor/${IS_PRODUCTION ? 'min' : 'dev'}/vs`), to: 'monaco-editor/vs', transform: function(content, path) { - if (/\.js$/.test(path) && !/worker/i.test(path)) { + if (/\.js$/.test(path) && !/worker/i.test(path) && !/typescript/i.test(path)) { return ( '(function(){\n' + 'var define = this.define, require = this.require;\n' + |