Commit 76a3a4798b778c6bc9fea6fcbf65b26da10a953c
1 parent
72ca2a4c
Exists in
master
and in
30 other branches
fixed the build task 'npm run build'
Showing
3 changed files
with
6 additions
and
8 deletions
Show diff stats
dist/index.html
| 1 | -<!doctype html><html ng-app="noosferoApp"><head><base href="/"><meta charset="utf-8"><title>angular</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/designs/themes/angular-theme/dist/styles/vendor-ebefc2c7fc.css"><link rel="stylesheet" href="/designs/themes/angular-theme/dist/styles/app-bfd148a542.css"></head><body><!--[if lt IE 10]> | 1 | +<!doctype html><html ng-app="noosferoApp"><head><base href="/"><meta charset="utf-8"><title>angular</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/designs/themes/angular-theme/dist/styles/vendor-ebefc2c7fc.css"><link rel="stylesheet" href="/designs/themes/angular-theme/dist/styles/app-df3fab49fa.css"></head><body><!--[if lt IE 10]> |
| 2 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> | 2 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> |
| 3 | - <![endif]--><div ui-view=""></div><script src="/designs/themes/angular-theme/dist/scripts/vendor-9a3c78f00a.js"></script><script src="/designs/themes/angular-theme/dist/scripts/app-8b422df734.js"></script></body></html> | ||
| 4 | \ No newline at end of file | 3 | \ No newline at end of file |
| 4 | + <![endif]--><div ui-view=""></div><script src="/designs/themes/angular-theme/dist/scripts/vendor-f83486386e.js"></script><script src="/designs/themes/angular-theme/dist/scripts/app-a25576689b.js"></script></body></html> | ||
| 5 | \ No newline at end of file | 5 | \ No newline at end of file |
gulp/build.js
| @@ -20,7 +20,7 @@ gulp.task('partials', function () { | @@ -20,7 +20,7 @@ gulp.task('partials', function () { | ||
| 20 | quotes: true | 20 | quotes: true |
| 21 | })) | 21 | })) |
| 22 | .pipe($.angularTemplatecache('templateCacheHtml.js', { | 22 | .pipe($.angularTemplatecache('templateCacheHtml.js', { |
| 23 | - module: 'angular', | 23 | + module: 'noosferoApp', |
| 24 | root: 'app' | 24 | root: 'app' |
| 25 | })) | 25 | })) |
| 26 | .pipe(gulp.dest(conf.paths.tmp + '/partials/')); | 26 | .pipe(gulp.dest(conf.paths.tmp + '/partials/')); |
| @@ -51,7 +51,8 @@ gulp.task('html', ['inject', 'partials'], function () { | @@ -51,7 +51,8 @@ gulp.task('html', ['inject', 'partials'], function () { | ||
| 51 | .pipe($.replace('bower_components/messageformat/', noosferoThemePrefix + 'locale/messageformat/')) | 51 | .pipe($.replace('bower_components/messageformat/', noosferoThemePrefix + 'locale/messageformat/')) |
| 52 | .pipe($.sourcemaps.init()) | 52 | .pipe($.sourcemaps.init()) |
| 53 | .pipe($.ngAnnotate()) | 53 | .pipe($.ngAnnotate()) |
| 54 | - .pipe($.uglify({ preserveComments: $.uglifySaveLicense })).on('error', conf.errorHandler('Uglify')) | 54 | + // TODO - check how to make uglify work with ngforward |
| 55 | + //.pipe($.uglify({ preserveComments: $.uglifySaveLicense })).on('error', conf.errorHandler('Uglify')) | ||
| 55 | .pipe($.sourcemaps.write('maps')) | 56 | .pipe($.sourcemaps.write('maps')) |
| 56 | .pipe(jsFilter.restore) | 57 | .pipe(jsFilter.restore) |
| 57 | .pipe(cssFilter) | 58 | .pipe(cssFilter) |
src/index.html
| @@ -36,10 +36,7 @@ | @@ -36,10 +36,7 @@ | ||
| 36 | <!-- build:js({.tmp/serve,.tmp/partials,src}) scripts/app.js --> | 36 | <!-- build:js({.tmp/serve,.tmp/partials,src}) scripts/app.js --> |
| 37 | <script src="commons.js"></script> | 37 | <script src="commons.js"></script> |
| 38 | <script src="vendor.bundle.js"></script> | 38 | <script src="vendor.bundle.js"></script> |
| 39 | - <script src="noosfero.js"></script> | ||
| 40 | - <!-- endinject --> | ||
| 41 | - | ||
| 42 | - | 39 | + <script src="noosfero.js"></script> |
| 43 | <!-- inject:partials --> | 40 | <!-- inject:partials --> |
| 44 | <!-- angular templates will be automatically converted in js and inserted here --> | 41 | <!-- angular templates will be automatically converted in js and inserted here --> |
| 45 | <!-- endinject --> | 42 | <!-- endinject --> |