Skip to content

Commit e79030b

Browse files
Merge branch 'master' into keblysh/feat/user-avatar-master
2 parents d738b6f + 5e8c825 commit e79030b

File tree

235 files changed

+15440
-20006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+15440
-20006
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ coverage/*
22
dist/
33
node_modules/
44
jest.config.js
5+
src/i18n/messages/

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { createConfig } = require('@edx/frontend-build');
1+
const { createConfig } = require('@openedx/frontend-build');
22

33
module.exports = createConfig(
44
'eslint',

.github/workflows/ci.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,19 @@ on:
99
jobs:
1010
tests:
1111
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
node: [18, 20]
15+
1216
steps:
1317
- name: Checkout
14-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1519
with:
1620
fetch-depth: 0
17-
- name: Setup Nodejs Env
18-
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
1921
- name: Setup Nodejs
20-
uses: actions/setup-node@v2
22+
uses: actions/setup-node@v4
2123
with:
22-
node-version: ${{ env.NODE_VER }}
24+
node-version: ${{ matrix.node }}
2325
- name: Install dependencies
2426
run: npm ci
2527
- name: Validate package-lock.json changes
@@ -33,4 +35,7 @@ jobs:
3335
- name: i18n_extract
3436
run: npm run i18n_extract
3537
- name: Coverage
36-
uses: codecov/codecov-action@v3
38+
uses: codecov/codecov-action@v4
39+
with:
40+
token: ${{ secrets.CODECOV_TOKEN }}
41+
fail_ci_if_error: true

.github/workflows/lockfileversion-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ on:
1010

1111
jobs:
1212
version-check:
13-
uses: openedx/.github/.github/workflows/lockfile-check.yml@master
13+
uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

.tx/config

-8
This file was deleted.

Makefile

+5-14
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
export TRANSIFEX_RESOURCE = frontend-app-discussions
2-
transifex_resource = frontend-app-discussions
3-
transifex_langs = "ar,cs,de_DE,es_419,es_AR,es_ES,fa_IR,fr,fr_CA,fr_FR,hi,it_IT,pl,pt_PT,tr_TR,uk,ru,zh_CN"
4-
51
intl_imports = ./node_modules/.bin/intl-imports.js
62
transifex_utils = ./node_modules/.bin/transifex-utils.js
73
i18n = ./src/i18n
@@ -56,26 +52,21 @@ push_translations:
5652
# Pushing comments to Transifex...
5753
./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
5854

59-
ifeq ($(OPENEDX_ATLAS_PULL),)
60-
# Pulls translations from Transifex.
61-
pull_translations:
62-
tx pull -t -f --mode reviewed --languages=$(transifex_langs)
63-
else
64-
# Experimental: OEP-58 Pulls translations using atlas
6555
pull_translations:
6656
rm -rf src/i18n/messages
6757
mkdir src/i18n/messages
6858
cd src/i18n/messages \
69-
&& atlas pull --filter=$(transifex_langs) \
59+
&& atlas pull $(ATLAS_OPTIONS) \
7060
translations/frontend-component-header/src/i18n/messages:frontend-component-header \
7161
translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
62+
translations/frontend-platform/src/i18n/messages:frontend-platform \
7263
translations/paragon/src/i18n/messages:paragon \
7364
translations/frontend-app-discussions/src/i18n/messages:frontend-app-discussions
7465

75-
$(intl_imports) frontend-component-header frontend-component-footer paragon frontend-app-discussions
76-
endif
66+
$(intl_imports) frontend-component-header frontend-component-footer frontend-platform paragon frontend-app-discussions
67+
# endif
7768

7869
# This target is used by Travis.
7970
validate-no-uncommitted-package-lock-changes:
8071
# Checking for package-lock.json changes...
81-
git diff --exit-code package-lock.json
72+
git diff --exit-code package-lock.json

README.rst

+6
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ Cloning and Startup
5252

5353
The dev server is running at `http://localhost:2002 <http://localhost:2002>`_.
5454

55+
Plugins
56+
=======
57+
This MFE can be customized using `Frontend Plugin Framework <https://github.com/openedx/frontend-plugin-framework>`_.
58+
59+
The parts of this MFE that can be customized in that manner are documented `here </src/plugin-slots>`_.
60+
5561
Getting Help
5662
============
5763
Please tag **@openedx/edx-infinity ** on any PRs or issues. Thanks.

jest.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
const { createConfig } = require('@edx/frontend-build');
1+
const { createConfig } = require('@openedx/frontend-build');
22

33
module.exports = createConfig('jest', {
44
// setupFilesAfterEnv is used after the jest environment has been loaded. In general this is what you want.
55
// If you want to add config BEFORE jest loads, use setupFiles instead.
66
setupFiles: ['<rootDir>/.env.test'],
77
setupFilesAfterEnv: [
8-
'<rootDir>/src/setupTest.js',
8+
'<rootDir>/src/setupTest.jsx',
99
],
1010
coveragePathIgnorePatterns: [
11-
'src/setupTest.js',
11+
'src/setupTest.jsx',
1212
'src/i18n',
1313
],
1414
});

0 commit comments

Comments
 (0)