Skip to content

Commit 4dcbf98

Browse files
author
Callan Peter Milne
committed
(fix):ensure app module is loaded before other modules
1 parent c4d8c5a commit 4dcbf98

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

Vagrantfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ Vagrant.configure("2") do |config|
9494
npm install
9595
npm ln -s
9696
97-
echo "===== RUNNING BUILD ====="
98-
/usr/local/lib/node/bin/ds-build-app
99-
10097
echo "== STARTING DEV SERVER =="
10198
nohup /usr/local/lib/node/bin/ds-dev-server &
10299

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
"description": "Data Studio Angular App",
55
"main": "index.js",
66
"scripts": {
7-
"test": "./bin/unit"
7+
"test": "./bin/unit",
8+
"prestart": "./bin/build",
9+
"start": "./bin/start-dev-server"
810
},
911
"bin": {
1012
"ds-build-app": "./bin/build",

src/app/modules/app/appController.es

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
AppController.$inject = ['$scope'];
66
function AppController ( $scope) {
77

8-
this.test = 'var';
8+
this.test = 'Meow';
99

1010
};

src/ops/gulp/jscompile.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ module.exports = function (gulp) {
2626
gulp.task('jscompile', function () {
2727

2828
let paths = [
29+
'src/app/modules/app/module.es',
30+
'src/app/modules/app/**/*.es',
2931
'src/app/**/*/module.es',
3032
'src/app/**/*.es',
3133
];

0 commit comments

Comments
 (0)