Skip to content

Commit

Permalink
Merge branch 'master' into ags/inject-theme-css
Browse files Browse the repository at this point in the history
  • Loading branch information
adamstankiewicz committed Dec 9, 2023
2 parents 8f0edb4 + 3a93d60 commit 084a4ed
Show file tree
Hide file tree
Showing 26 changed files with 25,968 additions and 15,102 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ on:

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV

- name: Setup Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VER }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lockfileversion-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
43 changes: 43 additions & 0 deletions .github/workflows/manual-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Manual Publish
on:
workflow_dispatch:
inputs:
tag:
required: true
description: NPM distribution tag to use for the backported release (npm publish --tag <tag>)
jobs:
release:
name: Manual Publish
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VER }}
- name: Install dependencies
run: npm ci
- name: Lint
run: npm run lint
- name: Test
run: npm run test
- name: Coverage
uses: codecov/codecov-action@v3
- name: Build
run: npm run build
# NPM expects to be authenticated for publishing. This step will fail CI if NPM is not authenticated
- name: Check NPM authentication
run: |
echo "//registry.npmjs.org/:_authToken=${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}" >> .npmrc
npm whoami
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.SEMANTIC_RELEASE_GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.SEMANTIC_RELEASE_NPM_TOKEN }}
# `npm publish` relies on version specified in package.json file
run: npm publish ./dist --tag ${{github.event.inputs.tag}} # e.g., old-version
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ on:
jobs:
release:
name: Release
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VER }}

Expand Down
18 changes: 10 additions & 8 deletions example/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import {
AppProvider,
AuthenticatedPageRoute,
ErrorPage,
PageRoute,
PageWrap,
} from '@edx/frontend-platform/react';
import { APP_INIT_ERROR, APP_READY, initialize } from '@edx/frontend-platform';
import { subscribe } from '@edx/frontend-platform/pubSub';
import { Routes, Route } from 'react-router-dom';

import ExamplePage from './ExamplePage';
import AuthenticatedPage from './AuthenticatedPage';
Expand All @@ -20,13 +21,14 @@ import './index.scss';
subscribe(APP_READY, () => {
ReactDOM.render(
<AppProvider>
<PageRoute exact path="/" component={ExamplePage} />
<PageRoute
exact
path="/error_example"
component={() => <ErrorPage message="Test error message" />}
/>
<AuthenticatedPageRoute exact path="/authenticated" component={AuthenticatedPage} />
<Routes>
<Route path="/" element={<PageWrap><ExamplePage /></PageWrap>} />
<Route
path="/error_example"
element={<PageWrap><ErrorPage message="Test error message" /></PageWrap>}
/>
<Route path="/authenticated" element={<AuthenticatedPageRoute><AuthenticatedPage /></AuthenticatedPageRoute>} />
</Routes>
</AppProvider>,
document.getElementById('root'),
);
Expand Down
Loading

0 comments on commit 084a4ed

Please sign in to comment.