Skip to content

Commit

Permalink
add a bundles test
Browse files Browse the repository at this point in the history
  • Loading branch information
xenogenesi committed Apr 29, 2016
1 parent b0a709c commit 6a2ab3b
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 6 deletions.
11 changes: 9 additions & 2 deletions Gruntfile.js
Expand Up @@ -15,12 +15,18 @@ module.exports = function( grunt ) {
baseUrl: 'app/',
paths: {
'jquery': '../lib/jquery/jquery-1.12.3',
'knockout': '../lib/knockout/knockout-3.4.0.debug',
'knockout': '../lib/knockout/knockout-3.4.0',
'text': '../lib/require/text',
'durandal': '../lib/durandal/js',
'plugins': '../lib/durandal/js/plugins',
'transitions': '../lib/durandal/js/transitions',
'bootstrap': '../lib/bootstrap/js/bootstrap',
'mymodules': 'empty:',
'mymodule1': 'empty:',
'mymodule2': 'empty:'
},
bundles: {
'mymodules': ['mymodule1', 'mymodule2']
}
};

Expand Down Expand Up @@ -53,7 +59,7 @@ module.exports = function( grunt ) {
dest: 'build/'
},
index: {
src: 'index.html',
src: ['index.html', 'index2.html'],
dest: 'build/'
},
css: {
Expand Down Expand Up @@ -159,5 +165,6 @@ module.exports = function( grunt ) {

grunt.registerTask('default', ['jshint', 'jasmine:dev', 'connect:dev:livereload', 'open:dev', 'watch:dev']);
grunt.registerTask('build', ['jshint', 'jasmine:dev', 'clean', 'copy', 'durandal:main', 'uglify', 'jasmine:build', 'connect:build', 'open:build', 'watch:build']);
grunt.registerTask('build-only', ['jshint', 'clean', 'copy', 'durandal:main', 'uglify']);

};
10 changes: 7 additions & 3 deletions app/main.js
Expand Up @@ -7,7 +7,11 @@
'transitions' : '../lib/durandal/js/transitions',
'knockout': '../lib/knockout/knockout-3.4.0',
'bootstrap': '../lib/bootstrap/js/bootstrap',
'jquery': '../lib/jquery/jquery-1.12.3'
'jquery': '../lib/jquery/jquery-1.12.3',
'mymodules': '../lib/test-bundle/test-bundle'
},
bundles: {
'mymodules': ['mymodule1', 'mymodule2']
},
shim: {
'bootstrap': {
Expand All @@ -18,9 +22,9 @@
});

define(['durandal/system', 'durandal/app', 'durandal/viewLocator', 'bootstrap'], function (system, app, viewLocator) {
//>>excludeStart("build", true);
// > > excludeStart("build", true);
system.debug(true);
//>>excludeEnd("build");
// > > excludeEnd("build");

app.title = 'Durandal Starter Kit';

Expand Down
3 changes: 2 additions & 1 deletion app/viewmodels/shell.js
@@ -1,4 +1,5 @@
define(['plugins/router', 'durandal/app'], function (router, app) {
define(['plugins/router', 'durandal/app', 'mymodule1', 'mymodule2'], function (router, app, mymodule1, mymodule2) {
console.log('modules test:', mymodule1.test, mymodule2.test);
return {
router: router,
search: function() {
Expand Down
44 changes: 44 additions & 0 deletions index2.html
@@ -0,0 +1,44 @@
<!DOCTYPE html>
<html>
<head>
<title>Durandal</title>

<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="format-detection" content="telephone=no"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<link rel="apple-touch-startup-image" href="lib/durandal/img/ios-startup-image-landscape.png" media="(orientation:landscape)" />
<link rel="apple-touch-startup-image" href="lib/durandal/img/ios-startup-image-portrait.png" media="(orientation:portrait)" />
<link rel="apple-touch-icon" href="lib/durandal/img/icon.png"/>

<link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css" />
<link rel="stylesheet" href="css/ie10mobile.css" />
<link rel="stylesheet" href="lib/durandal/css/durandal.css" />
<link rel="stylesheet" href="css/starterkit.css" />

<script type="text/javascript">
if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
var msViewportStyle = document.createElement("style");
var mq = "@@-ms-viewport{width:auto!important}";
msViewportStyle.appendChild(document.createTextNode(mq));
document.getElementsByTagName("head")[0].appendChild(msViewportStyle);
}
</script>
</head>
<body>
<div id="applicationHost">
<div class="splash">
<div class="message">
Durandal Starter Kit
</div>
<i class="fa fa-spinner fa-spin"></i>
</div>
</div>

<script src="app/main-built.js"></script>
</body>
</html>
15 changes: 15 additions & 0 deletions lib/test-bundle/test-bundle.js
@@ -0,0 +1,15 @@
console.log("defining modules...");

define('mymodule1', ['jquery'], function($) {
console.log('within mymodule1', $.fn.jquery);
return {
test: 'module1'
};
});

define('mymodule2', ['jquery'], function($) {
console.log('within mymodule2', $.fn.jquery);
return {
test: 'module2'
};
});

0 comments on commit 6a2ab3b

Please sign in to comment.