Skip to content

Commit

Permalink
Add typescript and configure support for GUI
Browse files Browse the repository at this point in the history
[#163414230]
  • Loading branch information
rupurt committed Feb 13, 2019
1 parent f5eb011 commit f6e846c
Show file tree
Hide file tree
Showing 8 changed files with 475 additions and 329 deletions.
6 changes: 5 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"extends": "react-static/.babelrc",
"presets": ["@babel/preset-react", "@babel/preset-env"],
"presets": [
"@babel/preset-react",
"@babel/preset-env",
"@babel/preset-typescript"
],
"plugins": [
"react-hot-loader/babel",
"@babel/plugin-proposal-export-namespace-from",
Expand Down
656 changes: 339 additions & 317 deletions examples/uptime_sla/yarn.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions gui/src/App.js → gui/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { PureComponent } from 'react'
import { Provider } from 'react-redux'
import createStore from 'connectors/redux'
import Layout from 'Layout'
import createStore from './connectors/redux'
import Layout from './Layout'
import './index.css'

class App extends PureComponent {
Expand Down
3 changes: 2 additions & 1 deletion gui/static.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ export default {
beforeRenderToElement: (render, Comp) => render(Comp),
plugins: [
['react-static-plugin-jss', { providerProps: { generateClassName } }],
['react-static-plugin-react-router']
'react-static-plugin-react-router',
'react-static-plugin-typescript'
],
Document: class CustomHtml extends Component {
render () {
Expand Down
17 changes: 17 additions & 0 deletions gui/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"compilerOptions": {
"target": "es2015",
"module": "esnext",
"lib": ["es2015", "dom"],
"moduleResolution": "node",
"skipLibCheck": true,
"isolatedModules": false,
"noEmit": true,
"allowJs": true,
"jsx": "preserve",
"sourceMap": true,
"removeComments": false,
"strict": true,
"esModuleInterop": true,
},
}
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"scripts": {
"start": "cd gui && react-static start",
"build": "cd gui && react-static build",
"build": "cd gui && NODE_OPTIONS=--max_old_space_size=2048 react-static build",
"serve": "cd gui && serve dist -p 3000",
"storybook": "start-storybook -p 9001 -c .storybook",
"lint": "standard --fix --verbose | snazzy",
Expand Down Expand Up @@ -34,11 +34,14 @@
"@babel/preset-env": "^7.3.1",
"@babel/preset-react": "^7.0.0",
"@babel/preset-stage-2": "^7.0.0",
"@babel/preset-typescript": "^7.1.0",
"@babel/register": "^7.0.0",
"@material-ui/core": "^3.8.1",
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.1",
"@storybook/react": "^4.0.9",
"@types/react": "^16.8.2",
"@types/react-dom": "^16.8.0",
"@types/react-redux": "^7.0.1",
"axios": "^0.18.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^24.1.0",
Expand Down Expand Up @@ -88,6 +91,7 @@
"react-static": "^6.3.6",
"react-static-plugin-jss": "^6.3.0",
"react-static-plugin-react-router": "^6.3.4",
"react-static-plugin-typescript": "^3.1.1",
"react-time-ago": "^3.0.3",
"react-universal-component": "^3.0.0",
"redux": "^4.0.0",
Expand Down
17 changes: 17 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"compilerOptions": {
"target": "es2015",
"module": "esnext",
"lib": ["es2015", "dom"],
"moduleResolution": "node",
"skipLibCheck": true,
"isolatedModules": false,
"noEmit": true,
"allowJs": true,
"jsx": "preserve",
"sourceMap": true,
"removeComments": false,
"strict": true,
"esModuleInterop": true,
},
}
93 changes: 87 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@
resolved "https://registry.npmjs.org/@babel/preset-stage-2/-/preset-stage-2-7.0.0.tgz#11ec31263c8466aad63829bba724607029ddf0a5"
integrity sha512-A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA==

"@babel/preset-typescript@7.1.0":
"@babel/preset-typescript@7.1.0", "@babel/preset-typescript@^7.1.0":
version "7.1.0"
resolved "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.1.0.tgz#49ad6e2084ff0bfb5f1f7fb3b5e76c434d442c7f"
integrity sha512-LYveByuF9AOM8WrsNne5+N79k1YxjNB6gmpCQsnuSBAcV8QUeB+ZUxQzL7Rz7HksPbahymKkq2qBR+o36ggFZA==
Expand Down Expand Up @@ -1922,6 +1922,21 @@
resolved "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==

"@types/react-dom@^16.8.0":
version "16.8.0"
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.8.0.tgz#c565f43f9d2ec911f9e0b8f3b74e25e67879aa3f"
integrity sha512-Jp4ufcEEjVJEB0OHq2MCZcE1u3KYUKO6WnSuiU/tZeYeiZxUoQavfa/TZeiIT+1XoN6l0lQVNM30VINZFDeolQ==
dependencies:
"@types/react" "*"

"@types/react-redux@^7.0.1":
version "7.0.1"
resolved "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.0.1.tgz#9dd2503be7a9861c5a092bf1c5050b7ade4dc62e"
integrity sha512-+DIH7TI2MT4Ke4lOrRMgNy//DzTDIzv5QwkJSD6AVrlsIgzf7yMM0JoWL5wJUXYwKQ2f1FgvwlvIVGD2QWQnew==
dependencies:
"@types/react" "*"
redux "^4.0.0"

"@types/react-transition-group@^2.0.8":
version "2.0.15"
resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-2.0.15.tgz#e5ee3fe558832e141cc6041bdd54caea7b787af8"
Expand All @@ -1937,6 +1952,14 @@
"@types/prop-types" "*"
csstype "^2.2.0"

"@types/react@^16.8.2":
version "16.8.2"
resolved "https://registry.npmjs.org/@types/react/-/react-16.8.2.tgz#3b7a7f7ea89d1c7d68b00849fb5de839011c077b"
integrity sha512-6mcKsqlqkN9xADrwiUz2gm9Wg4iGnlVGciwBRYFQSMWG6MQjhOZ/AVnxn+6v8nslFgfYTV8fNdE6XwKu6va5PA==
dependencies:
"@types/prop-types" "*"
csstype "^2.2.0"

"@types/semver@^5.5.0":
version "5.5.0"
resolved "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
Expand Down Expand Up @@ -3637,7 +3660,7 @@ buffer@^5.0.5:
base64-js "^1.0.2"
ieee754 "^1.1.4"

builtin-modules@^1.0.0:
builtin-modules@^1.0.0, builtin-modules@^1.1.1:
version "1.1.1"
resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
Expand Down Expand Up @@ -4395,7 +4418,7 @@ commander@2.6.0:
resolved "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"
integrity sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=

commander@^2.11.0, commander@^2.18.0, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0:
commander@^2.11.0, commander@^2.12.1, commander@^2.18.0, commander@^2.19.0, commander@^2.8.1, commander@^2.9.0:
version "2.19.0"
resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
Expand Down Expand Up @@ -4588,6 +4611,11 @@ convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
dependencies:
safe-buffer "~5.1.1"

convert-tsconfig-paths-to-webpack-aliases@^0.9.2:
version "0.9.2"
resolved "https://registry.npmjs.org/convert-tsconfig-paths-to-webpack-aliases/-/convert-tsconfig-paths-to-webpack-aliases-0.9.2.tgz#55d67f86c7a506ab5d89d14580ae6e7c07f1aad0"
integrity sha512-4YqIDxlianam30dodKNEbrAur+QWARHKyoV366HabgSBRYzn7MktFdVazvgvijRWMbnj/HyvfNV/YSu/5VK3xA==

cookie-signature@1.0.6:
version "1.0.6"
resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
Expand Down Expand Up @@ -5449,7 +5477,7 @@ diff@3.3.1:
resolved "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
integrity sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==

diff@^3.5.0:
diff@^3.2.0, diff@^3.5.0:
version "3.5.0"
resolved "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
Expand Down Expand Up @@ -7405,6 +7433,18 @@ forever-agent@~0.6.1:
resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=

fork-ts-checker-webpack-plugin@^0.5.2:
version "0.5.2"
resolved "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.5.2.tgz#a73b3630bd0a69409a6e4824e54c03a62fe82d8f"
integrity sha512-a5IG+xXyKnpruI0CP/anyRLAoxWtp3lzdG6flxicANnoSzz64b12dJ7ASAVRrI2OaWwZR2JyBaMHFQqInhWhIw==
dependencies:
babel-code-frame "^6.22.0"
chalk "^2.4.1"
chokidar "^2.0.4"
micromatch "^3.1.10"
minimatch "^3.0.4"
tapable "^1.0.0"

form-data@~2.3.2:
version "2.3.3"
resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
Expand Down Expand Up @@ -9880,7 +9920,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==

js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1:
version "3.12.1"
resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
Expand Down Expand Up @@ -13750,6 +13790,17 @@ react-static-plugin-react-router@^6.3.4:
resolved "https://registry.npmjs.org/react-static-plugin-react-router/-/react-static-plugin-react-router-6.3.4.tgz#18bbb8e751618c31fff29ad59b8d664797cad36e"
integrity sha512-aV+dtgLlaaUWSmjmbOyIDN6FOU+EZK15qZXNOJdDRxkJxwaFAf0fNek3BtK8Za5c/Wcf+wv8CFpUYXDNCH5R+Q==

react-static-plugin-typescript@^3.1.1:
version "3.1.1"
resolved "https://registry.npmjs.org/react-static-plugin-typescript/-/react-static-plugin-typescript-3.1.1.tgz#264dd46b57295dadd9e1db83decdb53c67478198"
integrity sha512-pPZY8fL2Vwsla1tpTTeD9401SQt0lBXxv6J3qYDnf87o11HGq8wGyUm68QZVI0AlioP4utiyxtnhDfuEobDyQg==
dependencies:
"@babel/preset-typescript" "^7.1.0"
convert-tsconfig-paths-to-webpack-aliases "^0.9.2"
fork-ts-checker-webpack-plugin "^0.5.2"
tslint "^5.12.0"
typescript "^3.2.2"

react-static@^6.3.6:
version "6.3.6"
resolved "https://registry.npmjs.org/react-static/-/react-static-6.3.6.tgz#e9d44e1e289fd31200646c6695f24d646a9d862a"
Expand Down Expand Up @@ -16548,16 +16599,41 @@ tryer@^1.0.0:
resolved "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==

tslib@^1, tslib@^1.9.0, tslib@^1.9.3:
tslib@^1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
version "1.9.3"
resolved "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==

tslint@^5.12.0:
version "5.12.1"
resolved "https://registry.npmjs.org/tslint/-/tslint-5.12.1.tgz#8cec9d454cf8a1de9b0a26d7bdbad6de362e52c1"
integrity sha512-sfodBHOucFg6egff8d1BvuofoOQ/nOeYNfbp7LDlKBcLNrL3lmS5zoiDGyOMdT7YsEXAwWpTdAHwOGOc8eRZAw==
dependencies:
babel-code-frame "^6.22.0"
builtin-modules "^1.1.1"
chalk "^2.3.0"
commander "^2.12.1"
diff "^3.2.0"
glob "^7.1.1"
js-yaml "^3.7.0"
minimatch "^3.0.4"
resolve "^1.3.2"
semver "^5.3.0"
tslib "^1.8.0"
tsutils "^2.27.2"

tsort@0.0.1:
version "0.0.1"
resolved "https://registry.npmjs.org/tsort/-/tsort-0.0.1.tgz#e2280f5e817f8bf4275657fd0f9aebd44f5a2786"
integrity sha1-4igPXoF/i/QnVlf9D5rr1E9aJ4Y=

tsutils@^2.27.2:
version "2.29.0"
resolved "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
dependencies:
tslib "^1.8.1"

tty-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
Expand Down Expand Up @@ -16602,6 +16678,11 @@ typedarray@^0.0.6:
resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=

typescript@^3.2.2:
version "3.3.3"
resolved "https://registry.npmjs.org/typescript/-/typescript-3.3.3.tgz#f1657fc7daa27e1a8930758ace9ae8da31403221"
integrity sha512-Y21Xqe54TBVp+VDSNbuDYdGw0BpoR/Q6wo/+35M8PAU0vipahnyduJWirxxdxjsAkS7hue53x2zp8gz7F05u0A==

ua-parser-js@^0.7.18:
version "0.7.19"
resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
Expand Down

0 comments on commit f6e846c

Please sign in to comment.