Commit e4df83d0 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'revert-2f644452' into 'master'

Revert "Merge branch 'add-typescript' into 'master'"

See merge request gitlab-org/gitlab-ce!15327
parents cfd8c605 3093c208
---
title: Adds typescript support
merge_request:
author:
type: added
...@@ -107,10 +107,6 @@ var config = { ...@@ -107,10 +107,6 @@ var config = {
test: /\.vue$/, test: /\.vue$/,
loader: 'vue-loader', loader: 'vue-loader',
}, },
{
test: /\.ts$/,
loader: 'ts-loader',
},
{ {
test: /\.svg$/, test: /\.svg$/,
loader: 'raw-loader', loader: 'raw-loader',
...@@ -256,7 +252,7 @@ var config = { ...@@ -256,7 +252,7 @@ var config = {
], ],
resolve: { resolve: {
extensions: ['.js', '.ts'], extensions: ['.js'],
alias: { alias: {
'~': path.join(ROOT_PATH, 'app/assets/javascripts'), '~': path.join(ROOT_PATH, 'app/assets/javascripts'),
'emojis': path.join(ROOT_PATH, 'fixtures/emojis'), 'emojis': path.join(ROOT_PATH, 'fixtures/emojis'),
......
{
"compilerOptions": {
"target": "es5",
"strict": true,
"module": "es2015",
"moduleResolution": "node"
}
}
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment