Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace @edx/paragon and @edx/frontend-build #627

Closed
wants to merge 3 commits into from
Closed
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,5 +1,5 @@
// eslint-disable-next-line import/no-extraneous-dependencies
const { getBaseConfig } = require('@edx/frontend-build');
const { getBaseConfig } = require('@openedx/frontend-build');

const config = getBaseConfig('eslint');

Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

module.exports = createConfig('babel-preserve-modules');
2 changes: 1 addition & 1 deletion docs/decisions/0002-frontend-base-design-goals.rst
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Addressing consistency vs. flexibility
``frontend-base`` is published to npm as ES6 modules with
``peerDependencies`` in its package.json. This means that consuming apps
are told exactly what versions of supporting libraries
(``@edx/frontend-auth``, ``@edx/frontend-i18n``, ``@edx/paragon``,
(``@edx/frontend-auth``, ``@edx/frontend-i18n``, ``@openedx/paragon``,
React, etc.) are compatible with a given version of ``frontend-base``.
Beyond that, applications are free to use any compatible version. This
prevents ``frontend-base`` from being a bottleneck for updating library
Expand Down
4 changes: 2 additions & 2 deletions docs/how_tos/i18n.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ The pipeline jobs live in the `ecommerce-scripts <https://github.com/openedx/eco

#. Extraction: We will be using a Babel plugin to find all the strings inside a ``FormattedMessage`` component or inside a call to ``defineMessages``.

If you are using @edx/frontend-build...
If you are using @openedx/frontend-build...

* Add this to ``scripts`` in ``package.json``::

"i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null"

* The default babel configuration provided by frontend-build has the needed configuration.

If you are NOT using @edx/frontend-build:
If you are NOT using @openedx/frontend-build:

* Add this to ``scripts`` in ``package.json``::

Expand Down
4 changes: 2 additions & 2 deletions example/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "@edx/brand/paragon/fonts";
@import "@edx/brand/paragon/variables";
@import "@edx/paragon/scss/core/core";
@import "@edx/brand/paragon/overrides";
@import "@openedx/paragon/scss/core/core";
@import "@edx/brand/paragon/overrides";
2 changes: 1 addition & 1 deletion 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');

module.exports = createConfig('jest', {
setupFilesAfterEnv: [
Expand Down
3,952 changes: 1,985 additions & 1,967 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"devDependencies": {
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/browserslist-config": "1.2.0",
"@edx/frontend-build": "13.0.14",
"@edx/paragon": "21.5.6",
"@openedx/frontend-build": "^13.0.19",
"@openedx/paragon": "^21.11.3",
"@testing-library/jest-dom": "6.1.6",
"@testing-library/react": "12.1.5",
"@testing-library/react-hooks": "^8.0.1",
Expand Down Expand Up @@ -75,7 +75,7 @@
},
"peerDependencies": {
"@edx/frontend-build": ">= 8.1.0 || ^12.9.0-alpha.1",
"@edx/paragon": ">= 10.0.0 < 22.0.0",
"@openedx/paragon": ">= 10.0.0 < 21.0.0",
"prop-types": "^15.7.2",
"react": "^16.9.0 || ^17.0.0",
"react-dom": "^16.9.0 || ^17.0.0",
Expand Down
3 changes: 2 additions & 1 deletion src/react/ErrorPage.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
// eslint-disable-next-line import/no-extraneous-dependencies
import {
Button, Container, Row, Col,
} from '@edx/paragon';
} from '@openedx/paragon';

import { useAppEvent } from './hooks';
import {
Expand Down
2 changes: 1 addition & 1 deletion webpack.dev.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const path = require('path');
const { createConfig } = require('@edx/frontend-build');
const { createConfig } = require('@openedx/frontend-build');

module.exports = createConfig('webpack-dev', {
entry: path.resolve(__dirname, 'example'),
Expand Down
Loading