Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// eslint-disable-next-line import/no-extraneous-dependencies
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

module.exports = createConfig('eslint');
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ verify_ssl = true
name = "pypi"

[packages]
tutor = {version = "==17.0.6", extras = ["full"]}
tutor = {version = "==18.2.2", extras = ["full"]}

[dev-packages]

Expand Down
531 changes: 264 additions & 267 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ After doing that, you can run tutor commands inside that shell as normal.
## FAQ

Q: Which version of tutor/OpenEDX are we targeting?
A: 17.0.6 (Quince), it is defined in `Pipfile`
A: 18.2.2 (Redwood), it is defined in `Pipfile`

## Known Issues

Expand Down
16 changes: 8 additions & 8 deletions docs/how_tos/releasing-changes-to-frontend-app-learning-lib.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# Releasing changes to frontend-app-learing as a library
# Releasing changes to frontend-app-learning as a library

After doing changes to https://github.com/wgu-opensource/frontend-app-learning quince branch, you need to build a dist in order to make it usable via npm.
After doing changes to https://github.com/wgu-opensource/frontend-app-learning redwood branch, you need to build a dist in order to make it usable via npm.

To do that, follow the following process:

1. Change to branch quince-dist
2. Pull changes from quince
1. Change to branch redwood-dist
2. Pull changes from redwood
3. Run a build
4. Force-add the dist folder and commit
5. Push changes to quince-dist
5. Push changes to redwood-dist
6. Create release/tag in GitHub
7. Update the tag in package.json of this repo.

## Step by step commands

```
# On https://github.com/wgu-opensource/frontend-app-learning
git checkout quince-dist
git pull origin quince
git checkout redwood-dist
git pull origin redwood
make build
git add -f dist
git commit -m "Release <your release>"
git push origin quince-dist
git push origin redwood-dist
# Go to github and do a release
```
5 changes: 3 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');
const path = require('path');

module.exports = createConfig('jest', {
Expand All @@ -15,8 +15,9 @@ module.exports = createConfig('jest', {
moduleNameMapper: {
rosie: path.resolve('./node_modules/rosie'),
'^@edx/frontend-app-learning/tests$': `${path.resolve('./node_modules/@edx/frontend-app-learning/dist/testExports.js')}`,
'^@src(.*)$': `${path.resolve('./node_modules/@edx/frontend-app-learning/dist/$1')}`,
'^@edx/frontend-platform(.*)$': `${path.resolve('./node_modules/@edx/frontend-platform')}$1`,
'^@edx/paragon(.*)$': `${path.resolve('./node_modules/@edx/paragon')}$1`,
'^@openedx/paragon(.*)$': `${path.resolve('./node_modules/@openedx/paragon')}$1`,
'^prop-types$': path.resolve('./node_modules/prop-types'),
'^react$': path.resolve('./node_modules/react'),
'^react-dom$': path.resolve('./node_modules/react-dom'),
Expand Down
Loading