Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dev in sfe container & prod use /dist of sfe

Browse Source
This commit is contained in:
Tyler Hallada
2018-02-05 19:13:20 -05:00
parent 15a70f24e4
commit 73cffad5ce
9 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/common.py
View File

@@ -1363,6 +1363,8 @@ XBLOCK_SETTINGS = {
}
}
STUDIO_FRONTEND_CONTAINER_URL = None
################################ Settings for Credit Course Requirements ################################
# Initial delay used for retrying tasks.
# Additional retries use longer delays.

17
cms/templates/asset_index.html
View File

@@ -13,11 +13,18 @@
<%namespace name='static' file='static_content.html'/>
<%block name="header_extras">
% for template_name in ["asset"]:
<script type="text/template" id="${template_name}-tpl">
<%static:include path="js/${template_name}.underscore" />
</script>
% endfor
% if waffle_flag_enabled:
% if not settings.STUDIO_FRONTEND_CONTAINER_URL:
<link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/vendor.min.css')}" />
<link rel="stylesheet" type="text/css" href="${static.url('common/css/vendor/assets.min.css')}" />
% endif
% else:
% for template_name in ["asset"]:
<script type="text/template" id="${template_name}-tpl">
<%static:include path="js/${template_name}.underscore" />
</script>
% endfor
% endif
</%block>
% if not waffle_flag_enabled:

8
common/djangoapps/pipeline_mako/templates/static_content.html
View File

@@ -106,7 +106,13 @@ source, template_path = Loader(engine).load_template_source(path)
var studioContext = ${ body | n, decode.utf8};
</script>
<div id="root"></div>
${HTML(render_bundle(page))}
% if settings.STUDIO_FRONTEND_CONTAINER_URL:
<script type="text/javascript" src="${settings.STUDIO_FRONTEND_CONTAINER_URL}/assets.js"></script>
% else:
<script type="text/javascript" src="${url('common/js/vendor/manifest.min.js')}"></script>
<script type="text/javascript" src="${url('common/js/vendor/vendor.min.js')}"></script>
<script type="text/javascript" src="${url('common/js/vendor/assets.min.js')}"></script>
% endif
</%def>
<%def name="webpack(entry, extension=None, config='DEFAULT', attrs='')">

14
package-lock.json generated
View File

@@ -62,9 +62,9 @@
}
},
"@edx/studio-frontend": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/@edx/studio-frontend/-/studio-frontend-0.9.0.tgz",
"integrity": "sha512-fL6JoWQ/taysnFDqMnyJIUuqNTF1nPNojMIJsVyUdMFFhuo1fU5LjS9pOHsF1Zu2uCXoURrGPkCf1Yw+gzQYDA==",
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@edx/studio-frontend/-/studio-frontend-1.0.2.tgz",
"integrity": "sha512-GAZtUTxdd8w1/bpbIx7fYoa2HDtrrI6b85vTA21qWf30NaWLFMFRAOzFWwAAfjKV5UPJSsFhxZnZjB3S3tzPYQ==",
"requires": {
"@edx/edx-bootstrap": "0.4.3",
"@edx/paragon": "2.0.1",
@@ -8291,7 +8291,7 @@
"lodash": "4.17.4",
"lodash-es": "4.17.4",
"loose-envify": "1.3.1",
"symbol-observable": "1.1.0"
"symbol-observable": "1.2.0"
}
},
"redux-devtools-extension": {
@@ -9987,9 +9987,9 @@
}
},
"symbol-observable": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.1.0.tgz",
"integrity": "sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw=="
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
},
"table": {
"version": "4.0.2",

2
package.json
View File

@@ -4,7 +4,7 @@
"dependencies": {
"@edx/edx-bootstrap": "0.4.3",
"@edx/paragon": "1.7.1",
"@edx/studio-frontend": "0.9.0",
"@edx/studio-frontend": "1.0.2",
"babel-core": "6.26.0",
"babel-loader": "6.4.1",
"babel-plugin-transform-class-properties": "6.24.1",

14
pavelib/assets.py
View File

@@ -64,6 +64,20 @@ NPM_INSTALLED_LIBRARIES = [
'requirejs/require.js',
'underscore.string/dist/underscore.string.js',
'underscore/underscore.js',
'@edx/studio-frontend/dist/manifest.min.js',
'@edx/studio-frontend/dist/manifest.min.js.map',
'@edx/studio-frontend/dist/vendor.min.js',
'@edx/studio-frontend/dist/vendor.min.js.map',
'@edx/studio-frontend/dist/vendor.min.css',
'@edx/studio-frontend/dist/vendor.min.css.map',
'@edx/studio-frontend/dist/assets.min.js',
'@edx/studio-frontend/dist/assets.min.js.map',
'@edx/studio-frontend/dist/assets.min.css',
'@edx/studio-frontend/dist/assets.min.css.map',
'@edx/studio-frontend/dist/accessibilityPolicy.min.js',
'@edx/studio-frontend/dist/accessibilityPolicy.min.js.map',
'@edx/studio-frontend/dist/accessibilityPolicy.min.css',
'@edx/studio-frontend/dist/accessibilityPolicy.min.css.map',
'which-country/index.js'
]

3
webpack.common.config.js
View File

@@ -22,10 +22,8 @@ module.exports = {
entry: {
// Studio
AssetsPage: './node_modules/@edx/studio-frontend/src/index.jsx',
Import: './cms/static/js/features/import/factories/import.js',
CourseOrLibraryListing: './cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx',
AccessibilityPage: './node_modules/@edx/studio-frontend/src/accessibilityIndex.jsx',
'js/pages/login': './cms/static/js/pages/login.js',
// LMS
@@ -127,7 +125,6 @@ module.exports = {
{
test: /\.(js|jsx)$/,
include: [
/studio-frontend/,
/paragon/
],
use: 'babel-loader'

1
webpack.dev.config.js
View File

@@ -26,7 +26,6 @@ module.exports = Merge.smart(commonConfig, {
{
test: /(.scss|.css)$/,
include: [
/studio-frontend/,
/paragon/,
/font-awesome/
],

2
webpack.prod.config.js
View File

@@ -19,7 +19,6 @@ module.exports = Merge.smart(commonConfig, {
},
devtool: false,
plugins: [
new ExtractTextPlugin('node_modules/@edx/studio-frontend/dist/studio-frontend.min.css'),
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('production')
}),
@@ -33,7 +32,6 @@ module.exports = Merge.smart(commonConfig, {
{
test: /(.scss|.css)$/,
include: [
/studio-frontend/,
/paragon/,
/font-awesome/
],