diff --git a/Makefile b/Makefile index d29eb79f..d543ed07 100755 --- a/Makefile +++ b/Makefile @@ -3,12 +3,7 @@ npm-install-%: ## install specified % npm package git add package.json intl_imports = ./node_modules/.bin/intl-imports.js -transifex_utils = ./node_modules/.bin/transifex-utils.js i18n = ./src/i18n -transifex_input = $(i18n)/transifex_input.json - -# This directory must match .babelrc . -transifex_temp = ./temp/babel-plugin-formatjs NPM_TESTS=build i18n_extract lint test @@ -44,14 +39,9 @@ build: clean i18n.extract: # Pulling display strings from .jsx files into .json files... - rm -rf $(transifex_temp) npm run-script i18n_extract -i18n.concat: - # Gathering JSON messages into one file... - $(transifex_utils) $(transifex_temp) $(transifex_input) - -extract_translations: | requirements i18n.extract i18n.concat +extract_translations: | requirements i18n.extract # Despite the name, we actually need this target to detect changes in the incoming translated message files as well. detect_changed_source_translations: diff --git a/package-lock.json b/package-lock.json index 3981d95e..0ad143e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,7 +37,7 @@ "tsc-alias": "^1.8.16" }, "peerDependencies": { - "@openedx/frontend-base": "^1.0.0-alpha.14", + "@openedx/frontend-base": "^1.0.0-alpha.16", "@openedx/paragon": "^23", "@tanstack/react-query": "^5", "@types/react": "^18", @@ -4204,9 +4204,9 @@ } }, "node_modules/@openedx/frontend-base": { - "version": "1.0.0-alpha.14", - "resolved": "https://registry.npmjs.org/@openedx/frontend-base/-/frontend-base-1.0.0-alpha.14.tgz", - "integrity": "sha512-VeHxEMhMgRbsfdRklbsynivhcrT16aIZEZNwecOJ3SXP3WTFkZi5GGJG5YDydQ/K/znd3ckT5TgSXipkIrtPRA==", + "version": "1.0.0-alpha.17", + "resolved": "https://registry.npmjs.org/@openedx/frontend-base/-/frontend-base-1.0.0-alpha.17.tgz", + "integrity": "sha512-eruydSPqU1brohUkTd9MxA/BFA3mTH35VAVhwZYZp5fd0LT2DqQkuhwxC0kpxmaOBnT7R7AdnxujNxe5YCxZWg==", "license": "AGPL-3.0", "peer": true, "dependencies": { @@ -4270,7 +4270,7 @@ "postcss-rtlcss": "^5.5.0", "prop-types": "^15.8.1", "react-dev-utils": "12.0.1", - "react-focus-on": "<3.10.0", + "react-focus-on": "^3.10.2", "react-intl": "^6.6.6", "react-refresh": "0.16.0", "react-refresh-typescript": "^2.0.9", @@ -5741,6 +5741,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz", "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==", "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.56.1", @@ -9906,7 +9907,6 @@ "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", "license": "MIT", - "peer": true, "dependencies": { "loader-utils": "^2.0.0", "schema-utils": "^3.0.0" @@ -16538,24 +16538,24 @@ } }, "node_modules/react-focus-on": { - "version": "3.9.4", - "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.9.4.tgz", - "integrity": "sha512-NFKmeH6++wu8e7LJcbwV8TTd4L5w/U5LMXTMOdUcXhCcZ7F5VOvgeTHd4XN1PD7TNmdvldDu/ENROOykUQ4yQg==", + "version": "3.10.2", + "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.10.2.tgz", + "integrity": "sha512-Ytdx2dh6yoCc2HI4Y7u5bI1xF1oeeRud52v8zQdGsyxyVC5W/dwcgQGp+CCpoLGQegwKHybH8diVj+Qn23y+hA==", "license": "MIT", "dependencies": { - "aria-hidden": "^1.2.2", - "react-focus-lock": "^2.11.3", - "react-remove-scroll": "^2.6.0", - "react-style-singleton": "^2.2.1", + "aria-hidden": "^1.2.5", + "react-focus-lock": "^2.13.7", + "react-remove-scroll": "^2.6.4", + "react-style-singleton": "^2.2.3", "tslib": "^2.3.1", - "use-sidecar": "^1.1.2" + "use-sidecar": "^1.1.3" }, "engines": { "node": ">=8.5.0" }, "peerDependencies": { - "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" }, "peerDependenciesMeta": { "@types/react": { @@ -17471,7 +17471,6 @@ "resolved": "https://registry.npmjs.org/sass/-/sass-1.97.3.tgz", "integrity": "sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg==", "license": "MIT", - "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -17492,7 +17491,6 @@ "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.97.3.tgz", "integrity": "sha512-eKzFy13Nk+IRHhlAwP3sfuv+PzOrvzUkwJK2hdoCKYcWGSdmwFpeGpWmyewdw8EgBnsKaSBtgf/0b2K635ecSA==", "license": "MIT", - "peer": true, "dependencies": { "@bufbuild/protobuf": "^2.5.0", "colorjs.io": "^0.5.0", @@ -20383,6 +20381,7 @@ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz", "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==", "license": "MIT", + "peer": true, "dependencies": { "@discoveryjs/json-ext": "^0.5.0", "@webpack-cli/configtest": "^2.1.1", @@ -20511,6 +20510,7 @@ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.2.3.tgz", "integrity": "sha512-9Gyu2F7+bg4Vv+pjbovuYDhHX+mqdqITykfzdM9UyKqKHlsE5aAjRhR+oOEfXW5vBeu8tarzlJFIZva4ZjAdrQ==", "license": "MIT", + "peer": true, "dependencies": { "@types/bonjour": "^3.5.13", "@types/connect-history-api-fallback": "^1.5.4", diff --git a/package.json b/package.json index 8d5f962d..6d9dbc24 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "tsc-alias": "^1.8.16" }, "peerDependencies": { - "@openedx/frontend-base": "^1.0.0-alpha.14", + "@openedx/frontend-base": "^1.0.0-alpha.16", "@openedx/paragon": "^23", "@tanstack/react-query": "^5", "@types/react": "^18",