🤖 Release PR

.eslintignore

@@ -1,7 +1,7 @@
 node_modules
 functions
 build
-cypress
 lib
 storybook-static
-dist
+dist
+shared/lib

.eslintrc.json

@@ -61,18 +61,20 @@
     "@typescript-eslint/interface-name-prefix": "off",
     // https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/naming-convention.md
     // NOTE - typings throughout the platform are fairly inconsistent, hence the wide range of rules
+
+    // 2023-02-17 - Disable as lint check now blocking build (warnings treated as error)
     "@typescript-eslint/naming-convention": [
-      "warn",
-      {
-        "selector": "default",
-        "format": ["camelCase", "UPPER_CASE", "PascalCase", "snake_case"],
-        "leadingUnderscore": "allow"
-      },
-      {
-        "selector": "classMethod",
-        "format": ["camelCase"],
-        "leadingUnderscore": "allow"
-      }
+      "off"
+      // {
+      //   "selector": "default",
+      //   "format": ["camelCase", "UPPER_CASE", "PascalCase", "snake_case"],
+      //   "leadingUnderscore": "allow"
+      // },
+      // {
+      //   "selector": "classMethod",
+      //   "format": ["camelCase"],
+      //   "leadingUnderscore": "allow"
+      // }
     ],
     // Filenames - https://github.com/sindresorhus/eslint-plugin-unicorn/blob/main/docs/rules/filename-case.md
     "unicorn/filename-case": [

.github/workflows/docs-deploy.yml

@@ -7,19 +7,23 @@ on:
     # Only run action if changes have been made
     # to the documentation or components packages
     paths:
-      - "packages/documentation/**"
-      - "packages/components/**"
+      - 'packages/documentation/**'
+      - 'packages/components/**'
+      - '.github/workflows/docs-deploy.yml'
 jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '18.13.0'
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
         # Setup yarn 2 cache: https://github.com/actions/cache/blob/main/examples.md#node---yarn
       - name: Setup Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.yarnrc.yml

@@ -10,4 +10,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-3.3.0.cjs
+yarnPath: .yarn/releases/yarn-3.4.1.cjs

functions/package.json

@@ -9,8 +9,8 @@
     "start": "ts-node scripts/start.ts",
     "serve:live": "yarn copyDevConfig && yarn serve",
     "lint": "tslint --project tsconfig.json",
-    "build": "webpack",
-    "watch": "webpack --watch",
+    "build": "./node_modules/.bin/webpack",
+    "watch": "./node_modules/.bin/webpack --watch",
     "copyDevConfig": "firebase functions:config:get > .runtimeconfig.json",
     "db:backup:local": "firestore-export -a service.json -b backup.json -p",
     "shell": "yarn build && firebase functions:shell",
@@ -61,6 +61,7 @@
     "firebase-functions-test": "^3.0.0",
     "jest": "29.2.2",
     "ts-jest": "29.0.3",
+    "ts-loader": "^9.4.2",
     "ts-node": "^10.0.0",
     "tslint": "^6.1.3",
     "typescript": "4.5.5",

functions/src/aggregations/userNotifications.aggregations.ts

@@ -7,7 +7,7 @@ interface INotificationAggregation extends IAggregation {
   sourceFields: (keyof IUserDB)[]
 }
 
-const aggregations: INotificationAggregation[] = [
+const UserNotificationAggregation: INotificationAggregation =
   // When a user's list of notifications changes reflect to aggregation
   {
     sourceCollection: 'users',
@@ -19,7 +19,9 @@ const aggregations: INotificationAggregation[] = [
       const user: IUserDB = dbChange.after.data() as any
       const { _id, _authID, notification_settings, notifications } = user
       const emailFrequency = notification_settings?.emailFrequency || null
-      const pending = notifications.filter((n) => !n.notified && !n.read)
+      const pending = (notifications || []).filter(
+        (n) => !n.notified && !n.read,
+      )
       // remove user from list if they do not have emails enabled or no pending notifications
       if (!emailFrequency || pending.length === 0) {
         return {
@@ -31,12 +33,11 @@ const aggregations: INotificationAggregation[] = [
         [_id]: { _authID, emailFrequency, notifications: pending },
       }
     },
-  },
-]
+  }
 
 /** Watch changes to all user docs and apply aggregations */
 exports.default = functions.firestore
   .document(`${DB_ENDPOINTS.users}/{id}`)
   .onUpdate((change) => {
-    return handleDBAggregations(change, aggregations)
+    return handleDBAggregations(change, [UserNotificationAggregation])
   })

package.json

@@ -64,8 +64,13 @@
       "last 1 safari version"
     ]
   },
