Merge branch 'master' of github.com:openedx/frontend-app-program-cons…

…ole into Ali-Abbas/react-router-upgrade

.eslintrc.js

@@ -1,3 +1,4 @@
+/* eslint-disable import/no-extraneous-dependencies */
 const { createConfig } = require('@edx/frontend-build');
 
-module.exports = createConfig('eslint');
+module.exports = createConfig('eslint');

.github/workflows/ci.yml

@@ -11,14 +11,14 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [16]
+
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1
+    - uses: actions/checkout@v3
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+    - uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node }}
+        node-version: ${{ env.NODE_VER }}
     - run: npm ci
     - run: make validate-no-uncommitted-package-lock-changes
     - run: npm run lint

.github/workflows/lockfileversion-check.yml

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

.github/workflows/update-browserlist.yml

@@ -7,17 +7,14 @@ on:
 jobs:
   update-dep:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node: [16]
-        npm: [8.5.x]
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2
+    - uses: actions/checkout@v3
+    - name: Setup Nodejs Env
+      run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
+    - uses: actions/setup-node@v3
       with:
-        node-version: ${{ matrix.node }}
-    - run: npm install -g npm@${{ matrix.npm }}
+        node-version: ${{ env.NODE_VER }}
     - run: make requirements
 
     - name: Update dependencies

.nvmrc

@@ -0,0 +1 @@
+18

Makefile

@@ -1,6 +1,7 @@
 export TRANSIFEX_RESOURCE = frontend-app-program-manager
 transifex_langs = "ar,fr,es_419,zh_CN,pt,it,de,uk,ru,hi,fr_CA"
 
+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
@@ -39,9 +40,24 @@ push_translations:
 	# 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 -t -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) \
+               translations/frontend-component-footer/src/i18n/messages:frontend-component-footer \
+               translations/frontend-component-header/src/i18n/messages:frontend-component-header \
+               translations/paragon/src/i18n/messages:paragon \
+               translations/frontend-app-account/src/i18n/messages:frontend-app-program-manager
+
+	$(intl_imports) frontend-component-header frontend-component-footer paragon frontend-app-program-manager
+endif
 
 validate-no-uncommitted-package-lock-changes: ## ensure package-lock.json is committed
 	git diff --exit-code package-lock.json