Skip to content

fix(dev): inherit local webpack.dev.config.js #74

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.

Sign up for GitHub

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

Merged
arbrandes merged 1 commit into from
Nov 7, 2022
Merged

fix(dev): inherit local webpack.dev.config.js #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 tutormfe/patches/local-docker-compose-dev-services
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
stdin_open: true
tty: true
volumes:
- ../plugins/mfe/apps/mfe/webpack.dev.config.js:/openedx/app/webpack.dev.config.js:ro
- ../plugins/mfe/apps/mfe/webpack.dev-tutor.config.js:/openedx/app/webpack.dev-tutor.config.js:ro
env_file:
- ../plugins/mfe/build/mfe/env/production
- ../plugins/mfe/build/mfe/env/development
Expand Down
7 changes: 6 additions & 1 deletion ...plates/mfe/apps/mfe/webpack.dev.config.js → .../mfe/apps/mfe/webpack.dev-tutor.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
const { merge } = require('webpack-merge');
const fs = require('fs');

const baseDevConfig = require('@edx/frontend-build/config/webpack.dev.config.js');
const baseDevConfig = (
fs.existsSync('./webpack.dev.config.js')
? require('./webpack.dev.config.js')
: require('@edx/frontend-build/config/webpack.dev.config.js')
);

module.exports = merge(baseDevConfig, {
// This configuration needs to be defined here, because CLI
Expand Down
2 changes: 1 addition & 1 deletion tutormfe/templates/mfe/build/mfe/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ COPY --from={{ app["name"] }}-src /openedx/app /openedx/app
COPY --from={{ app["name"] }}-i18n /openedx/app/src/i18n/messages /openedx/app/src/i18n/messages
ENV PUBLIC_PATH='/{{ app["name"] }}/'
EXPOSE {{ app['port'] }}
CMD ["npm", "run", "start"]
CMD ["npm", "run", "start", "---", "--config", "./webpack.dev-tutor.config.js"]
Copy link
Collaborator

@arbrandes arbrandes Nov 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice find!


{% endfor %}

Expand Down