Fix import jquery e angular in index.html

consiglionazionaledellericerche · Apr 16, 2019 · c21c611 · c21c611
1 parent 5e2f043
commit c21c611
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -47,10 +47,14 @@
     "angular-mocks": "1.5.8"
   },
   "overrides": {
+    "jquery": {
+      "ignore": true
+    },
     "angular": {
       "dependencies": {
         "jquery": "3.1.0"
-      }
+      },
+      "ignore": true
     },
     "angular-cache-buster": {
       "dependencies": {

diff --git a/gulp/inject.js b/gulp/inject.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var gulp = require('gulp'),
+    debug = require('gulp-debug'),
     plumber = require('gulp-plumber'),
     inject = require('gulp-inject'),
     es = require('event-stream'),
@@ -21,7 +22,9 @@ module.exports = {
 
 function app() {
     return gulp.src(config.app + 'index.html')
+        .pipe(plumber({errorHandler: handleErrors}))
         .pipe(inject(gulp.src(config.app + 'app/**/*.js')
+            .pipe(debug())
             .pipe(naturalSort())
             .pipe(angularFilesort()), {relative: true}))
         .pipe(gulp.dest(config.app));
@@ -30,9 +33,10 @@ function app() {
 function vendor() {
     var stream = gulp.src(config.app + 'index.html')
         .pipe(plumber({errorHandler: handleErrors}))
-        .pipe(inject(gulp.src(bowerFiles(), {read: false}), {
-            name: 'bower',
-            relative: true
+        .pipe(inject(gulp.src(bowerFiles(), {read: false})
+                    .pipe(debug()), {
+                        name: 'bower',
+                        relative: true
         }))
         .pipe(gulp.dest(config.app));