Merge pull request #2844 from pie-framework/develop

merge

Author: CarlaCostea

package.json

@@ -30,6 +30,7 @@
     "babel-core": "^7.0.0-bridge.0",
     "babel-eslint": "^9.0.0",
     "babel-jest": "^23.4.2",
+    "babel-loader": "^8.0.0",
     "chalk": "^2.4.2",
     "child-process-promise": "^2.2.1",
     "debug": "^4.1.1",
@@ -61,6 +62,21 @@
     "rollup-plugin-analyzer": "^4.0.0"
   },
   "resolutions": {
-    "@types/d3-array": "3.0.3"
+    "@types/d3-array": "3.0.3",
+    "@pie-lib/charting": "5.36.2",
+    "@pie-lib/config-ui": "11.30.2",
+    "@pie-lib/controller-utils": "0.22.2",
+    "@pie-lib/correct-answer-toggle": "2.25.2",
+    "@pie-lib/drag": "2.22.2",
+    "@pie-lib/editable-html": "11.21.2",
+    "@pie-lib/graphing-solution-set": "2.34.2",
+    "@pie-lib/graphing": "2.34.2",
+    "@pie-lib/mask-markup": "1.33.2",
+    "@pie-lib/math-toolbar": "1.31.2",
+    "@pie-lib/plot": "2.27.2",
+    "@pie-lib/render-ui": "4.35.2",
+    "@pie-lib/rubric": "0.28.2",
+    "@pie-lib/scoring-config": "3.26.2",
+    "@pie-lib/text-select": "1.32.2"
   }
 }

packages/boilerplate-item-type/configure/package.json

@@ -8,8 +8,8 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/config-ui": "^11.30.1",
-    "@pie-lib/editable-html": "^11.21.1",
+    "@pie-lib/config-ui": "11.30.2",
+    "@pie-lib/editable-html": "11.21.2",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",

packages/boilerplate-item-type/package.json

@@ -9,8 +9,8 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/math-rendering": "^3.22.1",
-    "@pie-lib/render-ui": "^4.35.1",
+    "@pie-lib/math-rendering": "3.22.1",
+    "@pie-lib/render-ui": "4.35.2",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"

packages/calculator/configure/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/config-ui": "^11.30.1",
+    "@pie-lib/config-ui": "11.30.2",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },

packages/categorize/configure/package.json

@@ -12,13 +12,13 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/categorize": "^0.28.1",
-    "@pie-lib/config-ui": "^11.30.1",
-    "@pie-lib/drag": "^2.22.1",
-    "@pie-lib/editable-html": "^11.21.1",
-    "@pie-lib/math-rendering": "^3.22.1",
-    "@pie-lib/render-ui": "^4.35.1",
-    "@pie-lib/translator": "^2.23.1",
+    "@pie-lib/categorize": "0.28.1",
+    "@pie-lib/config-ui": "11.30.2",
+    "@pie-lib/drag": "2.22.2",
+    "@pie-lib/editable-html": "11.21.2",
+    "@pie-lib/math-rendering": "3.22.1",
+    "@pie-lib/render-ui": "4.35.2",
+    "@pie-lib/translator": "2.23.1",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",

packages/categorize/controller/package.json

@@ -2,10 +2,10 @@
   "name": "@pie-element/categorize-controller",
   "private": true,
   "dependencies": {
-    "@pie-lib/categorize": "^0.28.1",
-    "@pie-lib/controller-utils": "^0.22.1",
-    "@pie-lib/feedback": "^0.24.1",
-    "@pie-lib/translator": "^2.23.1",
+    "@pie-lib/categorize": "0.28.1",
+    "@pie-lib/controller-utils": "0.22.2",
+    "@pie-lib/feedback": "0.24.1",
+    "@pie-lib/translator": "2.23.1",
     "lodash": "^4.17.15"
   },
   "version": "8.3.2",

packages/categorize/package.json

@@ -11,13 +11,13 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/categorize": "^0.28.1",
-    "@pie-lib/config-ui": "^11.30.1",
-    "@pie-lib/correct-answer-toggle": "^2.25.1",
-    "@pie-lib/drag": "^2.22.1",
-    "@pie-lib/math-rendering": "^3.22.1",
-    "@pie-lib/render-ui": "^4.35.1",
-    "@pie-lib/translator": "^2.23.1",
+    "@pie-lib/categorize": "0.28.1",
+    "@pie-lib/config-ui": "11.30.2",
+    "@pie-lib/correct-answer-toggle": "2.25.2",
+    "@pie-lib/drag": "2.22.2",
+    "@pie-lib/math-rendering": "3.22.1",
+    "@pie-lib/render-ui": "4.35.2",
+    "@pie-lib/translator": "2.23.1",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",

packages/charting/configure/package.json

@@ -9,11 +9,11 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/charting": "^5.36.1",
-    "@pie-lib/config-ui": "^11.30.1",
-    "@pie-lib/editable-html": "^11.21.1",
+    "@pie-lib/charting": "5.36.2",
+    "@pie-lib/config-ui": "11.30.2",
+    "@pie-lib/editable-html": "11.21.2",
     "@pie-lib/math-rendering": "3.22.1",
-    "@pie-lib/render-ui": "^4.35.1",
+    "@pie-lib/render-ui": "4.35.2",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",

packages/charting/controller/package.json

@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/controller-utils": "^0.22.1",
+    "@pie-lib/controller-utils": "0.22.2",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   },

packages/charting/package.json

@@ -12,10 +12,10 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/charting": "^5.36.1",
-    "@pie-lib/correct-answer-toggle": "^2.25.1",
+    "@pie-lib/charting": "5.36.2",
+    "@pie-lib/correct-answer-toggle": "2.25.2",
     "@pie-lib/math-rendering": "3.22.1",
-    "@pie-lib/render-ui": "^4.35.1",
+    "@pie-lib/render-ui": "4.35.2",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",