Tweaking configuration so that we're now properly controlling the baseUrl to load compiled or not compiled files entirely. The flag is still manually set

Author: weaverryan

README.md

@@ -36,4 +36,6 @@ Optimization
         read - we're basically abusing it
 - ./node_modules/.bin/r.js -o app/config/build.js
 - temporarily added a path to js-built inside Twig
-- added more items to common.js beyond just jQuery
+- added more items to common.js beyond just jQuery
+- optimized a single page
+    PPP common.js is still pointing to the "js" directory, not js-built!

app/config/build.js

@@ -1,8 +1,9 @@
 ({
     mainConfigFile: '../../web/assets/js/common.js',
-    appDir: '../../web/assets/js',
-    baseUrl: './',
-    dir: '../../web/assets/js-built',
+    appDir: '../../web/assets',
+    baseUrl: './js',
+    dir: '../../web/assets-built',
+    optimizeCss: "none",
     modules: [
         //First set up the common build layer.
         {

src/Yoda/EventBundle/Resources/views/_requirejs.html.twig

@@ -1,9 +1,15 @@
-<script src="{{ asset('assets/vendor/requirejs/require.js') }}"></script>
+{% set useCompiled = true %}
+{% set assetsPath = 'assets'~(useCompiled ? '-built') %}
+
+<script src="{{ asset(assetsPath~'/vendor/requirejs/require.js') }}"></script>
 <script>
-    require(['{{ asset('assets/js/common.js') }}'], function (common) {
-        //js/common sets the baseUrl to be js/ so
-        //can just ask for 'app/main1' here instead
-        //of 'js/app/main1'
+
+    // let the baseUrl be dynamic so we can use the compiled assets when needed
+    requirejs.config({
+        baseUrl: '{{ assetsPath }}/js'
+    });
+
+    require(['common'], function (common) {
         require(['{{ data_main }}']);
     });
-</script>
+</script>

web/assets/js/common.js

@@ -6,7 +6,6 @@
 //except for 'app' ones, which are in a sibling
 //directory.
 requirejs.config({
-    baseUrl: 'assets/js',
     paths: {
         app: 'app',
         domReady: '../vendor/requirejs-domready/domReady',