+  "resolutions": {
+    "__note1__": "Pin react version consistently in all child workspaces",
+    "react": "17.0.2",
+    "@types/react": "17.0.2"
+  },
   "dependencies": {
-    "@emotion/react": "^11.8.2",
+    "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.8.1",
     "@sentry/react": "^6.15.0",
     "@uppy/core": "^2.1.4",
@@ -96,13 +101,12 @@
     "pino": "^7.2.0",
     "pino-logflare": "^0.3.12",
     "pubsub-js": "^1.7.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
     "react-dropzone": "^10.1.10",
     "react-final-form": "6.5.3",
     "react-final-form-arrays": "^3.1.3",
     "react-firebase-file-uploader": "2.4.4",
-    "react-flag-icon-css": "^1.0.25",
     "react-foco": "^1.3.1",
     "react-ga4": "^1.4.1",
     "react-hamburger-menu": "^1.1.1",
@@ -147,8 +151,8 @@
     "@types/jest": "^27.4.3",
     "@types/node": "18",
     "@types/pubsub-js": "^1.5.18",
-    "@types/react": "^16.9.53",
-    "@types/react-dom": "^17.0.3",
+    "@types/react": "17.0.2",
+    "@types/react-dom": "17.0.2",
     "@types/react-hamburger-menu": "^0.0.3",
     "@types/react-lazy-load-image-component": "^1.5.1",
     "@types/react-leaflet": "^1.1.6",
@@ -174,16 +178,18 @@
     "env-cmd": "^10.1.0",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^27.2.1",
+    "eslint-plugin-mocha": "^10.1.0",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-sort-class-members": "^1.15.2",
     "eslint-plugin-unicorn": "^36.0.0",
     "husky": "^7.0.4",
     "idb": "^6.0.0",
     "lint-staged": "^8.1.5",
     "mobx-react-devtools": "^6.0.3",
-    "prettier": "^2.6.1",
+    "prettier": "2.5.1",
     "react-dev-utils": "^11.0.4",
     "start-server-and-test": "^1.11.0",
     "stream-browserify": "^3.0.0",
@@ -209,5 +215,5 @@
     "npm": "please-use-yarn",
     "node": ">=16.10.0 <19.0.0"
   },
-  "packageManager": "yarn@3.3.0"
+  "packageManager": "yarn@3.4.1"
 }

packages/components/package.json

@@ -16,16 +16,14 @@
     "new-component": "ts-node scripts/newComponent.ts"
   },
   "dependencies": {
-    "@emotion/react": "^11.8.2",
-    "@emotion/styled": "^11.8.1",
+    "@emotion/react": "^11.10.6",
+    "@emotion/styled": "^11.10.6",
     "@faker-js/faker": "^7.6.0",
     "@react-icons/all-files": "^4.1.0",
     "date-fns": "^2.29.3",
     "linkify-plugin-mention": "^4.0.2",
     "linkify-react": "^4.0.2",
     "linkifyjs": "^4.0.2",
-    "prettier": "^2.5.1",
-    "react": "^17.0.2",
     "react-flag-icon-css": "^1.0.25",
     "react-icons": "^4.3.1",
     "react-portal": "^4.2.2",
@@ -38,6 +36,9 @@
     "use-debounce": "^8.0.4",
     "webpack": "^5.75.0"
   },
+  "peerDependencies": {
+    "react": "17.0.2"
+  },
   "devDependencies": {
     "@babel/core": "^7.14.3",
     "@react-theming/storybook-addon": "^1.1.5",
@@ -57,6 +58,7 @@
     "eslint": "^7.32.0",
     "eslint-plugin-import": "^2.25.4",
     "mustache": "^4.2.0",
+    "prettier": "2.5.1",
     "ts-node": "^10.7.0",
     "typescript": "^4.5.5"
   }

packages/cypress/.eslintrc.json

@@ -0,0 +1,12 @@
+{
+  "plugins": ["cypress", "mocha"],
+  "rules": {
+    "cypress/no-assigning-return-values": "error",
+    "cypress/no-unnecessary-waiting": "warn",
+    "cypress/assertion-before-screenshot": "warn",
+    "cypress/no-force": "warn",
+    "cypress/no-async-tests": "warn",
+    "cypress/no-pause": "warn",
+    "mocha/no-skipped-tests": "error"
+  }
+}

packages/cypress/src/data/index.ts

@@ -7,8 +7,29 @@
  * ```
  * or
  * ```
- * import * as MOCK_DATA from '../data
+ * import { MOCK_DATA } from '../data
  * ```
  *
  **/
-export * from 'oa-shared/mocks/data'
+
+import {
+  categories,
+  events,
+  howtos,
+  mappins,
+  research,
+  tags,
+  users,
+} from 'oa-shared/mocks/data'
+
+export { howtos, users } from 'oa-shared/mocks/data'
+
+export const MOCK_DATA = {
+  categories,
+  events,
+  howtos,
+  mappins,
+  research,
+  tags,
+  users,
+}

packages/cypress/src/integration/sign-in.spec.ts → packages/cypress/src/integration/SignIn.spec.ts

@@ -26,7 +26,6 @@ describe('[Sign-in - authenticated user]', () => {
   it('redirects to home page', () => {
     cy.visit('/sign-in')
     cy.login('howto_reader@test.com', 'test1234')
-    cy.wait(3000)
     cy.visit('/sign-in').url().should('include', '/')
   })
 })

packages/cypress/src/integration/sign-up.spec.ts → packages/cypress/src/integration/SignUp.spec.ts

@@ -1,4 +1,4 @@
-import { generatedId } from '../utils/test-utils'
+import { generatedId } from '../utils/TestUtils'
 import { FRIENDLY_MESSAGES } from 'oa-shared'
 
 // existing user already created in auth system
@@ -69,7 +69,6 @@ describe('[Sign-up - new user]', () => {
 describe('[Sign-up - authenticated user]', () => {
   it('redirects to home page', () => {
     cy.login('howto_reader@test.com', 'test1234')
-    cy.wait(3000)
     cy.visit('/sign-up').url().should('include', '/')
   })
 })

packages/cypress/src/integration/academy.spec.ts

@@ -1,4 +1,4 @@
-import { Page } from '../utils/test-utils'
+import { Page } from '../utils/TestUtils'
 
 describe('[Academy]', () => {
   describe('[List instructions]', () => {