Compare commits
37 Commits
v3.6.4
...
mashal-m/s
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
acd118a467 | ||
|
|
ee92f5e63a | ||
|
|
725fcb1b68 | ||
|
|
eca0c852c9 | ||
|
|
e3c77460eb | ||
|
|
0c536b30dd | ||
|
|
f828ce6461 | ||
|
|
d96b54ec71 | ||
|
|
270f416011 | ||
|
|
2543926c95 | ||
|
|
c5eb43a2a5 | ||
|
|
256fa5c9d8 | ||
|
|
267cce9f89 | ||
|
|
4f59c80a12 | ||
|
|
59afd596ab | ||
|
|
0c83268163 | ||
|
|
c5f5fa9281 | ||
|
|
e247aee372 | ||
|
|
f6ae5a4bdd | ||
|
|
057d16d3c1 | ||
|
|
93bb38d0bd | ||
|
|
01405eaff9 | ||
|
|
59fa6e2a35 | ||
|
|
9fc3a0e835 | ||
|
|
22e157adf6 | ||
|
|
6b81f69eba | ||
|
|
cefa84006c | ||
|
|
a54309dd63 | ||
|
|
aeb0fd2be7 | ||
|
|
26eb2bb4c7 | ||
|
|
8083079954 | ||
|
|
d4fc8489ea | ||
|
|
4020a81bd4 | ||
|
|
acf1adba80 | ||
|
|
a204ff8c03 | ||
|
|
e8ccc4b707 | ||
|
|
4d86780c73 |
72
.github/workflows/ci.yml
vendored
72
.github/workflows/ci.yml
vendored
@@ -1,37 +1,55 @@
|
|||||||
name: Default CI
|
name: Default CI
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- '**'
|
- '**'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
tests:
|
tests:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
node: [16]
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Setup Nodejs
|
- name: Setup Nodejs Env
|
||||||
uses: actions/setup-node@v3
|
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
|
||||||
with:
|
- name: Setup Nodejs
|
||||||
node-version: ${{ matrix.node }}
|
uses: actions/setup-node@v3
|
||||||
- name: Install dependencies
|
with:
|
||||||
run: npm ci
|
node-version: ${{ env.NODE_VER }}
|
||||||
- name: Validate package-lock.json changes
|
- name: Install dependencies
|
||||||
run: make validate-no-uncommitted-package-lock-changes
|
run: npm ci
|
||||||
- name: Lint
|
- name: Validate package-lock.json changes
|
||||||
run: npm run lint
|
run: make validate-no-uncommitted-package-lock-changes
|
||||||
- name: Test
|
- name: Lint
|
||||||
run: npm run test
|
run: npm run lint
|
||||||
- name: Build
|
- name: Test
|
||||||
run: npm run build
|
run: npm run test
|
||||||
- name: i18n_extract
|
- name: Build
|
||||||
run: npm run i18n_extract
|
run: npm run build
|
||||||
- name: Coverage
|
- name: i18n_extract
|
||||||
uses: codecov/codecov-action@v3
|
run: npm run i18n_extract
|
||||||
|
- name: Coverage
|
||||||
|
uses: codecov/codecov-action@v3
|
||||||
|
- name: prep plugins
|
||||||
|
run: npm install -D @semantic-release/changelog @semantic-release/git @semantic-release/exec
|
||||||
|
- name: Run semantic release
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
|
||||||
|
NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
|
||||||
|
run: npx semantic-release
|
||||||
|
id: ver
|
||||||
|
outputs:
|
||||||
|
output1: ${{ steps.ver.outputs.nextVer }}
|
||||||
|
|
||||||
|
print:
|
||||||
|
needs: tests
|
||||||
|
runs-on: ubuntu-20.04
|
||||||
|
steps:
|
||||||
|
- name: Print version
|
||||||
|
run: echo ${{ needs.tests.outputs.output1 }}
|
||||||
3
.github/workflows/lockfileversion-check.yml
vendored
3
.github/workflows/lockfileversion-check.yml
vendored
@@ -10,5 +10,4 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
version-check:
|
version-check:
|
||||||
uses: openedx/.github/.github/workflows/lockfileversion-check.yml@master
|
uses: openedx/.github/.github/workflows/lockfileversion-check-v3.yml@master
|
||||||
|
|
||||||
|
|||||||
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@@ -12,10 +12,12 @@ jobs:
|
|||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
- name: Setup Nodejs Env
|
||||||
|
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
|
||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v3
|
||||||
with:
|
with:
|
||||||
node-version: 16
|
node-version: ${{ env.NODE_VER }}
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
- name: Validate package-lock.json changes
|
- name: Validate package-lock.json changes
|
||||||
@@ -31,9 +33,10 @@ jobs:
|
|||||||
- name: Build
|
- name: Build
|
||||||
run: npm run build
|
run: npm run build
|
||||||
- name: Release
|
- name: Release
|
||||||
uses: cycjimmy/semantic-release-action@v2
|
uses: cycjimmy/semantic-release-action@v3
|
||||||
with:
|
with:
|
||||||
semantic_version: 16
|
semantic_version: 16
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
|
||||||
NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
|
NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
|
||||||
|
|
||||||
23
.releaserc
23
.releaserc
@@ -1,5 +1,22 @@
|
|||||||
{
|
{
|
||||||
"branch": "master",
|
"branches": [
|
||||||
|
"mashal-m/semantic-release-workaround",
|
||||||
|
"master",
|
||||||
|
{
|
||||||
|
"name": "beta",
|
||||||
|
"prerelease": true
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"plugins": [
|
||||||
|
"@semantic-release/commit-analyzer",
|
||||||
|
"@semantic-release/release-notes-generator",
|
||||||
|
"@semantic-release/github",
|
||||||
|
["@semantic-release/exec",
|
||||||
|
{
|
||||||
|
"publishCmd": "echo ::set-output name=nextVer::${nextRelease.version}"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
],
|
||||||
"tagFormat": "v${version}",
|
"tagFormat": "v${version}",
|
||||||
"verifyConditions": [
|
"verifyConditions": [
|
||||||
"@semantic-release/npm",
|
"@semantic-release/npm",
|
||||||
@@ -20,8 +37,8 @@
|
|||||||
"assets": {
|
"assets": {
|
||||||
"path": "dist/*"
|
"path": "dist/*"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"success": [],
|
"success": [],
|
||||||
"fail": []
|
"fail": []
|
||||||
}
|
}
|
||||||
10
Makefile
10
Makefile
@@ -1,11 +1,9 @@
|
|||||||
transifex_resource = frontend-component-header
|
export TRANSIFEX_RESOURCE = frontend-component-header
|
||||||
transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"
|
transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"
|
||||||
|
|
||||||
transifex_utils = ./node_modules/.bin/transifex-utils.js
|
transifex_utils = ./node_modules/.bin/transifex-utils.js
|
||||||
i18n = ./src/i18n
|
i18n = ./src/i18n
|
||||||
transifex_input = $(i18n)/transifex_input.json
|
transifex_input = $(i18n)/transifex_input.json
|
||||||
tx_url1 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/translation/en/strings/
|
|
||||||
tx_url2 = https://www.transifex.com/api/2/project/edx-platform/resource/$(transifex_resource)/source/
|
|
||||||
|
|
||||||
# This directory must match .babelrc .
|
# This directory must match .babelrc .
|
||||||
transifex_temp = ./temp/babel-plugin-react-intl
|
transifex_temp = ./temp/babel-plugin-react-intl
|
||||||
@@ -42,11 +40,11 @@ push_translations:
|
|||||||
# Pushing strings to Transifex...
|
# Pushing strings to Transifex...
|
||||||
tx push -s
|
tx push -s
|
||||||
# Fetching hashes from Transifex...
|
# Fetching hashes from Transifex...
|
||||||
./node_modules/reactifex/bash_scripts/get_hashed_strings.sh $(tx_url1)
|
./node_modules/@edx/reactifex/bash_scripts/get_hashed_strings_v3.sh
|
||||||
# Writing out comments to file...
|
# Writing out comments to file...
|
||||||
$(transifex_utils) $(transifex_temp) --comments
|
$(transifex_utils) $(transifex_temp) --comments --v3-scripts-path
|
||||||
# Pushing comments to Transifex...
|
# Pushing comments to Transifex...
|
||||||
./node_modules/reactifex/bash_scripts/put_comments.sh $(tx_url2)
|
./node_modules/@edx/reactifex/bash_scripts/put_comments_v3.sh
|
||||||
|
|
||||||
# Pulls translations from Transifex.
|
# Pulls translations from Transifex.
|
||||||
pull_translations:
|
pull_translations:
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ Development
|
|||||||
|
|
||||||
Install dependencies::
|
Install dependencies::
|
||||||
|
|
||||||
npm i
|
npm ci
|
||||||
|
|
||||||
Start the development server::
|
Start the development server::
|
||||||
|
|
||||||
|
|||||||
26393
package-lock.json
generated
26393
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
20
package.json
20
package.json
@@ -35,15 +35,16 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@edx/brand": "npm:@edx/brand-openedx@1.2.0",
|
"@edx/brand": "npm:@edx/brand-openedx@1.2.0",
|
||||||
"@edx/browserslist-config": "^1.1.1",
|
"@edx/browserslist-config": "^1.1.1",
|
||||||
"@edx/frontend-build": "^12.4.19",
|
"@edx/frontend-build": "12.8.27",
|
||||||
"@edx/frontend-platform": "^3.0.1",
|
"@edx/frontend-platform": "4.2.0",
|
||||||
"@testing-library/dom": "8.20.0",
|
"@edx/reactifex": "^2.1.1",
|
||||||
|
"@testing-library/dom": "9.3.0",
|
||||||
"@testing-library/jest-dom": "5.16.5",
|
"@testing-library/jest-dom": "5.16.5",
|
||||||
"@testing-library/react": "10.4.9",
|
"@testing-library/react": "10.4.9",
|
||||||
"enzyme": "3.11.0",
|
"enzyme": "3.11.0",
|
||||||
"enzyme-adapter-react-16": "1.15.7",
|
"enzyme-adapter-react-16": "1.15.7",
|
||||||
"husky": "8.0.3",
|
"husky": "8.0.3",
|
||||||
"jest": "29.4.3",
|
"jest": "29.5.0",
|
||||||
"jest-chain": "1.1.6",
|
"jest-chain": "1.1.6",
|
||||||
"prop-types": "15.8.1",
|
"prop-types": "15.8.1",
|
||||||
"react": "16.14.0",
|
"react": "16.14.0",
|
||||||
@@ -51,12 +52,11 @@
|
|||||||
"react-redux": "7.2.9",
|
"react-redux": "7.2.9",
|
||||||
"react-router-dom": "5.3.4",
|
"react-router-dom": "5.3.4",
|
||||||
"react-test-renderer": "16.14.0",
|
"react-test-renderer": "16.14.0",
|
||||||
"reactifex": "1.1.1",
|
|
||||||
"redux": "4.2.1",
|
"redux": "4.2.1",
|
||||||
"redux-saga": "1.2.2"
|
"redux-saga": "1.2.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@edx/paragon": "20.28.4",
|
"@edx/paragon": "20.36.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "6.3.0",
|
"@fortawesome/fontawesome-svg-core": "6.3.0",
|
||||||
"@fortawesome/free-brands-svg-icons": "6.3.0",
|
"@fortawesome/free-brands-svg-icons": "6.3.0",
|
||||||
"@fortawesome/free-regular-svg-icons": "6.3.0",
|
"@fortawesome/free-regular-svg-icons": "6.3.0",
|
||||||
@@ -67,9 +67,9 @@
|
|||||||
"react-transition-group": "4.4.5"
|
"react-transition-group": "4.4.5"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@edx/frontend-platform": "^2.0.0 || ^3.0.0",
|
"@edx/frontend-platform": "^4.0.0",
|
||||||
"prop-types": "^15.5.10",
|
"prop-types": "^15.5.10",
|
||||||
"react": "^16.9.0",
|
"react": "^16.9.0 || ^17.0.0",
|
||||||
"react-dom": "^16.9.0"
|
"react-dom": "^16.9.0 || ^17.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"general.register.sentenceCase": "Register",
|
"general.register.sentenceCase": "Register",
|
||||||
"general.signIn.sentenceCase": "Sign in",
|
"general.signIn.sentenceCase": "Увійти",
|
||||||
"header.links.courses": "Courses",
|
"header.links.courses": "Курси",
|
||||||
"header.links.programs": "Programs",
|
"header.links.programs": "Програми",
|
||||||
"header.links.content.search": "Discover New",
|
"header.links.content.search": "Discover New",
|
||||||
"header.links.schools": "Schools & Partners",
|
"header.links.schools": "Schools & Partners",
|
||||||
"header.user.menu.dashboard": "Dashboard",
|
"header.user.menu.dashboard": "Dashboard",
|
||||||
@@ -15,19 +15,19 @@
|
|||||||
"header.user.menu.studio.home": "Studio Home",
|
"header.user.menu.studio.home": "Studio Home",
|
||||||
"header.user.menu.studio.maintenance": "Maintenance",
|
"header.user.menu.studio.maintenance": "Maintenance",
|
||||||
"header.label.account.nav": "Account",
|
"header.label.account.nav": "Account",
|
||||||
"header.label.account.menu": "Account Menu",
|
"header.label.account.menu": "Меню облікового запису",
|
||||||
"header.label.account.menu.for": "Account menu for {username}",
|
"header.label.account.menu.for": "Меню облікового запису для {username}",
|
||||||
"header.label.main.nav": "Main",
|
"header.label.main.nav": "Main",
|
||||||
"header.label.main.menu": "Main Menu",
|
"header.label.main.menu": "Main Menu",
|
||||||
"header.label.main.header": "Main",
|
"header.label.main.header": "Main",
|
||||||
"header.label.secondary.nav": "Secondary",
|
"header.label.secondary.nav": "Secondary",
|
||||||
"header.label.skip.nav": "Skip to main content",
|
"header.label.skip.nav": "Перейти до головного змісту",
|
||||||
"header.label.app.nav": "App",
|
"header.label.app.nav": "App",
|
||||||
"header.menu.dashboard.label": "Dashboard",
|
"header.menu.dashboard.label": "Dashboard",
|
||||||
"header.help.label": "Help",
|
"header.help.label": "Help",
|
||||||
"header.menu.profile.label": "Profile",
|
"header.menu.profile.label": "Profile",
|
||||||
"header.menu.account.label": "Account",
|
"header.menu.account.label": "Account",
|
||||||
"header.menu.orderHistory.label": "Order History",
|
"header.menu.orderHistory.label": "Order History",
|
||||||
"header.navigation.skipNavLink": "Skip to main content.",
|
"header.navigation.skipNavLink": "Перейти до головного змісту.",
|
||||||
"header.menu.signOut.label": "Sign Out"
|
"header.menu.signOut.label": "Sign Out"
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user