Merge pull request #6 from nickgros/fix-portals

Author: nickgros

.github/workflows/build-test.yml

@@ -54,7 +54,7 @@
            ${{ runner.os }}-nx-cache
      - run: pnpm install --frozen-lockfile
       # Portals won't build without a configuration. For now, copy the test configuration.
-      # We may want to invert the model and give each portal it's own project in the workspace, so we can build the portals in parallel.
+      # We may want to invert the model and give each portal its own project in the workspace, so we can build the portals in parallel.
      - run: pnpm nx run portals:copy-test-configuration
      - run: pnpm build
-     - run: pnpm test
+     - run: CI=true pnpm test

.github/workflows/sbom.yml

@@ -0,0 +1,33 @@
+# Dependabot doesn't yet natively support pnpm. It should be supported, eventually, but for now we can add this workflow to continue getting Dependabot alerts.
+# For more information, and to see if support has been added, see https://github.com/dependabot/dependabot-core/issues/1736#issuecomment-1272772849
+
+name: SBOM upload
+
+on:
+  push:
+    branches: ["main"]
+
+jobs:
+  SBOM-upload:
+
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Generate SBOM
+        run: |
+          curl -Lo $RUNNER_TEMP/sbom-tool https://github.com/microsoft/sbom-tool/releases/latest/download/sbom-tool-linux-x64
+          chmod +x $RUNNER_TEMP/sbom-tool
+          $RUNNER_TEMP/sbom-tool generate -b . -bc . -pn ${{ github.repository }} -pv 1.0.0 -ps SageBionetworks -nsb https://sagebase.org/platform/web -V Verbose
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: sbom
+          path: _manifest/spdx_2.2
+      - name: SBOM upload
+        uses: jhutchings1/spdx-to-dependency-graph-action@v0.0.2
+        with:
+          filePath: "_manifest/spdx_2.2/"

apps/portals/tsconfig.json

@@ -19,7 +19,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx",
+    "jsx": "react",
     "noFallthroughCasesInSwitch": true,
     "noImplicitAny": false
   },

package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "prepare": "husky install",
     "build": "nx run-many --target=build",
-    "test": "nx run-many --target=test"
+    "test": "nx run-many --target=test -- --watchAll=false"
   },
   "devDependencies": {
     "husky": ">=6",

packages/synapse-react-client/package.json

@@ -159,8 +159,8 @@
     "@types/xml2js": "^0.4.4",
     "@typescript-eslint/eslint-plugin": "^5.13.0",
     "@typescript-eslint/parser": "^5.13.0",
-    "@vitejs/plugin-legacy": "^2.0.1",
-    "@vitejs/plugin-react": "^2.0.1",
+    "@vitejs/plugin-legacy": "^3.0.2",
+    "@vitejs/plugin-react": "^3.0.1",
     "@welldone-software/why-did-you-render": "^7.0.1",
     "babel-jest": "^28.1.1",
     "babel-loader": "^8.2.5",
@@ -218,7 +218,7 @@
     "start-js": "vite",
     "start": "pnpm storybook",
     "start-deprecated-demo": "start-js",
-    "test": "jest --watchAll",
+    "test": "jest",
     "test:coverage": "jest --coverage",
     "test:ci": "CI=true pnpm test:coverage",
     "build": "rimraf dist && pnpm build:js && pnpm build:copy-assets && pnpm build:esbuild",