BigW Consortium Gitlab

Commit 2f644452 by Stan Hu

Merge branch 'add-typescript' into 'master'

Adds typescript support in webpack. With Mike G. See merge request gitlab-org/gitlab-ce!15264
parents ac4a976c 98b6175e
---
title: Adds typescript support
merge_request:
author:
type: added
...@@ -108,6 +108,10 @@ var config = { ...@@ -108,6 +108,10 @@ var config = {
loader: 'vue-loader', loader: 'vue-loader',
}, },
{ {
test: /\.ts$/,
loader: 'ts-loader',
},
{
test: /\.svg$/, test: /\.svg$/,
loader: 'raw-loader', loader: 'raw-loader',
}, },
...@@ -252,7 +256,7 @@ var config = { ...@@ -252,7 +256,7 @@ var config = {
], ],
resolve: { resolve: {
extensions: ['.js'], extensions: ['.js', '.ts'],
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'),
......
...@@ -61,6 +61,8 @@ ...@@ -61,6 +61,8 @@
"three-orbit-controls": "^82.1.0", "three-orbit-controls": "^82.1.0",
"three-stl-loader": "^1.0.4", "three-stl-loader": "^1.0.4",
"timeago.js": "^2.0.5", "timeago.js": "^2.0.5",
"ts-loader": "^3.1.1",
"typescript": "^2.6.1",
"underscore": "^1.8.3", "underscore": "^1.8.3",
"url-loader": "^0.5.8", "url-loader": "^0.5.8",
"visibilityjs": "^1.2.4", "visibilityjs": "^1.2.4",
......
{
"compilerOptions": {
"target": "es5",
"strict": true,
"module": "es2015",
"moduleResolution": "node"
}
}
\ No newline at end of file
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