Merge master into christjt/UX-847

.github/workflows/ci.yml

@@ -20,11 +20,12 @@ jobs:
     permissions:
       pull-requests: read
     outputs:
-      should-run: ${{ steps.filter.outputs.should-run }}
+      should-run: ${{ github.event_name != 'pull_request' || steps.filter.outputs.should-run }}
     steps:
       # For pull requests it's not necessary to checkout the code
       - uses: dorny/paths-filter@v2
         id: filter
+        if: ${{ github.event_name == 'pull_request' }}
         with:
           filters: |
             should-run:
@@ -314,14 +315,15 @@ jobs:
           yarn build:fast
 
       - name: Upload documentation artifact
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'preview-docs') }}
         uses: actions/upload-artifact@v3
         with:
           name: preview-docs
           path: documentation/build/
 
   deploy-preview-documentation:
     needs: [changes, build-preview-documentation]
-    if: ${{ needs.changes.outputs.should-run == 'true' || contains(github.event.pull_request.labels.*.name, 'preview-docs') }}
+    if: ${{ needs.changes.outputs.should-run == 'true' && contains(github.event.pull_request.labels.*.name, 'preview-docs') }}
     name: Publish documentation preview
     # Ensures that there only will be executed one "instance" of this operation
     # across all ongoing Github Action executions

documentation/package.json

@@ -29,7 +29,7 @@
     "@docusaurus/core": "2.4.1",
     "@docusaurus/preset-classic": "2.4.1",
     "@docusaurus/remark-plugin-npm2yarn": "2.4.1",
-    "@uiw/codemirror-theme-material": "4.21.4",
+    "@uiw/codemirror-theme-material": "4.21.5",
     "@uiw/react-codemirror": "4.21.5",
     "clsx": "1.2.1",
     "cross-env": "7.0.3",

examples/package.json

@@ -28,7 +28,6 @@
     "lodash": "^4.17.21",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-router-dom": "6.11.1",
     "stats.js": "0.17.0",
     "styled-components": "5.3.10",
     "three-stdlib": "2.23.10"
@@ -37,18 +36,17 @@
     "@testing-library/jest-dom": "^5.11.5",
     "@types/dat.gui": "^0.7.5",
     "@types/lodash": "^4.14.190",
-    "@types/react": "18.2.6",
+    "@types/react": "18.2.8",
     "@types/react-dom": "18.2.4",
-    "@types/react-router-dom": "5.3.3",
-    "@types/stats": "^0.16.30",
+    "@types/stats.js": "^0.17.0",
     "@types/styled-components": "^5.1.26",
     "@types/three": "0.152.0",
     "css-loader": "^6.7.1",
     "dotenv-webpack": "^7.1.0",
     "html-webpack-plugin": "^5.5.0",
     "prettier": "^2.8.4",
     "three": "0.152.2",
-    "ts-loader": "^9.3.1",
+    "ts-loader": "9.4.4",
     "typescript": "^5.0.4",
     "webpack": "^5.76.0",
     "webpack-cli": "^4.10.0",

examples/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es6",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": false,