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

sync: master to alpha #451

Merged
merged 61 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
a847fa9
fix(deps): update dependency @svgr/webpack to v8.1.0 (#443)
renovate[bot] Sep 25, 2023
0009871
chore(deps): update dependency @types/react to v17.0.65
renovate[bot] Sep 25, 2023
a3185e5
fix(deps): update dependency autoprefixer to v10.4.16
renovate[bot] Sep 25, 2023
437f763
fix(deps): update dependency postcss to v8.4.30
renovate[bot] Sep 25, 2023
aad2bfa
fix(deps): update dependency postcss-custom-media to v10.0.1
renovate[bot] Sep 25, 2023
1cfeff4
fix(deps): update dependency postcss-rtlcss to v4.0.8
renovate[bot] Sep 25, 2023
b4b57c8
fix(deps): update dependency sharp to v0.32.6
renovate[bot] Sep 26, 2023
982bbb7
fix(deps): update dependency webpack-bundle-analyzer to v4.9.1
renovate[bot] Sep 26, 2023
ac5d346
feat!: babel-plugin-react-intl to babel-plugin-formatjs migration (#313)
abdullahwaheed Sep 28, 2023
4ab5421
chore(deps): update react monorepo
renovate[bot] Sep 28, 2023
a89ed0f
refactor: add @openedx in renovate automate configuration (#461)
Mashal-m Oct 2, 2023
1ec7a93
fix: upgraded postcss to fix vulnerability (#465)
abdullahwaheed Oct 6, 2023
4510b22
chore(deps): update dependency @types/react to v17.0.68
renovate[bot] Oct 18, 2023
ff5c4bb
fix(deps): update dependency postcss-custom-media to v10.0.2
renovate[bot] Oct 18, 2023
05c4fba
build(deps): bump @babel/traverse from 7.22.20 to 7.23.2 (#468)
dependabot[bot] Oct 18, 2023
d5941ad
fix(deps): update formatjs monorepo
renovate[bot] Oct 18, 2023
5889cd5
chore(deps): update dependency @types/react to v17.0.69
renovate[bot] Oct 18, 2023
9c7ba96
refactor: updated README file to reflect template changes (#464)
Mashal-m Oct 24, 2023
3c4ed9a
fix: Exclude openedx scoped packages.
feanil Oct 30, 2023
918d049
Merge pull request #475 from openedx/feanil/exclude_openedx
Nov 1, 2023
337170b
fix(deps): update dependency webpack to v5.89.0 (#472)
renovate[bot] Nov 8, 2023
5b7aeff
fix(deps): update dependency sass to v1.69.5 (#446)
renovate[bot] Nov 16, 2023
0b50243
chore(deps): update react monorepo
renovate[bot] Nov 16, 2023
19abbec
fix(deps): update dependency postcss-rtlcss to v4.0.9
renovate[bot] Nov 16, 2023
cf5c12e
fix(deps): update formatjs monorepo
renovate[bot] Nov 16, 2023
0d131cd
fix(deps): update dependency webpack-bundle-analyzer to v4.10.1 (#479)
renovate[bot] Dec 6, 2023
11b5ac2
chore(deps): update actions/checkout action to v4 (#463)
renovate[bot] Dec 6, 2023
c34ab56
chore(deps): update react monorepo
renovate[bot] Dec 6, 2023
638ac46
fix(deps): update dependency postcss to v8.4.32
renovate[bot] Dec 6, 2023
a5f7377
fix(deps): update dependency sharp to v0.33.0 (#483)
renovate[bot] Dec 8, 2023
fb68ea1
chore(deps): update dependency typescript to v5.3.3 (#482)
renovate[bot] Dec 8, 2023
5ce301c
fix(deps): update dependency html-webpack-plugin to v5.5.4
renovate[bot] Dec 8, 2023
6cc1ef3
docs: Move from restructureText to Markdown
feanil Dec 14, 2023
6247de3
fix: Add a warning prior to the package move.
feanil Dec 14, 2023
ef95f32
Merge pull request #487 from openedx/feanil/pre-scope-move
Dec 15, 2023
c738672
fix: Correct some copy-pasta.
feanil Dec 15, 2023
676fc8f
Merge pull request #489 from openedx/feanil/fix_copy_pasta
Dec 15, 2023
ca40183
fix: Make updates to deploy to the openedx scope.
feanil Dec 14, 2023
d6868bc
Merge pull request #488 from openedx/feanil/scope-move
Dec 15, 2023
6b1211f
fix: Update some scripts and docs.
feanil Dec 15, 2023
7542996
Merge pull request #490 from openedx/feanil/docs_and_script_fixes
Dec 15, 2023
7303e90
chore(deps): update actions/setup-node action to v4 (#486)
renovate[bot] Dec 20, 2023
2534d2b
chore(deps): update dependency @types/react to v17.0.73
renovate[bot] Dec 20, 2023
99f41d2
fix(deps): update dependency cssnano to v6.0.2
renovate[bot] Dec 20, 2023
6a9ea62
fix(deps): update dependency sharp to v0.33.1
renovate[bot] Dec 20, 2023
c746034
fix: fixed jest config to ignore @opendedx namespaced packages (#495)
abdullahwaheed Dec 27, 2023
cb0f994
fix(deps): update dependency html-webpack-plugin to v5.6.0 (#494)
renovate[bot] Jan 8, 2024
c36c97d
fix(deps): update dependency webpack-merge to v5.10.0 (#485)
renovate[bot] Jan 8, 2024
d0dba48
chore(deps): update dependency @types/react to v17.0.74
renovate[bot] Jan 8, 2024
b1f52a3
fix(deps): update dependency cssnano to v6.0.3
renovate[bot] Jan 8, 2024
c66332a
fix(deps): update dependency postcss to v8.4.33
renovate[bot] Jan 8, 2024
50fb91c
fix(deps): update dependency postcss-loader to v7.3.4
renovate[bot] Jan 8, 2024
04871cb
fix(deps): update dependency sass to v1.69.7
renovate[bot] Jan 8, 2024
fd0aac6
fix(deps): update dependency sass-loader to v13.3.3
renovate[bot] Jan 8, 2024
571a89f
fix(deps): update dependency source-map-loader to v4.0.2
renovate[bot] Jan 8, 2024
0b7b0e5
build(deps): bump follow-redirects from 1.15.2 to 1.15.4 (#506)
dependabot[bot] Jan 11, 2024
0c40722
fix(deps): update dependency postcss-rtlcss to v5 (#504)
renovate[bot] Jan 11, 2024
3b0e8f8
fix(deps): update dependency style-loader to v3.3.4
renovate[bot] Jan 11, 2024
5651620
fix(deps): update dependency sharp to v0.33.2
renovate[bot] Jan 12, 2024
873f969
chore(deps): update dependency @types/react to v17.0.75
renovate[bot] Jan 15, 2024
35415fe
fix: reverted sharp to v0.32.6 to fix architcture dependent issues (#…
abdullahwaheed Feb 6, 2024
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 README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ documentation to learn what options are available. Example package.json::
{
"scripts": {
"build": "fedx-scripts webpack",
"i18n_extract": "BABEL_ENV=i18n fedx-scripts babel src --quiet > /dev/null",
"i18n_extract": "fedx-scripts formatjs extract",
"lint": "fedx-scripts eslint --ext .jsx,.js .",
"precommit": "npm run lint",
"snapshot": "fedx-scripts jest --updateSnapshot",
Expand Down
12 changes: 12 additions & 0 deletions bin/fedx-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@ switch (commandName) {
ensureConfigOption(presets.webpackDevServer);
require('webpack-dev-server/bin/webpack-dev-server');
break;
case 'formatjs': {
const commonArgs = [
'--format', 'node_modules/@edx/frontend-build/lib/formatter.js',
'--ignore', 'src/**/*.json',
'--out-file', './temp/babel-plugin-formatjs/Default.messages.json',
'--', 'src/**/*.js*',
];
process.argv = process.argv.concat(commonArgs);
ensureConfigOption(presets.formatjs);
require('@formatjs/cli/bin/formatjs');
break;
}
case 'serve':
require('../lib/scripts/serve');
break;
Expand Down
6 changes: 1 addition & 5 deletions config/babel-preserve-modules.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ module.exports = {
i18n: {
plugins: [
[
'react-intl',
{
messagesDir: './temp/babel-plugin-react-intl',
moduleSourceName: '@edx/frontend-platform/i18n',
},
'formatjs',
],
],
},
Expand Down
6 changes: 1 addition & 5 deletions config/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,7 @@ module.exports = {
i18n: {
plugins: [
[
'react-intl',
{
messagesDir: './temp/babel-plugin-react-intl',
moduleSourceName: '@edx/frontend-platform/i18n',
},
'formatjs',
],
],
},
Expand Down
10 changes: 10 additions & 0 deletions lib/formatter.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
exports.format = (messages) => {
const results = Object.entries(messages).map(([id, message]) => (
{
id,
defaultMessage: message.defaultMessage,
description: message.description,
}
));
return results;
};
7 changes: 7 additions & 0 deletions lib/presets.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ const babel = new ConfigPreset({
searchFilepaths,
});

const formatjs = new ConfigPreset({
defaultFilename: 'babel.config.js',
searchFilenames: ['.babelrc', '.babelrc.js', 'babel.config.js'],
searchFilepaths,
});

const babelPreserveModules = new ConfigPreset({
defaultFilename: 'babel-preserve-modules.config.js',
searchFilenames: ['.babelrc', '.babelrc.js', 'babel.config.js'],
Expand Down Expand Up @@ -52,6 +58,7 @@ const webpack = new ConfigPreset({

module.exports = {
babel,
formatjs,
babelPreserveModules,
'babel-preserve-modules': babelPreserveModules,
'babel-typescript': babelTypescript,
Expand Down
Loading
Loading