Dev/19 serendibite

.github/workflows/tests.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.11.1, 12.x]
+        node-version: [14.x]
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
@@ -26,6 +26,15 @@ jobs:
     # frozen lockfile should make the cache more effective
     # and our tests more predictable
     - run: yarn install --frozen-lockfile
+
+    # run prettier against all the code
+    - name: Run Prettier
+      run: yarn prettier:run
+
+    # verify that running prettier didn't cause any changes
+    # will fail the PRs that need prettier run on them
+    - name: Does Prettier Need to Be Run
+      run: git --no-pager diff --exit-code -- .
 
     - run: yarn test:ci
 
@@ -64,3 +73,28 @@ jobs:
           docker push ghcr.io/${{ github.repository_owner }}/obojobo:nginx-${{ github.sha }}
           docker push ghcr.io/${{ github.repository_owner }}/obojobo:nginx-${{ steps.tag_name.outputs.GIT_TAG }}
 
+  deploy_npm_packages:
+    needs: test
+    if: startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: NPM - Test, Build, Deploy
+      uses: actions/setup-node@v1
+      with:
+        node-version: 14
+        registry-url: https://registry.npmjs.org/
+
+    - name: Cache Yarn Deps
+      uses: c-hive/gha-yarn-cache@v1
+
+    # frozen lockfile should make the cache more effective
+    # and our tests more predictable
+    - run: yarn install --frozen-lockfile
+
+    - run: yarn build
+
+    - run: yarn release:publish --yes
+      env:
+        NODE_AUTH_TOKEN: ${{secrets.TR_NPM_PASSWORD}}

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,3 @@
+# .husky/pre-commit (v5)
+# ...
+yarn precommit

.nvmrc

@@ -1 +1 @@
-12.11.1
+14.16.0

.yarnrc

@@ -1 +1 @@
-workspaces-experimental true
+workspaces-experimental true

README.md

