Merge pull request #3303 from weaveworks/jp-ts-project-settings

Fix some typescript project settings affecting local dev

Makefile

@@ -205,15 +205,15 @@ ui-build: node_modules $(shell find ui/src -type f)
 
 # This job assumes that the weave-gitops repo located next to this repo in the filesystem
 core-ui:
-	cd ../../weave-gitops && \
+	cd ../weave-gitops && \
 	npm run build:lib && \
 	npm run typedefs && \
 	cd ../weave-gitops-enterprise
 
 core-lib:
 	rm -rf node_modules/@weaveworks/weave-gitops/
 	rm -rf .parcel-cache/
-	yarn add ../../weave-gitops/dist
+	yarn add ../weave-gitops/dist
 
 ui-audit:
 	# Check js packages for any high or critical vulnerabilities

tsconfig.json

@@ -21,6 +21,6 @@
     "jsx": "react-jsx"
   },
   "include": [
-    "src"
+    "ui"
   ]
 }

ui/src/App.tsx

@@ -6,13 +6,13 @@ import {
   AppContextProvider,
   AuthCheck,
   AuthContextProvider,
+  coreClient,
   CoreClientContextProvider,
   LinkResolverProvider,
   Pendo,
   SignIn,
-  ThemeTypes,
-  coreClient,
   theme,
+  ThemeTypes,
 } from '@weaveworks/weave-gitops';
 import React, { ReactNode } from 'react';
 import {
@@ -24,7 +24,7 @@ import {
 import { BrowserRouter, Route, Switch } from 'react-router-dom';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
-import { ThemeProvider, createGlobalStyle } from 'styled-components';
+import { createGlobalStyle, ThemeProvider } from 'styled-components';
 import { Pipelines } from './api/pipelines/pipelines.pb';
 import { Query } from './api/query/query.pb';
 import { Terraform } from './api/terraform/terraform.pb';

ui/src/svg.d.ts

@@ -0,0 +1,6 @@
+declare module '*.svg' {
+  import React = require('react');
+  export const ReactComponent: React.ElementType<React.SVGProps>;
+  const src: string;
+  export default src;
+}