diff --git a/module.config.js.example b/module.config.js.example index a26f7759..c16d1186 100644 --- a/module.config.js.example +++ b/module.config.js.example @@ -23,9 +23,9 @@ module.exports = { **********************************************************************************************/ // { moduleName: '@edx/brand', dir: '../brand-openedx' }, // replace with your brand checkout - // { moduleName: '@edx/paragon/scss/core', dir: '../paragon', dist: 'scss/core' }, - // { moduleName: '@edx/paragon/icons', dir: '../paragon', dist: 'icons' }, - // { moduleName: '@edx/paragon', dir: '../paragon', dist: 'dist' }, + // { moduleName: '@openedx/paragon/scss/core', dir: '../paragon', dist: 'scss/core' }, + // { moduleName: '@openedx/paragon/icons', dir: '../paragon', dist: 'icons' }, + // { moduleName: '@openedx/paragon', dir: '../paragon', dist: 'dist' }, // { moduleName: '@edx/frontend-platform', dir: '../frontend-platform', dist: 'dist' }, ], }; diff --git a/package-lock.json b/package-lock.json index 29bed1be..a7841e64 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,8 +25,8 @@ "@edx/browserslist-config": "^1.1.1", "@edx/frontend-build": "13.0.0", "@edx/frontend-platform": "^7.1.2", - "@edx/paragon": "20.46.0", "@edx/reactifex": "^2.1.1", + "@openedx/paragon": "^22.1.1", "@reduxjs/toolkit": "1.8.1", "@testing-library/jest-dom": "^6.0.1", "@testing-library/react": "^12.1.5", @@ -36,7 +36,6 @@ "jest": "29.6.1", "react": "17.0.2", "react-dom": "17.0.2", - "react-intl": "^5.25.0", "react-redux": "7.2.9", "react-router": "6.15.0", "react-router-dom": "6.15.0", @@ -45,8 +44,8 @@ "semantic-release": "^21.0.7" }, "peerDependencies": { - "@edx/frontend-platform": "^7.1.2", - "@edx/paragon": "20.46.0", + "@edx/frontend-platform": "^4.3.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "@openedx/paragon": "^21.0.0 || ^22.0.0", "@reduxjs/toolkit": "1.8.1", "react": "16.14.0 || ^17.0.0", "react-dom": "16.14.0 || ^17.0.0", @@ -2146,7 +2145,6 @@ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.24.1.tgz", "integrity": "sha512-T9ko/35G+Bkl+win48GduaPlhSlOjjE5s1TeiEcD+QpxlLQnoEfb/nO/T+TQqkm+ipFwORn+rB8w14iJ/uD0bg==", "dev": true, - "peer": true, "dependencies": { "core-js-pure": "^3.30.2", "regenerator-runtime": "^0.14.0" @@ -2159,8 +2157,7 @@ "version": "0.14.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@babel/runtime/node_modules/regenerator-runtime": { "version": "0.14.1", @@ -3805,119 +3802,6 @@ "@newrelic/publish-sourcemap": "^5.0.1" } }, - "node_modules/@edx/paragon": { - "version": "20.46.0", - "integrity": "sha512-l6T3GRTcStAdj8rVc1taArsJqz20TanIHkVDZuVjXB4/XPrWBlyL5FmuMajUStc8tZQgWO9iGWAS6rdB9jhzgA==", - "dev": true, - "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.1.1", - "@fortawesome/react-fontawesome": "^0.1.18", - "@popperjs/core": "^2.11.4", - "bootstrap": "^4.6.2", - "classnames": "^2.3.1", - "email-prop-type": "^3.0.0", - "file-selector": "^0.6.0", - "font-awesome": "^4.7.0", - "glob": "^8.0.3", - "lodash.uniqby": "^4.7.0", - "mailto-link": "^2.0.0", - "prop-types": "^15.8.1", - "react-bootstrap": "^1.6.5", - "react-colorful": "^5.6.1", - "react-dropzone": "^14.2.1", - "react-focus-on": "^3.5.4", - "react-loading-skeleton": "^3.1.0", - "react-popper": "^2.2.5", - "react-proptype-conditional-require": "^1.0.4", - "react-responsive": "^8.2.0", - "react-table": "^7.7.0", - "react-transition-group": "^4.4.2", - "tabbable": "^5.3.3", - "uncontrollable": "^7.2.1", - "uuid": "^9.0.0" - }, - "peerDependencies": { - "react": "^16.8.6 || ^17.0.0", - "react-dom": "^16.8.6 || ^17.0.0", - "react-intl": "^5.25.1" - } - }, - "node_modules/@edx/paragon/node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz", - "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==", - "dev": true, - "hasInstallScript": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/@edx/paragon/node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", - "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", - "dev": true, - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.2" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@edx/paragon/node_modules/@fortawesome/react-fontawesome": { - "version": "0.1.19", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.19.tgz", - "integrity": "sha512-Hyb+lB8T18cvLNX0S3llz7PcSOAJMLwiVKBuuzwM/nI5uoBw+gQjnf9il0fR1C3DKOI5Kc79pkJ4/xB0Uw9aFQ==", - "dev": true, - "dependencies": { - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "@fortawesome/fontawesome-svg-core": "~1 || ~6", - "react": ">=16.x" - } - }, - "node_modules/@edx/paragon/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@edx/paragon/node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/@edx/paragon/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@edx/reactifex": { "version": "2.2.0", "integrity": "sha512-vyGDtx3BwCr6Gjbm4y6gJ8Bzc2TOSNBlBa2hMerz59HoXaot14MihxxiDU+JDNybGLLcKDBiK511bOi/77i1lw==", @@ -4087,6 +3971,7 @@ "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-1.2.1.tgz", "integrity": "sha512-Rg0e76nomkz3vF9IPlKeV+Qynok0r7YZjL6syLz4/urSg0IbjPZCB/iYUMNsYA643gh4mgrX3T7KEIFIxJBQeg==", "dev": true, + "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -4096,6 +3981,7 @@ "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.1.0.tgz", "integrity": "sha512-Qxv/lmCN6hKpBSss2uQ8IROVnta2r9jd3ymUEIjm2UyIkUCHVcbUVRGL/KS/wv7876edvsPe+hjHVJ4z8YuVaw==", "dev": true, + "peer": true, "dependencies": { "@formatjs/ecma402-abstract": "1.11.4", "@formatjs/icu-skeleton-parser": "1.3.6", @@ -4107,6 +3993,7 @@ "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.3.6.tgz", "integrity": "sha512-I96mOxvml/YLrwU2Txnd4klA7V8fRhb6JG/4hm3VMNmeJo1F03IpV2L3wWt7EweqNLES59SZ4d6hVOPCSf80Bg==", "dev": true, + "peer": true, "dependencies": { "@formatjs/ecma402-abstract": "1.11.4", "tslib": "^2.1.0" @@ -4117,6 +4004,7 @@ "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.2.1.tgz", "integrity": "sha512-vgvyUOOrzqVaOFYzTf2d3+ToSkH2JpR7x/4U1RyoHQLmvEaTQvXJ7A2qm1Iy3brGNXC/+/7bUlc3lpH+h/LOJA==", "dev": true, + "peer": true, "dependencies": { "@formatjs/ecma402-abstract": "1.11.4", "@formatjs/fast-memoize": "1.2.1", @@ -4140,6 +4028,7 @@ "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-5.4.3.tgz", "integrity": "sha512-4r12A3mS5dp5hnSaQCWBuBNfi9Amgx2dzhU4lTFfhSxgb5DOAiAbMpg6+7gpWZgl4ahsj3l2r/iHIjdmdXOE2Q==", "dev": true, + "peer": true, "dependencies": { "@formatjs/ecma402-abstract": "1.11.4", "@formatjs/intl-localematcher": "0.2.25", @@ -4151,6 +4040,7 @@ "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-6.5.3.tgz", "integrity": "sha512-ozpz515F/+3CU+HnLi5DYPsLa6JoCfBggBSSg/8nOB5LYSFW9+ZgNQJxJ8tdhKYeODT+4qVHX27EeJLoxLGLNg==", "dev": true, + "peer": true, "dependencies": { "@formatjs/ecma402-abstract": "1.11.4", "@formatjs/intl-localematcher": "0.2.25", @@ -4281,6 +4171,7 @@ }, "node_modules/@fortawesome/fontawesome-svg-core": { "version": "1.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz", "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==", "hasInstallScript": true, "dependencies": { @@ -4292,6 +4183,7 @@ }, "node_modules/@fortawesome/free-brands-svg-icons": { "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.4.tgz", "integrity": "sha512-f1witbwycL9cTENJegcmcZRYyawAFbm8+c6IirLmwbbpqz46wyjbQYLuxOc7weXFXfB7QR8/Vd2u5R3q6JYD9g==", "hasInstallScript": true, "dependencies": { @@ -4303,6 +4195,7 @@ }, "node_modules/@fortawesome/free-regular-svg-icons": { "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz", "integrity": "sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==", "hasInstallScript": true, "dependencies": { @@ -4314,6 +4207,7 @@ }, "node_modules/@fortawesome/free-solid-svg-icons": { "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz", "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==", "hasInstallScript": true, "dependencies": { @@ -4325,6 +4219,7 @@ }, "node_modules/@fortawesome/react-fontawesome": { "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz", "integrity": "sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==", "dependencies": { "prop-types": "^15.8.1" @@ -7273,7 +7168,6 @@ "resolved": "https://registry.npmjs.org/@openedx/paragon/-/paragon-22.1.1.tgz", "integrity": "sha512-XPRuV9zn7BeCIYfU5kE2XZ4YevjA0wfS/fuydB8Ta/aNY1dw9fQ7CjHOIfkZqDic4Jygusj/uhE/1WYJD8kvyw==", "dev": true, - "peer": true, "workspaces": [ "example", "component-generator", @@ -7327,7 +7221,6 @@ "integrity": "sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==", "dev": true, "hasInstallScript": true, - "peer": true, "engines": { "node": ">=6" } @@ -7338,7 +7231,6 @@ "integrity": "sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==", "dev": true, "hasInstallScript": true, - "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.1" }, @@ -7351,7 +7243,6 @@ "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.19.tgz", "integrity": "sha512-Hyb+lB8T18cvLNX0S3llz7PcSOAJMLwiVKBuuzwM/nI5uoBw+gQjnf9il0fR1C3DKOI5Kc79pkJ4/xB0Uw9aFQ==", "dev": true, - "peer": true, "dependencies": { "prop-types": "^15.8.1" }, @@ -7365,7 +7256,6 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "peer": true, "dependencies": { "balanced-match": "^1.0.0" } @@ -7375,7 +7265,6 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, - "peer": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -7395,7 +7284,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, - "peer": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -10740,15 +10628,13 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/child_process": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz", "integrity": "sha512-Wmza/JzL0SiWz7kl6MhIKT5ceIlnFPJX+lwUGj7Clhy5MMldsSoJR0+uvRzOS5Kv45Mq7t1PoE8TsOA9bzvb6g==", - "dev": true, - "peer": true + "dev": true }, "node_modules/chokidar": { "version": "3.5.3", @@ -10927,7 +10813,6 @@ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, - "peer": true, "dependencies": { "restore-cursor": "^3.1.0" }, @@ -10940,7 +10825,6 @@ "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", "dev": true, - "peer": true, "engines": { "node": ">=6" }, @@ -10968,7 +10852,6 @@ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true, - "peer": true, "engines": { "node": ">= 10" } @@ -10992,7 +10875,6 @@ "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", "dev": true, - "peer": true, "engines": { "node": ">=0.8" } @@ -12163,7 +12045,6 @@ "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, - "peer": true, "dependencies": { "clone": "^1.0.2" }, @@ -13830,7 +13711,6 @@ "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, - "peer": true, "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -15522,7 +15402,6 @@ "resolved": "https://registry.npmjs.org/imask/-/imask-7.5.0.tgz", "integrity": "sha512-eoTEnw67KAamB1zsiYtU35s0Fj1XYZ8mN2q3ZDGO4ot4FtPmBpw9S6kOTj0kaOILdsEA6ZhNtH2TAMXe/NChmQ==", "dev": true, - "peer": true, "dependencies": { "@babel/runtime-corejs3": "^7.23.9" }, @@ -15722,7 +15601,6 @@ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", "dev": true, - "peer": true, "dependencies": { "ansi-escapes": "^4.2.1", "chalk": "^4.1.1", @@ -15749,7 +15627,6 @@ "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, - "peer": true, "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -15765,7 +15642,6 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, - "peer": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -15803,6 +15679,7 @@ "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-9.13.0.tgz", "integrity": "sha512-7sGC7QnSQGa5LZP7bXLDhVDtQOeKGeBFGHF2Y8LVBwYZoQZCgWeKoPGTa5GMG8g/TzDgeXuYJQis7Ggiw2xTOw==", "dev": true, + "peer": true, "dependencies": { "@formatjs/ecma402-abstract": "1.11.4", "@formatjs/fast-memoize": "1.2.1", @@ -16119,7 +15996,6 @@ "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -20082,7 +19958,6 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, - "peer": true, "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -20099,7 +19974,6 @@ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -21093,8 +20967,7 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/nanoid": { "version": "3.3.7", @@ -24794,7 +24667,6 @@ "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, - "peer": true, "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -24818,7 +24690,6 @@ "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -24831,7 +24702,6 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -26680,7 +26550,6 @@ "resolved": "https://registry.npmjs.org/react-imask/-/react-imask-7.5.0.tgz", "integrity": "sha512-yWExhHphDmNaHvmOsYR+5QcludeBdYk6bXyo8kouIJFAub5sF+O0kLPVupg2yhd7EfTqjLswFZ/tqY1AhKnd9Q==", "dev": true, - "peer": true, "dependencies": { "imask": "^7.5.0", "prop-types": "^15.8.1" @@ -26697,6 +26566,7 @@ "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-5.25.1.tgz", "integrity": "sha512-pkjdQDvpJROoXLMltkP/5mZb0/XqrqLoPGKUCfbdkP8m6U9xbK40K51Wu+a4aQqTEvEK5lHBk0fWzUV72SJ3Hg==", "dev": true, + "peer": true, "dependencies": { "@formatjs/ecma402-abstract": "1.11.4", "@formatjs/icu-messageformat-parser": "2.1.0", @@ -27602,7 +27472,6 @@ "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, - "peer": true, "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -27683,7 +27552,6 @@ "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true, - "peer": true, "engines": { "node": ">=0.12.0" } @@ -27716,7 +27584,6 @@ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, - "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -30172,7 +30039,6 @@ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, - "peer": true, "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -31199,7 +31065,6 @@ "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", "dev": true, - "peer": true, "dependencies": { "defaults": "^1.0.3" } diff --git a/package.json b/package.json index 8acada9e..82dbe5f4 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ }, "peerDependencies": { "@edx/frontend-platform": "^4.3.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", - "@edx/paragon": "20.46.0", + "@openedx/paragon": "^21.0.0 || ^22.0.0", "@reduxjs/toolkit": "1.8.1", "react": "16.14.0 || ^17.0.0", "react-dom": "16.14.0 || ^17.0.0", @@ -67,8 +67,8 @@ "@edx/browserslist-config": "^1.1.1", "@edx/frontend-build": "13.0.0", "@edx/frontend-platform": "^7.1.2", - "@edx/paragon": "20.46.0", "@edx/reactifex": "^2.1.1", + "@openedx/paragon": "^22.1.1", "@reduxjs/toolkit": "1.8.1", "@testing-library/jest-dom": "^6.0.1", "@testing-library/react": "^12.1.5", @@ -78,7 +78,6 @@ "jest": "29.6.1", "react": "17.0.2", "react-dom": "17.0.2", - "react-intl": "^5.25.0", "react-redux": "7.2.9", "react-router": "6.15.0", "react-router-dom": "6.15.0", diff --git a/src/components/APIError/index.jsx b/src/components/APIError/index.jsx index bf0cad7b..6552e7fe 100644 --- a/src/components/APIError/index.jsx +++ b/src/components/APIError/index.jsx @@ -1,8 +1,8 @@ /* eslint-disable jsx-a11y/no-noninteractive-tabindex */ import { useEffect, useRef } from 'react'; import { useDispatch } from 'react-redux'; -import { Alert } from '@edx/paragon'; -import { Info } from '@edx/paragon/icons'; +import { Alert } from '@openedx/paragon'; +import { Info } from '@openedx/paragon/icons'; import { clearApiError, } from '../../data/thunks'; diff --git a/src/components/Disclosure/index.jsx b/src/components/Disclosure/index.jsx index 2be1e3f2..cdb383bb 100644 --- a/src/components/Disclosure/index.jsx +++ b/src/components/Disclosure/index.jsx @@ -1,8 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { Hyperlink, Icon } from '@edx/paragon'; -import { Chat } from '@edx/paragon/icons'; +import { Hyperlink, Icon } from '@openedx/paragon'; +import { Chat } from '@openedx/paragon/icons'; import { getConfig } from '@edx/frontend-platform/config'; import './Disclosure.scss'; diff --git a/src/components/MessageForm/index.jsx b/src/components/MessageForm/index.jsx index 6b60c378..4f2cb163 100644 --- a/src/components/MessageForm/index.jsx +++ b/src/components/MessageForm/index.jsx @@ -2,8 +2,8 @@ import PropTypes from 'prop-types'; import React, { useEffect, useRef } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import { Button, Form, Icon } from '@edx/paragon'; -import { Send } from '@edx/paragon/icons'; +import { Button, Form, Icon } from '@openedx/paragon'; +import { Send } from '@openedx/paragon/icons'; import { acknowledgeDisclosure, diff --git a/src/components/Sidebar/index.jsx b/src/components/Sidebar/index.jsx index c9a2ceee..2d47f297 100644 --- a/src/components/Sidebar/index.jsx +++ b/src/components/Sidebar/index.jsx @@ -6,8 +6,8 @@ import { Button, Icon, IconButton, -} from '@edx/paragon'; -import { Close } from '@edx/paragon/icons'; +} from '@openedx/paragon'; +import { Close } from '@openedx/paragon/icons'; import APIError from '../APIError'; import ChatBox from '../ChatBox'; diff --git a/src/components/ToggleXpertButton/index.jsx b/src/components/ToggleXpertButton/index.jsx index a87f5099..6041c9bc 100644 --- a/src/components/ToggleXpertButton/index.jsx +++ b/src/components/ToggleXpertButton/index.jsx @@ -9,8 +9,8 @@ import { IconButton, ModalCloseButton, ModalPopup, -} from '@edx/paragon'; -import { Close } from '@edx/paragon/icons'; +} from '@openedx/paragon'; +import { Close } from '@openedx/paragon/icons'; import { ReactComponent as XpertLogo } from '../../assets/xpert-logo.svg'; import './index.scss'; diff --git a/src/i18n/index.js b/src/i18n/index.js index 5f4f4be7..a4825d68 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -1,4 +1,4 @@ -import { messages as paragonMessages } from '@edx/paragon'; +import { messages as paragonMessages } from '@openedx/paragon'; import arMessages from './messages/ar.json'; import caMessages from './messages/ca.json'; diff --git a/src/index.scss b/src/index.scss index 0bb1f9ee..04fbe8eb 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1,4 +1,4 @@ @import "@edx/brand/paragon/fonts.scss"; @import "@edx/brand/paragon/variables.scss"; -@import "@edx/paragon/scss/core/core.scss"; +@import "@openedx/paragon/scss/core/core.scss"; @import "@edx/brand/paragon/overrides.scss"; diff --git a/src/utils/utils.test.jsx b/src/utils/utils.test.jsx index 28b56d4a..3edeef44 100644 --- a/src/utils/utils.test.jsx +++ b/src/utils/utils.test.jsx @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { render } from '@testing-library/react'; import { configureStore } from '@reduxjs/toolkit'; import { Provider } from 'react-redux'; -import { IntlProvider } from 'react-intl'; +import { IntlProvider } from '@edx/frontend-platform/i18n'; import { reducer as learningAssistantReducer } from '../data/slice'; function renderWithProviders(