Updating to Parcel 2.1.1 and maintained Material table fork (#608)

craigatk · Jan 9, 2022 · d660e9d · d660e9d
1 parent 5baafa6
commit d660e9d
Show file tree

Hide file tree

Showing 9 changed files with 499 additions and 609 deletions.
diff --git a/ui/package.json b/ui/package.json
@@ -4,8 +4,8 @@
   "license": "MIT",
   "scripts": {
     "start": "parcel --dist-dir dev-dist src/index.html",
-    "build": "parcel build --dist-dir dist src/index.html",
-    "build:dev": "NODE_ENV=development parcel build --dist-dir dev-dist src/index.html",
+    "build": "yarn clean-dist && parcel build --dist-dir dist src/index.html",
+    "build:dev": "yarn clean-dev-dist && NODE_ENV=development parcel build --dist-dir dev-dist src/index.html",
     "format": "prettier --write \"src/**/*.ts*\" \"src/**/*.spec.ts*\" \"cypress/fixtures/**/*.json\" \"cypress/**/*.js\"",
     "test": "jest",
     "test:projektor:ci": "yarn test || yarn projektor-publish --configFile=projektor.jest.json",
@@ -18,7 +18,9 @@
     "projektor:cypress:no-attachments": "projektor-publish --configFile=projektor.cypress.no.attachments.json",
     "projektor:cypress": "env-cmd -f ~/.env projektor-publish --configFile=projektor.cypress.json",
     "projektor:jest": "env-cmd -f ~/.env projektor-publish --configFile=projektor.jest.json",
-    "clean-results": "rimraf test-results/*.xml"
+    "clean-results": "rimraf test-results/*.xml",
+    "clean-dist": "rimraf dist",
+    "clean-dev-dist": "rimraf dev-dist"
   },
   "devDependencies": {
     "@testing-library/cypress": "8.0.2",
@@ -33,7 +35,7 @@
     "env-cmd": "10.1.0",
     "jest": "27.4.7",
     "jest-junit": "13.0.0",
-    "parcel": "2.0.1",
+    "parcel": "2.1.1",
     "prettier": "2.5.1",
     "projektor-publish": "3.10.0",
     "resize-observer-polyfill": "1.5.1",
@@ -44,6 +46,7 @@
     "wait-for-expect": "3.0.2"
   },
   "dependencies": {
+    "@material-table/core": "4.3.16",
     "@material-ui/core": "4.12.3",
     "@material-ui/icons": "4.11.2",
     "@material-ui/lab": "4.0.0-alpha.60",
@@ -57,7 +60,6 @@
     "axios-cache-adapter": "2.7.3",
     "axios-case-converter": "0.9.0",
     "lodash": "4.17.21",
-    "material-table": "1.69.3",
     "moment": "2.29.1",
     "moment-timezone": "0.5.34",
     "pretty-bytes": "5.6.0",

diff --git a/ui/src/Admin/Failures/AdminFailuresTable.tsx b/ui/src/Admin/Failures/AdminFailuresTable.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { ResultsProcessingFailure } from "../../model/AdminModel";
-import MaterialTable from "material-table";
+import MaterialTable from "@material-table/core";
 import moment from "moment";
 import { Link, Tooltip } from "@material-ui/core";
 import FileCopyOutlinedIcon from "@material-ui/icons/FileCopyOutlined";

diff --git a/ui/src/Attachments/AttachmentsList.tsx b/ui/src/Attachments/AttachmentsList.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { Attachments } from "../model/TestRunModel";
-import MaterialTable from "material-table";
+import MaterialTable from "@material-table/core";
 import prettyBytes from "pretty-bytes";
 
 interface AttachmentsListProps {

diff --git a/ui/src/Coverage/CoverageFilesTable.tsx b/ui/src/Coverage/CoverageFilesTable.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import MaterialTable from "material-table";
+import MaterialTable from "@material-table/core";
 import { CoverageFiles, TestRunGitMetadata } from "../model/TestRunModel";
 import CoverageGraph from "./CoverageGraph";
 import { Typography } from "@material-ui/core";

diff --git a/ui/src/Coverage/CoverageTable.tsx b/ui/src/Coverage/CoverageTable.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import MaterialTable from "material-table";
+import MaterialTable from "@material-table/core";
 import CoverageGraph from "./CoverageGraph";
 import { makeStyles, Typography } from "@material-ui/core";
 import CleanLink from "../Link/CleanLink";

diff --git a/ui/src/Performance/PerformanceResultsTable.tsx b/ui/src/Performance/PerformanceResultsTable.tsx
@@ -1,7 +1,6 @@
 import * as React from "react";
 import { PerformanceResult } from "../model/TestRunModel";
-import MaterialTable from "material-table";
-import { Typography } from "@material-ui/core";
+import MaterialTable from "@material-table/core";
 
 interface PerformanceResultsTableProps {
   performanceResults: PerformanceResult[];

diff --git a/ui/src/Repository/FlakyTests/RepositoryFlakyTestsTable.tsx b/ui/src/Repository/FlakyTests/RepositoryFlakyTestsTable.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import { RepositoryFlakyTests } from "../../model/RepositoryModel";
-import MaterialTable from "material-table";
+import MaterialTable from "@material-table/core";
 import CleanLink from "../../Link/CleanLink";
 import moment from "moment-timezone";
 

diff --git a/ui/src/TestSuite/TestSuiteList.tsx b/ui/src/TestSuite/TestSuiteList.tsx
@@ -5,7 +5,7 @@ import {
   anyTestSuiteHasGroupName,
   fullTestSuiteName,
 } from "../model/TestSuiteHelpers";
-import MaterialTable from "material-table";
+import MaterialTable from "@material-table/core";
 
 interface TestSuiteListProps {
   publicId: string;