Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev/22-aquamarine
Browse files Browse the repository at this point in the history
  • Loading branch information
zachberry committed Jun 11, 2021
2 parents e09f5fd + 7ef8c16 commit 58dc12f
Show file tree
Hide file tree
Showing 33 changed files with 73 additions and 73 deletions.
2 changes: 1 addition & 1 deletion docker/obojobo-pm2-server-src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-pm2-server-app",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"description": "Reference project for deploying and customizing an Obojobo Next server",
"main": "./index.js",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/**/*"
],
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"command": {
"command": {
"run": {
Expand Down
2 changes: 1 addition & 1 deletion packages/app/obojobo-document-engine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-document-engine",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "",
"engines": {
Expand Down
6 changes: 3 additions & 3 deletions packages/app/obojobo-document-json-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"xml-formatter": "^2.4.0"
},
"peerDependencies": {
"obojobo-document-engine": "^12.2.0-alpha.0",
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-document-engine": "^12.2.0",
"obojobo-lib-utils": "^12.2.0"
},
"name": "obojobo-document-json-parser",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"main": "",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/app/obojobo-document-xml-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"xml-js": "^1.0.2"
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"name": "obojobo-document-xml-parser",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"main": "xml2draft.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions packages/app/obojobo-express/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "obojobo-express",
"license": "AGPL-3.0-only",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"repository": "https://github.com/ucfopen/Obojobo.git",
"homepage": "https://ucfopen.github.io/Obojobo-Docs/",
"description": "Obojobo express server middleware.",
Expand Down Expand Up @@ -70,9 +70,9 @@
"uuid": "^8.3.2"
},
"peerDependencies": {
"obojobo-document-engine": "^12.2.0-alpha.0",
"obojobo-document-xml-parser": "^12.2.0-alpha.0",
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-document-engine": "^12.2.0",
"obojobo-document-xml-parser": "^12.2.0",
"obojobo-lib-utils": "^12.2.0"
},
"devDependencies": {
"@svgr/webpack": "^5.5.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/app/obojobo-module-selector/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "obojobo-module-selector",
"license": "AGPL-3.0-only",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"repository": "https://github.com/ucfopen/Obojobo.git",
"homepage": "https://ucfopen.github.io/Obojobo-Docs/",
"description": "Obojobo package responsible for selecting which module you use in a course.",
Expand Down Expand Up @@ -29,8 +29,8 @@
"express": "~4.17.1"
},
"peerDependencies": {
"obojobo-express": "^12.2.0-alpha.0",
"obojobo-lib-utils": "^12.2.0-alpha.0",
"obojobo-repository": "^12.2.0-alpha.0"
"obojobo-express": "^12.2.0",
"obojobo-lib-utils": "^12.2.0",
"obojobo-repository": "^12.2.0"
}
}
6 changes: 3 additions & 3 deletions packages/app/obojobo-repository/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "obojobo-repository",
"license": "AGPL-3.0-only",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"repository": "https://github.com/ucfopen/Obojobo.git",
"homepage": "https://ucfopen.github.io/Obojobo-Docs/",
"description": "Obojobo express server middleware.",
Expand Down Expand Up @@ -42,8 +42,8 @@
"seedrandom": "^2.3.11"
},
"peerDependencies": {
"obojobo-express": "^12.2.0-alpha.0",
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-express": "^12.2.0",
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"setupFilesAfterEnv": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-abstract-assessment",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "AbstractAssessment chunk for Obojobo",
"scripts": {
Expand Down Expand Up @@ -28,8 +28,8 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-chunks-question": "^12.2.0-alpha.0",
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-chunks-question": "^12.2.0",
"obojobo-lib-utils": "^12.2.0"
},
"devDependencies": {
"lint-staged": "^10.2.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-action-button/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-action-button",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"scripts": {
"test": "TZ='America/New_York' jest --verbose",
Expand All @@ -20,7 +20,7 @@
]
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-break/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-break",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "Break content chunk for Obojobo",
"scripts": {
Expand All @@ -21,7 +21,7 @@
]
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-code/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-code",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "Code content chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-figure/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-figure",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "Figure content chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-heading/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-heading",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "Heading content chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-html/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-html",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "HTML content chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-iframe/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-iframe",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "IFrame content chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-list/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-list",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "List content chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
8 changes: 4 additions & 4 deletions packages/obonode/obojobo-chunks-materia/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-materia",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "Materia content chunk for Obojobo",
"scripts": {
Expand Down Expand Up @@ -35,9 +35,9 @@
"lint-staged": "^10.5.4"
},
"peerDependencies": {
"obojobo-chunks-iframe": "^12.2.0-alpha.0",
"obojobo-document-engine": "^12.2.0-alpha.0",
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-chunks-iframe": "^12.2.0",
"obojobo-document-engine": "^12.2.0",
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-math-equation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-math-equation",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "MathEquation content chunk for Obojobo",
"scripts": {
Expand Down Expand Up @@ -30,7 +30,7 @@
"katex": "^0.13.1"
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-multiple-choice-assessment",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "MCAssessment chunk for Obojobo",
"scripts": {
Expand All @@ -27,8 +27,8 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-chunks-question": "^12.2.0-alpha.0",
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-chunks-question": "^12.2.0",
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-numeric-assessment",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "NumericAssessment chunk for Obojobo",
"scripts": {
Expand Down Expand Up @@ -30,8 +30,8 @@
"big.js": "^6.1.1"
},
"peerDependencies": {
"obojobo-chunks-question": "^12.2.0-alpha.0",
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-chunks-question": "^12.2.0",
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-question-bank/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-question-bank",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "QuestionBank chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-question/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-question",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "Question content chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
4 changes: 2 additions & 2 deletions packages/obonode/obojobo-chunks-table/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "obojobo-chunks-table",
"version": "12.2.0-alpha.0",
"version": "12.2.0",
"license": "AGPL-3.0-only",
"description": "Table content chunk for Obojobo",
"scripts": {
Expand All @@ -27,7 +27,7 @@
"singleQuote": true
},
"peerDependencies": {
"obojobo-lib-utils": "^12.2.0-alpha.0"
"obojobo-lib-utils": "^12.2.0"
},
"jest": {
"testMatch": [
Expand Down
Loading

0 comments on commit 58dc12f

Please sign in to comment.