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.

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

Fix part of #6732: Migrate visualizations to webpack #6885

Merged
merged 9 commits into from
Jun 12, 2019
Merged

Fix part of #6732: Migrate visualizations to webpack #6885

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fa0a9cc
migrate visualizations to webpack
vojtechjelinek Jun 9, 2019
44763fd
fix linting
vojtechjelinek Jun 9, 2019
f21addf
fix linting
vojtechjelinek Jun 9, 2019
4edb9fa
fix linting
vojtechjelinek Jun 9, 2019
ac13784
Merge branch 'develop' of https://github.com/oppia/oppia into webpack…
vojtechjelinek Jun 10, 2019
0403af0
test coverage
vojtechjelinek Jun 10, 2019
17c826c
fix tests
vojtechjelinek Jun 10, 2019
e3c6381
Merge branch 'develop' of https://github.com/oppia/oppia into webpack…
vojtechjelinek Jun 11, 2019
581afa9
Merge branch 'develop' of https://github.com/oppia/oppia into webpack…
vojtechjelinek Jun 11, 2019
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
Prev Previous commit
Next Next commit
Merge branch 'develop' of https://github.com/oppia/oppia into webpack… 
…-extensions-visualizations
  • Loading branch information
@vojtechjelinek
vojtechjelinek committed Jun 10, 2019
commit ac13784f26beda886a553590ff393813c37bf6c8
1 change: 0 additions & 1 deletion tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"extensions/classifiers",
"extensions/interactions",
"extensions/objects",
"rich_text_components",
"extensions/value_generators",
"typings"
]
Expand Down
2 changes: 1 addition & 1 deletion webpack.dev.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {
resolve: {
modules: [
path.resolve(__dirname, 'core/templates/dev/head'),
path.resolve(__dirname, 'extensions'),
path.resolve(__dirname, 'extensions')
],
},
entry: commonWebpackConfig.entries,
Expand Down
2 changes: 1 addition & 1 deletion webpack.prod.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {
resolve: {
modules: [
path.resolve(__dirname, 'core/templates/dev/head'),
path.resolve(__dirname, 'extensions'),
path.resolve(__dirname, 'extensions')
],
},
entry: commonWebpackConfig.entries,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.