@@ -11,13 +11,15 @@ View the [Obojobo Next Documentation](https://ucfopen.github.io/Obojobo-Docs/).
 
 [Join UCF Open Slack Discussions](https://ucf-open-slackin.herokuapp.com/) [![Join UCF Open Slack Discussions](https://ucf-open-slackin.herokuapp.com/badge.svg)](https://ucf-open-slackin.herokuapp.com/)
 
+The previous version of Obojobo, renamed to Obojobo Classic, is located here: https://github.com/ucfopen/Obojobo-Classic
+
 ## The Obojobo Mission
 
 To keep our collective efforts aimed in the same direction, we've outlined what we want Obojobo to be:
 
 1. UI/UX focused design that ensures a satisfying & enjoyable student experience.
 2. Low barrier of entry for content creators. Creating content is as easy as writing a document in Word.
-3. Research centric design. Obojobo aims to be the premiere research-enabling learning platform by providing high resolution data, partnering with researchers, and including proven research outcomes back into the platform.
+3. Research centric design. Obojobo aims to be the premiere [research-enabling learning platform](https://github.com/ucfopen/Obojobo/wiki/Published-Research-Using-Obojobo-Next) by providing high resolution data, partnering with researchers, and including proven research outcomes back into the platform.
 4. Extraordinary practice and assessment tools that enable emerging teaching and learning models.
 5. Provide innovative new capabilities in online, blended, and mixed mode courses.
 6. Architecturally extensible and modular. Obojobo Next is easy to customize and extend.

docker/dockerfiles/obojobo-node-debian.Dockerfile

@@ -1,7 +1,7 @@
 # =====================================================================================================
 # Base stage used for  build and final stages
 # =====================================================================================================
-FROM node:12.11.1-alpine AS base_stage
+FROM node:14.16.0-alpine AS base_stage
 
 # ======== PUT NEW NODE BIN DIR IN PATH
 RUN npm config set prefix '/home/node/.npm-global'
@@ -12,7 +12,9 @@ ENV PATH=/home/node/.npm-global/bin:${PATH}
 # =====================================================================================================
 FROM base_stage as build_stage
 
-RUN apk add --no-cache git
+# build-base needed for node building binaries
+# pkgconfig pixman-dev cairo-dev pango-dev jpeg-dev giflib-dev needed for npm trianglify
+RUN apk add --no-cache build-base git pkgconfig pixman-dev cairo-dev pango-dev jpeg-dev giflib-dev python3
 
 # ======== INSTALL PM2 Globally
 RUN npm install --global pm2@^4.5.1
@@ -48,6 +50,9 @@ RUN yarn --production=true
 # =====================================================================================================
 FROM base_stage as final_stage
 
+# cairo pango jpeg giflib are needed for npm trianglify
+RUN apk add --no-cache cairo pango jpeg giflib
+
 # ======== COPY GLOBAL NODE STUFF
 COPY --chown=node:node --from=build_stage /home/node/.npm-global /home/node/.npm-global
 

docker/obojobo-pm2-server-src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "obojobo-pm2-server-app",
-  "version": "11.4.0",
+  "version": "12.0.0",
   "description": "Reference project for deploying and customizing an Obojobo Next server",
   "main": "./index.js",
   "private": true,

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/**/*"
   ],
-  "version": "11.4.0",
+  "version": "12.0.0",
   "command": {
     "command": {
       "run": {

package.json

@@ -13,7 +13,8 @@
 		"lint": "lerna run lint",
 		"lint:css": "lerna run lint:css",
 		"lint:js": "lerna run  lint:js",
-		"precommit": "lerna run precommit --concurrency 1 && yarn test:ci --bail",
+		"precommit": "lerna run precommit --concurrency 1 &&  yarn test:ci --bail",
+		"prettier:run": "lerna run prettier:run",
 		"release:publish": "lerna publish from-package",
 		"release:tag": "lerna version --no-push --sign-git-commit --sign-git-tag --no-commit-hooks --force-publish",
 		"version": "yarn update-project-version && yarn update-docker-app-version",
@@ -22,21 +23,17 @@
 		"start": "start_obojobo_server",
 		"test": "TZ='America/New_York' jest --verbose",
 		"test:ci": "TZ='America/New_York' CI=true jest --ci --useStderr --coverage --coverageReporters text-summary cobertura",
-		"test:ci:each": "lerna run test:ci"
+		"test:ci:each": "lerna run test:ci",
+		"postinstall": "husky install"
 	},
 	"devDependencies": {
-		"husky": "^4.3.0",
+		"husky": "^6.0.0",
 		"jest-runner-eslint": "^0.10.0",
-		"lerna": "^3.22.1",
+		"lerna": "^4.0.0",
 		"nodemon": "^2.0.4"
 	},
 	"resolutions": {
-		"node-gyp": "^6.1.0"
-	},
-	"husky": {
-		"hooks": {
-			"pre-commit": "yarn precommit"
-		}
+		"node-gyp": "^8.0.0"
 	},
 	"jest": {
 		"projects": [
@@ -101,7 +98,7 @@
 	],
 	"engines": {
 		"yarn": "^1.15.2",
-		"node": "^12.11.1"
+		"node": "^14.16.0"
 	},
-	"version": "11.4.0"
+	"version": "12.0.0"
 }

packages/app/obojobo-document-engine/__mocks__/_load-all-chunks.js

@@ -1,10 +1,14 @@
 // searching for the viewer scripts is expensive, this will cache them
-if(!global.__viewerScriptCache){
+if (!global.__viewerScriptCache) {
 	const { gatherClientScriptsFromModules } = require('obojobo-lib-utils')
 	const entriesFromObojoboModules = gatherClientScriptsFromModules()
-	const chunkViewerScripts = entriesFromObojoboModules.viewer.filter(item => !item.includes('obojobo-document-engine'))
+	const chunkViewerScripts = entriesFromObojoboModules.viewer.filter(
+		item => !item.includes('obojobo-document-engine')
+	)
 	// skip viewer scripts from the doc-engine
-	global.__viewerScriptCache = chunkViewerScripts.filter(script => !script.includes('obojobo-document-engine'))
+	global.__viewerScriptCache = chunkViewerScripts.filter(
+		script => !script.includes('obojobo-document-engine')
+	)
 }
 
 global.__viewerScriptCache.forEach(script => require(script))

packages/app/obojobo-document-engine/__mocks__/mock-class-component.js

@@ -4,23 +4,20 @@ import React from 'react'
 const getCircularReplacer = () => {
 	const seen = new WeakSet()
 	return (key, value) => {
-		if (typeof value === "object" && value !== null) {
+		if (typeof value === 'object' && value !== null) {
 			if (seen.has(value)) {
 				return
 			}
 			seen.add(value)
 		}
-		return value;
+		return value
 	}
 }
 
 export default class MockClassComponent extends React.Component {
 	render() {
 		return (
-			<div>
-				MockClassComponent
-				Props: {JSON.stringify(this.props, getCircularReplacer(), 2)}
-			</div>
+			<div>MockClassComponent Props: {JSON.stringify(this.props, getCircularReplacer(), 2)}</div>
 		)
 	}
 }

packages/app/obojobo-document-engine/__tests__/Viewer/components/__snapshots__/nav.test.js.snap

@@ -76,14 +76,7 @@ exports[`Nav renders all list item types (locked=false) 1`] = `
         aria-disabled={true}
         aria-label="Go to mockMe"
       >
-        <div
-          className="mockStylableText"
-          text={
-            MockStylableText {
-              "value": "mockMe",
-            }
-          }
-        />
+        mockMe
       </button>
     </li>
     <li
@@ -212,14 +205,7 @@ exports[`Nav renders all list item types (locked=true) 1`] = `
         aria-disabled={true}
         aria-label="Go to mockMe"
       >
-        <div
-          className="mockStylableText"
-          text={
-            MockStylableText {
-              "value": "mockMe",
-            }
-          }
-        />
+        mockMe
       </button>
       <div
         className="lock-icon"