Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into hub…

…s-cloud

.defaults.env

@@ -18,7 +18,7 @@ THUMBNAIL_SERVER="nearspark-dev.reticulum.io"
 ASSET_BUNDLE_SERVER="https://asset-bundles-prod.reticulum.io"
 
 # Comma-separated list of domains which are known to not need CORS proxying
-NON_CORS_PROXY_DOMAINS="hubs.local,dev.reticulum.io"
+NON_CORS_PROXY_DOMAINS="hubs.local,dev.reticulum.io,hubs-upload-cdn.com"
 
 # The root URL under which Hubs expects static assets to be served.
 BASE_ASSETS_PATH=/

.eslintrc.js

@@ -36,6 +36,12 @@ module.exports = {
     "no-use-before-define": "error",
     "no-var": "error",
     "no-throw-literal": "error",
+    "no-unused-vars": [
+      "error",
+      {
+        destructuredArrayIgnorePattern: "^_"
+      }
+    ],
     // Light console usage is useful but remove debug logs before merging to master.
     "no-console": "off",
     // https://www.npmjs.com/package/eslint-plugin-react-hooks

.github/workflows/hubs-RetPageOrigin.yml

@@ -4,12 +4,18 @@ on:
     branches:
     paths-ignore: ["README.md"]
   workflow_dispatch:
-
 jobs:
   turkeyGitops:
     uses: mozilla/hubs-ops/.github/workflows/turkeyGitops.yml@master
     with:
       registry: mozillareality
       dockerfile: RetPageOriginDockerfile
+      # personal_k8s_deployment: hubs
+      # personal_k8s_deployment_container: hubs
+      bio_script_path: scripts/hab-wrap-and-push.sh
     secrets:
       DOCKER_HUB_PWD: ${{ secrets.DOCKER_HUB_PWD }}
+      GCP_TURKEYGITOPS_SA_JSON: ${{ secrets.GCP_TURKEYGITOPS_SA_JSON  }}
+      BLDR_HAB_TOKEN: ${{ secrets.BLDR_HAB_TOKEN }}
+      BLDR_RET_TOKEN: ${{ secrets.BLDR_RET_TOKEN }}
+      BLDR_RET_PUB_B64: ${{ secrets.BLDR_RET_PUB_B64 }}

.github/workflows/test-and-deploy-storybook.yml

@@ -0,0 +1,28 @@
+name: test-and-deploy-storybook
+
+on:
+  push:
+    branches:
+  workflow_dispatch:
+
+jobs:
+  test-and-deploy-storybook:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - run: npm ci
+      - run: npm test
+
+      - run: cd admin && npm ci
+      - run: cd admin && npm test
+
+      - if: ${{ github.ref == 'refs/heads/master' }}
+        run: npm run deploy-storybook -- --ci
+        env:
+          GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}

.prettierignore

@@ -1,3 +1,4 @@
 package.json
 *.gltf
 src/vendor/
+src/loaders/basis_transcoder.worker.js

.storybook/preview.js

@@ -4,7 +4,8 @@ import { WrappedIntlProvider } from "../src/react-components/wrapped-intl-provid
 import { MINIMAL_VIEWPORTS } from "@storybook/addon-viewport";
 import { AVAILABLE_LOCALES } from "../src/assets/locales/locale_config";
 import { setLocale } from "../src/utils/i18n";
-import { useTheme, themes } from "../src/react-components/styles/theme";
+import { themes } from "../src/utils/theme";
+import { useTheme } from "../src/react-components/styles/theme";
 import "../src/react-components/styles/global.scss";
 
 const Layout = ({ children, locale, theme }) => {

RetPageOriginDockerfile

@@ -13,7 +13,6 @@ run cd admin && npm ci && cd ..
 copy . .
 env BASE_ASSETS_PATH="{{rawhubs-base-assets-path}}"
 run npm run build 1> /dev/null
-copy scripts/docker/turkey-swaps/admin-menu.js admin/src/react-components/admin-menu.js
 run cd admin && npm run build 1> /dev/null && cp -R dist/* ../dist && cd ..
 run mkdir -p dist/pages && mv dist/*.html dist/pages && mv dist/hub.service.js dist/pages && mv dist/schema.toml dist/pages          
 run mkdir /hubs/rawhubs && mv dist/pages /hubs/rawhubs && mv dist/assets /hubs/rawhubs && mv dist/favicon.ico /hubs/rawhubs/pages

admin/.eslintrc.js

@@ -4,5 +4,11 @@ module.exports = {
     babelOptions: {
       rootMode: "upward"
     }
+  },
+  rules: {
+    // TODO these are new as of our Webpack 5 upgrade, making them warnings till we get a handle on them or decide we don't want them
+    "react/prop-types": "warn",
+    "@calm/react-intl/missing-formatted-message": "warn",
+    "@calm/react-intl/missing-attribute": "warn"
   }
 };

admin/package.json

@@ -17,7 +17,7 @@
     "lint:js": "eslint '*.js' 'src/**/*.js'",
     "lint:html": "htmlhint 'src/**/*.html'",
     "lint": "npm run lint:js && npm run lint:html",
-    "test": "npm run lint && npm run build"
+    "test": "npm run lint"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.3",