Skip to content

Commit

Permalink
Merge pull request #1 from davidjoy/djoy/merge-paragon-webpack-plugin
Browse files Browse the repository at this point in the history
fix: roughly turning files into TypeScript
  • Loading branch information
davidjoy authored Sep 13, 2024
2 parents ac489bb + 0d75e3a commit bd3afff
Show file tree
Hide file tree
Showing 20 changed files with 300 additions and 641 deletions.
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,14 @@ Then work through the conflicts and use a merge commit to add the history into t

Then move the files out of the way (move src to some other sub-dir, mostly) to make room for the next repo.

### Latest repository merges

- frontend-component-header - Up to date as of 9/12/2024
- frontend-component-footer - Up to date as of 9/12/2024
- frontend-platform
- frontend-build - Up to date as of 9/12/2024
- frontend-plugin-framework

# Other notable changes

- Cease using `AUTHN_MINIMAL_HEADER`, replace it with an actual minimal header.
Expand Down
3 changes: 0 additions & 3 deletions lib/plugins/paragon-webpack-plugin/index.js

This file was deleted.

9 changes: 0 additions & 9 deletions lib/plugins/paragon-webpack-plugin/utils/index.js

This file was deleted.

8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
"@module-federation/enhanced": "^0.4.0",
"@module-federation/runtime": "^0.2.6",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",

"@types/gradient-string": "^1.1.6",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
Expand Down Expand Up @@ -106,9 +105,9 @@
"lodash.merge": "^4.6.2",
"lodash.snakecase": "^4.1.1",
"mini-css-extract-plugin": "1.6.2",
"parse5": "7.1.2",
"parse5": "7.1.2",
"postcss": "8.4.40",
"postcss-custom-media": "10.0.8",
"postcss-custom-media": "10.0.8",
"postcss-loader": "7.3.4",
"postcss-rtlcss": "5.1.2",
"prop-types": "^15.8.1",
Expand All @@ -133,7 +132,7 @@
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1",
"webpack-merge": "^5.10.0",
"webpack-remove-empty-scripts": "1.0.4"
"webpack-remove-empty-scripts": "1.0.4"
},
"devDependencies": {
"@testing-library/dom": "^8.20.1",
Expand All @@ -155,7 +154,7 @@
"react-test-renderer": "^17.0.2"
},
"peerDependencies": {
"@openedx/paragon": "^22.6.1",
"@openedx/paragon": "^22.8.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-redux": "^8.1.3",
Expand Down
Loading

0 comments on commit bd3afff

Please sign in to comment.