Merge pull request #923 from finos/rm-vite-workbench-2

Rm vite workbench 2
finos · Mar 20, 2023 · f849c7c · f849c7c
2 parents 99772d0 + 6311df9
commit f849c7c
Show file tree

Hide file tree

Showing 10 changed files with 7,687 additions and 33,966 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,4 +18,4 @@ website/.docusaurus/**
 
 .idea/
 *.iml
-website/.yarn
+website/.yarn
diff --git a/netlify.toml b/netlify.toml
diff --git a/toolbox/fdc3-workbench/public/index.html → toolbox/fdc3-workbench/index.html b/toolbox/fdc3-workbench/public/index.html → toolbox/fdc3-workbench/index.html
@@ -2,19 +2,20 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+		<link rel="icon" href="/favicon.ico" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		<meta name="theme-color" content="#000000" />
 		<meta
 			name="description"
 			content="FDC3 workbench application, designed to help develop and test FDC3 integrations"
 		/>
-		<link rel="apple-touch-icon" href="%PUBLIC_URL%/fdc3-icon-192.png" />
-		<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+		<link rel="apple-touch-icon" href="/fdc3-icon-192.png" />
+		<link rel="manifest" href="/manifest.json" />
 		<title>FDC3 Workbench</title>
 	</head>
 	<body>
 		<noscript>You need to enable JavaScript to run this app.</noscript>
 		<div id="root"></div>
+		<script type="module" src="/src/index.tsx"></script>
 	</body>
 </html>
diff --git a/toolbox/fdc3-workbench/package-lock.json b/toolbox/fdc3-workbench/package-lock.json
diff --git a/toolbox/fdc3-workbench/package.json b/toolbox/fdc3-workbench/package.json
@@ -11,7 +11,7 @@
     "@material-ui/core": "^4.11.4",
     "@material-ui/icons": "^4.11.2",
     "@material-ui/lab": "^4.0.0-alpha.59",
-    "@types/node": "^12.0.0",
+    "@types/node": "^14.0.0",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
     "@types/uuid": "^8.3.4",
@@ -22,16 +22,15 @@
     "normalize.css": "^8.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-scripts": "4.0.3",
     "typescript": "^4.1.2",
     "uuid": "^9.0.0",
     "web-vitals": "^1.0.1"
   },
   "scripts": {
-    "start": "react-scripts start",
-    "build": "react-scripts build",
-    "test": "react-scripts test",
-    "eject": "react-scripts eject",
+    "dev": "vite",
+    "start": "vite",
+    "preview": "vite preview",
+    "build": "tsc && vite build",
     "lint": "eslint --cache --quiet **/*.{ts,tsx,js,jsx} && prettier --check **/*.{ts,tsx,js,jsx,json,yml,css,html,md}",
     "lint:fix": "eslint --cache --quiet --fix **/*.{ts,tsx,js,jsx} && prettier --write **/*.{ts,tsx,js,jsx} && prettier --write **/*.{json,yml,css,html,md}"
   },
@@ -54,15 +53,19 @@
   },
   "devDependencies": {
     "@types/jsoneditor": "^8.6.1",
-    "@typescript-eslint/eslint-plugin": "^4.27.0",
-    "@typescript-eslint/parser": "^4.27.0",
+    "@typescript-eslint/eslint-plugin": "^5.48.0",
+    "@typescript-eslint/parser": "^5.48.0",
+    "@vitejs/plugin-legacy": "^3.0.1",
+    "@vitejs/plugin-react": "^3.0.1",
     "eslint": "^7.28.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-react": "^7.24.0",
     "lint-staged": "^11.0.0",
     "prettier": "^2.3.1",
-    "pretty-quick": "^3.1.0"
+    "pretty-quick": "^3.1.0",
+    "terser": "^5.16.1",
+    "vite": "^4.0.4"
   },
   "lint-staged": {
     "*.{ts,tsx,js,jsx}": [
@@ -72,16 +75,5 @@
     "*.{json,yml,css,html,md}": "prettier --write --prose-wrap never",
     "*.js": "eslint --cache --fix",
     "*.{js,css,md}": "prettier --write"
-  },
-  "overrides": {
-    "css-select": "^3.1.0",
-    "css-what": "^5.0.1",
-    "shell-quote": "^1.7.3",
-    "node-forge": "^1.0.0",
-    "immer": "^9.0.6",
-    "glob-parent": "^5.1.2",
-    "ejs": "^3.1.7",
-    "browserslist": "^4.16.5",
-    "ansi-html": "^0.0.8"
   }
 }
diff --git a/toolbox/fdc3-workbench/src/components/Header.tsx b/toolbox/fdc3-workbench/src/components/Header.tsx
@@ -79,7 +79,7 @@ export const Header = (props: { fdc3Available: boolean }) => {
 				<Toolbar className={classes.toolbar}>
 					<div>
 						<Typography variant="h3" color="inherit" className={classes.fdc3}>
-							<img src="./fdc3-logo.svg" className={classes.headerCube} />
+							<img src={`${import.meta.env.BASE_URL}/fdc3-logo.svg`} className={classes.headerCube} />
 						</Typography>
 					</div>
 

diff --git a/toolbox/fdc3-workbench/src/react-app-env.d.ts b/toolbox/fdc3-workbench/src/react-app-env.d.ts
diff --git a/toolbox/fdc3-workbench/tsconfig.json b/toolbox/fdc3-workbench/tsconfig.json
@@ -1,14 +1,15 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "esnext",
+    "useDefineForClassFields": true,
     "lib": [
       "dom",
       "dom.iterable",
       "esnext"
     ],
-    "allowJs": true,
+    "allowJs": false,
     "skipLibCheck": true,
-    "esModuleInterop": true,
+    "esModuleInterop": false,
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
@@ -18,9 +19,11 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "types": ["node", "vite/client"]
   },
   "include": [
     "src"
-  ]
+  ],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }
diff --git a/toolbox/fdc3-workbench/tsconfig.node.json b/toolbox/fdc3-workbench/tsconfig.node.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "module": "ESNext",
+    "moduleResolution": "Node",
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/toolbox/fdc3-workbench/vite.config.ts b/toolbox/fdc3-workbench/vite.config.ts
@@ -0,0 +1,23 @@
+import legacy from "@vitejs/plugin-legacy";
+import react from "@vitejs/plugin-react";
+import { defineConfig } from "vite";
+
+// https://vitejs.dev/config/
+export default defineConfig({
+	base: "/toolbox/fdc3-workbench",
+	build: {
+		outDir: "build",
+	},
+	define: {
+		"process.env": "import.meta.env",
+		"process.platform": "({})",
+		"global.process": "globalThis.process",
+	},
+	plugins: [
+		react(),
+		legacy({
+			targets: ["defaults", "not IE 11"],
+		}),
+	],
+	server: { port: 3000 },
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,4 +18,4 @@ website/.docusaurus/** @@
     .idea/
     *.iml
-    website/.yarn
+    website/.yarn