diff --git a/lerna.json b/lerna.json index 12651dc27e..d56167dceb 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "packages": [ "packages/*" ], - "version": "2.0.0-alpha.2" + "version": "2.0.0" } diff --git a/package.json b/package.json index 60a9134882..0695af4f25 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "start": "lerna run start --stream --parallel" }, "dependencies": { - "prettier": "^1.18.2", - "lerna": "^3.18.3" + "lerna": "^3.18.3", + "prettier": "^1.18.2" }, "prettier": { "jsxBracketSameLine": true, diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json index 53f704635b..4d7653ca82 100644 --- a/packages/core/package-lock.json +++ b/packages/core/package-lock.json @@ -1,6 +1,6 @@ { "name": "@rjsf/core", - "version": "2.0.0-alpha.2", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index 71eddaaa94..fd7d5b3eac 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@rjsf/core", - "version": "2.0.0-alpha.2", + "version": "2.0.0", "description": "A simple React component capable of building HTML forms out of a JSON schema.", "scripts": { "build": "npm run dist:build:umd && npm run build:cjs && npm run build:es && npm run dist:build:es:lib", diff --git a/packages/core/src/validate.js b/packages/core/src/validate.js index 73046208df..c39e4b6451 100644 --- a/packages/core/src/validate.js +++ b/packages/core/src/validate.js @@ -15,6 +15,7 @@ function createAjvInstance() { multipleOfPrecision: 8, schemaId: "auto", unknownFormats: "ignore", + $data: true, }); // add custom formats diff --git a/packages/material-ui/package-lock.json b/packages/material-ui/package-lock.json index ee5bec109a..c88b5ac53d 100644 --- a/packages/material-ui/package-lock.json +++ b/packages/material-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@rjsf/material-ui", - "version": "2.0.0-alpha.2", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -945,16 +945,6 @@ "regenerator-runtime": "^0.13.2" } }, - "@babel/runtime-corejs2": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.6.3.tgz", - "integrity": "sha512-nuA2o+rgX2+PrNTZ063ehncVcg7sn+tU71BB81SaWRVUbGwCOlb0+yQA1e0QqmzOfRSYOxfvf8cosYqFbJEiwQ==", - "dev": true, - "requires": { - "core-js": "^2.6.5", - "regenerator-runtime": "^0.13.2" - } - }, "@babel/runtime-corejs3": { "version": "7.8.7", "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.8.7.tgz", @@ -1330,23 +1320,6 @@ "react-is": "^16.8.6" } }, - "@rjsf/core": { - "version": "2.0.0-alpha.2", - "resolved": "https://registry.npmjs.org/@rjsf/core/-/core-2.0.0-alpha.2.tgz", - "integrity": "sha512-GtciK9Qn4wAm4mvfakvumfW7NJyYZi7r6mjC+6JY2aAxpbIWsOHD2bzo3dhMI6ql5D1QCplUqFMy0vo6OHxXUQ==", - "dev": true, - "requires": { - "@babel/runtime-corejs2": "^7.4.5", - "ajv": "^6.7.0", - "core-js": "^2.5.7", - "json-schema-merge-allof": "^0.6.0", - "lodash": "^4.17.15", - "prop-types": "^15.7.2", - "react-app-polyfill": "^1.0.4", - "react-is": "^16.9.0", - "shortid": "^2.2.14" - } - }, "@rollup/plugin-commonjs": { "version": "11.0.2", "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz", @@ -2138,12 +2111,6 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", - "dev": true - }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -3367,29 +3334,6 @@ "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, - "compute-gcd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/compute-gcd/-/compute-gcd-1.2.0.tgz", - "integrity": "sha1-/B7eW2UAHpUCJlAvRlQ4Y+T+oQ4=", - "dev": true, - "requires": { - "validate.io-array": "^1.0.3", - "validate.io-function": "^1.0.2", - "validate.io-integer-array": "^1.0.0" - } - }, - "compute-lcm": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/compute-lcm/-/compute-lcm-1.1.0.tgz", - "integrity": "sha1-q9ltBAtBsKFm+JlEtci3xRHiGtU=", - "dev": true, - "requires": { - "compute-gcd": "^1.2.0", - "validate.io-array": "^1.0.3", - "validate.io-function": "^1.0.2", - "validate.io-integer-array": "^1.0.0" - } - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -7203,26 +7147,6 @@ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", "dev": true }, - "json-schema-compare": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/json-schema-compare/-/json-schema-compare-0.2.2.tgz", - "integrity": "sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==", - "dev": true, - "requires": { - "lodash": "^4.17.4" - } - }, - "json-schema-merge-allof": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/json-schema-merge-allof/-/json-schema-merge-allof-0.6.0.tgz", - "integrity": "sha512-LEw4VMQVRceOPLuGRWcxW5orTTiR9ZAtqTAe4rQUjNADTeR81bezBVFa0MqIwp0YmHIM1KkhSjZM7o+IQhaPbQ==", - "dev": true, - "requires": { - "compute-lcm": "^1.1.0", - "json-schema-compare": "^0.2.2", - "lodash": "^4.17.4" - } - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -8214,12 +8138,6 @@ "dev": true, "optional": true }, - "nanoid": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz", - "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==", - "dev": true - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -9476,15 +9394,6 @@ } } }, - "promise": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz", - "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==", - "dev": true, - "requires": { - "asap": "~2.0.6" - } - }, "prompts": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz", @@ -9546,15 +9455,6 @@ "integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=", "dev": true }, - "raf": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", - "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", - "dev": true, - "requires": { - "performance-now": "^2.1.0" - } - }, "rc": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", @@ -9578,28 +9478,6 @@ "prop-types": "^15.6.2" } }, - "react-app-polyfill": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz", - "integrity": "sha512-OfBnObtnGgLGfweORmdZbyEz+3dgVePQBb3zipiaDsMHV1NpWm0rDFYIVXFV/AK+x4VIIfWHhrdMIeoTLyRr2g==", - "dev": true, - "requires": { - "core-js": "^3.5.0", - "object-assign": "^4.1.1", - "promise": "^8.0.3", - "raf": "^3.4.1", - "regenerator-runtime": "^0.13.3", - "whatwg-fetch": "^3.0.0" - }, - "dependencies": { - "core-js": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz", - "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==", - "dev": true - } - } - }, "react-dom": { "version": "16.11.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.11.0.tgz", @@ -10366,15 +10244,6 @@ "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", "dev": true }, - "shortid": { - "version": "2.2.15", - "resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.15.tgz", - "integrity": "sha1-K5AuqpOmmxESA3PNQqHx/kQ3wSI=", - "dev": true, - "requires": { - "nanoid": "^2.1.0" - } - }, "side-channel": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz", @@ -11853,43 +11722,6 @@ "builtins": "^1.0.3" } }, - "validate.io-array": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/validate.io-array/-/validate.io-array-1.0.6.tgz", - "integrity": "sha1-W1osr9j4uFq7L4hroVPy2Tond00=", - "dev": true - }, - "validate.io-function": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/validate.io-function/-/validate.io-function-1.0.2.tgz", - "integrity": "sha1-NDoZgC7TsZaCaceA5VjpNBHAutc=", - "dev": true - }, - "validate.io-integer": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/validate.io-integer/-/validate.io-integer-1.0.5.tgz", - "integrity": "sha1-FoSWSAuVviJH7EQ/IjPeT4mHgGg=", - "dev": true, - "requires": { - "validate.io-number": "^1.0.3" - } - }, - "validate.io-integer-array": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz", - "integrity": "sha1-LKveAzKTpry+Bj/q/pHq9GsToIk=", - "dev": true, - "requires": { - "validate.io-array": "^1.0.3", - "validate.io-integer": "^1.0.4" - } - }, - "validate.io-number": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/validate.io-number/-/validate.io-number-1.0.3.tgz", - "integrity": "sha1-9j/+2iSL8opnqNSODjtGGhZluvg=", - "dev": true - }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", @@ -11943,12 +11775,6 @@ "iconv-lite": "0.4.24" } }, - "whatwg-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", - "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==", - "dev": true - }, "whatwg-mimetype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", diff --git a/packages/material-ui/package.json b/packages/material-ui/package.json index 9606c9d1f3..0343bbe688 100644 --- a/packages/material-ui/package.json +++ b/packages/material-ui/package.json @@ -1,6 +1,6 @@ { "name": "@rjsf/material-ui", - "version": "2.0.0-alpha.2", + "version": "2.0.0", "main": "dist/index.js", "module": "dist/rjsf-material-ui.esm.js", "typings": "dist/index.d.ts", @@ -19,8 +19,8 @@ "peerDependencies": { "@material-ui/core": "^4.2.0", "@material-ui/icons": "^4.2.1", - "react": ">=16", - "@rjsf/core": "^2.0.0-alpha.2" + "@rjsf/core": "^2.0.0-alpha.2", + "react": ">=16" }, "devDependencies": { "@babel/core": "^7.0.0-0", @@ -31,7 +31,7 @@ "@babel/preset-react": "^7.0.0", "@material-ui/core": "^4.2.0", "@material-ui/icons": "^4.2.1", - "@rjsf/core": "^2.0.0-alpha.2", + "@rjsf/core": "^2.0.0", "@types/jest": "^24.0.15", "@types/json-schema": "^7.0.3", "@types/react": "^16.9.23", diff --git a/packages/playground/package-lock.json b/packages/playground/package-lock.json index 478f23c43c..6a5f163c0d 100644 --- a/packages/playground/package-lock.json +++ b/packages/playground/package-lock.json @@ -1,6 +1,6 @@ { "name": "@rjsf/playground", - "version": "2.0.0-alpha.2.2", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/playground/package.json b/packages/playground/package.json index 4feef2cded..074b4218ab 100644 --- a/packages/playground/package.json +++ b/packages/playground/package.json @@ -1,6 +1,6 @@ { "name": "@rjsf/playground", - "version": "2.0.0-alpha.2.2", + "version": "2.0.0", "description": "rjsf playground", "scripts": { "build:lib": "rimraf lib && cross-env NODE_ENV=production babel -d lib/ src/", @@ -39,7 +39,8 @@ "dependencies": { "@babel/runtime-corejs2": "^7.4.5", "@material-ui/core": "^4.9.4", - "@rjsf/core": "^2.0.0-alpha.2", + "@rjsf/core": "^2.0.0", + "@rjsf/material-ui": "^2.0.0", "ajv": "^6.7.0", "core-js": "^2.5.7", "json-schema-merge-allof": "^0.6.0", @@ -50,7 +51,6 @@ "react-bootstrap": "^0.33.1", "react-frame-component": "^4.1.1", "react-is": "^16.9.0", - "@rjsf/material-ui": "^2.0.0-alpha.2", "shortid": "^2.2.14" }, "devDependencies": {