Address comments by Joel Denning

single-spa · Jul 1, 2023 · dfa2079 · dfa2079
1 parent 81e40cc
commit dfa2079
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -24,4 +24,5 @@ jobs:
       - run: pnpm install --frozen-lockfile
       - run: pnpm run build
       - run: pnpm run lint
-      - run: pnpm run test-jest
+      - run: pnpm run check-format
+      - run: pnpm run test
diff --git a/.gitignore b/.gitignore
@@ -63,3 +63,6 @@ dist
 
 # jetbrain IDE files
 /.idea
+
+# VSCode IDE files
+/.vscode
diff --git a/jest.config.cjs b/jest.config.cjs
@@ -3,7 +3,6 @@ const config = {
   testEnvironment: "jsdom",
   resetMocks: true,
   restoreMocks: true,
-  setupFilesAfterEnv: ["<rootDir>/jest.setup.js"],
 };
 
 module.exports = config;
diff --git a/jest.setup.js b/jest.setup.js
diff --git a/package.json b/package.json
@@ -9,13 +9,13 @@
   "scripts": {
     "build": "pnpm run clean && cross-env NODE_ENV=production rollup -c",
     "build:dev": "pnpm run clean && cross-env NODE_ENV=development rollup -c",
+    "check-format": "prettier --check src",
     "clean": "rimraf dist",
     "watch": "cross-env NODE_ENV=development rollup -c --watch",
     "copy-test-files": "copyfiles test/**/* dist -f",
-    "test-jest": "jest",
-    "test-serve": "serve .",
-    "test-embed-serve": "serve . -l 3333",
-    "test": "concurrently pnpm:watch pnpm:copy-test-files pnpm:test-serve pnpm:test-embed-serve",
+    "serve": "serve .",
+    "embed-serve": "serve . -l 3333",
+    "test": "jest",
     "lint": "eslint src",
     "prepublishOnly": "pnpm run build",
     "prepare": "husky install"

diff --git a/src/ui/list/list.component.js b/src/ui/list/list.component.js
@@ -149,11 +149,8 @@ export default class List extends Component {
     defaultModules.sort(sorter);
     nextOverriddenModules.sort(sorter);
 
-    const {
-      brokenMaps,
-      workingCurrentPageMaps,
-      workingNextPageMaps,
-    } = getExternalMaps();
+    const { brokenMaps, workingCurrentPageMaps, workingNextPageMaps } =
+      getExternalMaps();
 
     return (
       <div className="imo-list-container">
@@ -466,7 +463,8 @@ function toURL(urlStr) {
 
 function getExternalMaps() {
   const allExternalMaps = window.importMapOverrides.getExternalOverrides();
-  const allCurrentPageMaps = window.importMapOverrides.getCurrentPageExternalOverrides();
+  const allCurrentPageMaps =
+    window.importMapOverrides.getCurrentPageExternalOverrides();
   const brokenMaps = [],
     workingCurrentPageMaps = [],
     workingNextPageMaps = [];