Merge branch 'master' into lunyachek/fix/visual-enhancement-disabled-…

…selects-master

.eslintrc.js

@@ -1,5 +1,5 @@
 /* eslint import/no-extraneous-dependencies: ["error", {"peerDependencies": false}] */
-const { createConfig } = require('@edx/frontend-build');
+const { createConfig } = require('@openedx/frontend-build');
 
 module.exports = createConfig('eslint', {
   rules: {

.github/workflows/lockfileversion-check.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   version-check:
-    uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
+    uses: openedx/.github/.github/workflows/lockfile-check.yml@master

.gitignore

@@ -17,3 +17,5 @@ temp/babel-plugin-react-intl
 /temp
 /.vscode
 module.config.js
+
+src/i18n/messages

Makefile

@@ -1,20 +1,17 @@
-export TRANSIFEX_RESOURCE = frontend-app-payment
-transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA,it_IT,pt_PT,de_DE"
-
 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-react-intl
+transifex_temp = ./temp/babel-plugin-formatjs
 
 precommit:
 	npm run lint
 	npm run audit:allowlisted
 
 requirements:
-	npm install
+	npm ci
 
 i18n.extract:
 	# Pulling display strings from .jsx files into .json files...
@@ -32,35 +29,18 @@ detect_changed_source_translations:
 	# Checking for changed translations...
 	git diff --exit-code $(i18n)
 
-# Pushes translations to Transifex.  You must run make extract_translations first.
-push_translations:
-	# Pushing strings to Transifex...
-	tx push -s
-	# Fetching hashes from Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
-	# Writing out comments to file...
-	$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
-	# Pushing comments to Transifex...
-	./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
-
-ifeq ($(OPENEDX_ATLAS_PULL),)
-# Pulls translations from Transifex.
-pull_translations:
-	tx pull -f --mode reviewed --languages=$(transifex_langs)
-else
-# Experimental: OEP-58 Pulls translations using atlas
 pull_translations:
 	rm -rf src/i18n/messages
 	mkdir src/i18n/messages
 	cd src/i18n/messages \
-      && atlas pull --filter=$(transifex_langs) \
+      && atlas pull $(ATLAS_OPTIONS) \
                translations/frontend-component-header/src/i18n/messages:frontend-component-header  \
                translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
+               translations/frontend-platform/src/i18n/messages:frontend-platform \
                translations/paragon/src/i18n/messages:paragon \
                translations/frontend-app-payment/src/i18n/messages:frontend-app-payment
 
-	$(intl_imports) frontend-component-header frontend-component-footer paragon frontend-app-payment
-endif
+	$(intl_imports) frontend-component-header frontend-component-footer frontend-platform paragon frontend-app-payment
 
 # This target is used by CI.
 validate-no-uncommitted-package-lock-changes:

audit-ci.json

@@ -1,16 +1,10 @@
 {
     "allowlist": [
-        "GHSA-3rfm-jhwj-7488",
-        "GHSA-44c6-4v22-4mhx",
-        "GHSA-76p3-8jx3-jpfq",
-        "GHSA-9c47-m6qq-7p4h",
-        "GHSA-h452-7996-h45h",
-        "GHSA-hhq3-ff78-jv3g",
-        "GHSA-pfrx-2q88-qq97",
-        "GHSA-rc47-6667-2j5j",
-        "GHSA-hc6q-2mpp-qw7j",
-        "GHSA-f9xv-q969-pqx4",
-        "GHSA-c2qf-rxjj-qqgw"
+        "GHSA-hpx4-r86g-5jrg",
+        "GHSA-wf5p-g6vw-rhxx",
+        "GHSA-cxjh-pqwp-8mfp",
+        "GHSA-wr3j-pwj9-hqq6",
+        "GHSA-rv95-896h-c2vc"
     ],
     "moderate": true
 }

jest.config.js

@@ -1,7 +1,7 @@
-const { createConfig } = require('@edx/frontend-build');
+const { createConfig } = require('@openedx/frontend-build');
 
 module.exports = createConfig('jest', {
-  setupFiles: [
+  setupFilesAfterEnv: [
     '<rootDir>/src/setupTest.js',
   ],
   coveragePathIgnorePatterns: [