Dev in sfe container & prod use /dist of sfe

gsehub · Feb 15, 2018 · 73cffad · 73cffad
1 parent 15a70f2
commit 73cffad
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 20 deletions.
diff --git a/cms/envs/common.py b/cms/envs/common.py
@@ -1363,6 +1363,8 @@
     }
 }
 
+STUDIO_FRONTEND_CONTAINER_URL = None
+
 ################################ Settings for Credit Course Requirements ################################
 # Initial delay used for retrying tasks.
 # Additional retries use longer delays.

diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
@@ -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:

diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html
@@ -106,7 +106,13 @@
       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='')">

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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",

diff --git a/pavelib/assets.py b/pavelib/assets.py
@@ -64,6 +64,20 @@
     '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'
 ]
 

diff --git a/webpack.common.config.js b/webpack.common.config.js
@@ -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'

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

diff --git a/webpack.prod.config.js b/webpack.prod.config.js
@@ -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/
                 ],