-
Notifications
You must be signed in to change notification settings - Fork 7
[SE-3381] Allows adding new tinymce plugins through platform configuration #295
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
Changes from 6 commits
61929d0
60a512f
193bf47
c0cf6ce
00c367d
b8e450b
632045a
d24734f
5a15bad
78b2ce5
53b1186
29df5dd
810c565
cb5d965
d7811b6
8b141ef
b596514
63b4d77
49942e2
ac27b1e
4b89f6f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ | |
|
|
||
| import argparse | ||
| import glob | ||
| import json | ||
| import os | ||
| import traceback | ||
| from datetime import datetime | ||
|
|
@@ -767,10 +768,23 @@ def webpack(options): | |
| static_root_lms = Env.get_django_setting("STATIC_ROOT", "lms", settings=settings) | ||
| static_root_cms = Env.get_django_setting("STATIC_ROOT", "cms", settings=settings) | ||
| config_path = Env.get_django_setting("WEBPACK_CONFIG_PATH", "lms", settings=settings) | ||
| environment = u'NODE_ENV={node_env} STATIC_ROOT_LMS={static_root_lms} STATIC_ROOT_CMS={static_root_cms}'.format( | ||
| additional_node_env_vars_sorted_json = json.dumps( | ||
| json.loads( | ||
| Env.get_django_setting( # pylint: disable=no-member | ||
| "ADDITIONAL_NODE_ENV_VARS", | ||
| "cms", | ||
| settings=settings | ||
| ).replace("'", '"') | ||
| ), | ||
| sort_keys=True, | ||
| ) | ||
| additional_node_env_vars = json.dumps(additional_node_env_vars_sorted_json) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Check this commit please. So in that commit, what I did was take the But we need to run So we dump twice in order to make sure that the string is escaped when it is added to the command. |
||
| environment = u'NODE_ENV={node_env} STATIC_ROOT_LMS={static_root_lms} STATIC_ROOT_CMS={static_root_cms} \ | ||
| ADDITIONAL_NODE_ENV_VARS={additional_node_env_vars}'.format( | ||
| node_env="development" if config_path == 'webpack.dev.config.js' else "production", | ||
| static_root_lms=static_root_lms, | ||
| static_root_cms=static_root_cms | ||
| static_root_cms=static_root_cms, | ||
| additional_node_env_vars=additional_node_env_vars | ||
| ) | ||
| sh( | ||
| cmd( | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.