Merge branch 'feature/23-simplify-requirejs-config'

* feature/23-simplify-requirejs-config:
  (#23) project: simplified the RequireJS configuration

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Last Changes
 
+- [#23](https://github.com/LaxarJS/shop-demo/issues/23): project: simplified the RequireJS configuration
 - [#21](https://github.com/LaxarJS/shop-demo/issues/21): use laxar-testing instead of laxar/laxar_testing
     + NEW FEATURE: see ticket for details
 - [#22](https://github.com/LaxarJS/shop-demo/issues/22): project: switched to flow-based grunt tasks

application/application.js

@@ -9,18 +9,8 @@ window.laxar = ( function() {
       name: 'LaxarJS ShopDemo',
       description: 'A DemoApp to learn how LaxarJS works.',
       theme: 'cube',
-      useMergedCss: mode === 'RELEASE',
-      useEmbeddedFileListings: mode === 'RELEASE',
-      fileListings: {
-         'application': 'var/listing/application_resources.json',
-         'bower_components': 'var/listing/bower_components_resources.json',
-         'includes': 'var/listing/includes_resources.json'
-      },
-      i18n: {
-         locales: {
-            'default': 'en'
-         }
-      }
+      useMergedCss: mode === 'PRODUCTION',
+      useEmbeddedFileListings: mode === 'PRODUCTION'
    };
 
 } )();

require_config.js

@@ -10,10 +10,13 @@ var require = {
       'angular-mocks': 'angular-mocks/angular-mocks',
       'angular-route': 'angular-route/angular-route',
       'angular-sanitize': 'angular-sanitize/angular-sanitize',
-      jjv: 'jjv/lib/jjv',
-      jjve: 'jjve/jjve',
 
-      // LaxarJS Core Testing:
+      'laxar': 'laxar/dist/laxar.with-deps',
+      'laxar-uikit': 'laxar-uikit/dist/laxar-uikit',
+      'laxar-path-default-theme': 'laxar-uikit/dist/themes/default.theme',
+
+      // LaxarJS Testing:
+      'laxar-testing': 'laxar-testing/dist/laxar-testing',
       jasmine2: 'jasmine2/lib/jasmine-core/jasmine',
       'promise-polyfill': 'promise-polyfill/Promise',
 
@@ -23,26 +26,13 @@ var require = {
       'laxar-path-pages': '../application/pages',
       'laxar-path-widgets': '../includes/widgets',
       'laxar-path-themes': '../includes/themes',
-      'laxar-path-flow': '../application/flow/flow.json',
-
-      'laxar-application-dependencies': '../var/static/laxar_application_dependencies',
-
-      'laxar': 'laxar/dist/laxar',
-      'laxar-testing': 'laxar-testing/dist/laxar-testing',
-      'laxar-uikit': 'laxar-uikit/dist/laxar-uikit',
-      'laxar-uikit/controls': 'laxar-uikit/dist/controls',
-      'laxar-path-default-theme': 'laxar-uikit/dist/themes/default.theme'
+      'laxar-path-flow': '../application/flow/flow.json'
    },
    packages: [
       {
          name: 'laxar-application',
          location: '..',
          main: 'init'
-      },
-      {
-         name: 'moment',
-         location: 'moment',
-         main: 'moment'
       }
    ],
    shim: {