diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index db7db5ca95..0000000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "www/bower_components" -} diff --git a/Makefile b/Makefile index 52f1317967..7360312f7d 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,6 @@ install_assets: clean_assets: rm -rf ./node_modules rm -rf ./www/assets - rm -rf ./www/bower_components mkdir ./node_modules touch ./node_modules/.gitkeep diff --git a/bower.json b/bower.json deleted file mode 100644 index 1cb1f99eb7..0000000000 --- a/bower.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "Phraseanet", - "version": "4.0.0", - "dependencies": { - "alchemy-embed-medias": "~0.3.4" - }, - "resolutions": { - "jquery": "~1.11.3" - }, - "devDependencies": { - "qunit": "v1.11.0" - } -} diff --git a/package.json b/package.json index ab962dd1bc..2b7afa81c9 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,6 @@ "name": "phraseanet", "version": "4.0.0", "devDependencies": { - "bower": "^1.6.5", - "bower-files": "^3.11.3", "browser-sync": "^2.10.0", "chai": "^1.6.1", "del": "^2.1.0", @@ -65,9 +63,9 @@ "jquery-ui-dist": "^1.12.1", "jquery.cookie": "^1.4.1", "jquery.fancytree": "^2.27.0", - "modernizr": "^3.0.0", "normalize-css": "^2.1.0", "npm": "^5.6.0", + "npm-modernizr": "^2.8.3", "phraseanet-production-client": "^0.32.3", "requirejs": "^2.1.22", "tinymce": "^4.0.28", diff --git a/resources/gulp/components/vendors/alchemy-embed.js b/resources/gulp/components/vendors/alchemy-embed.js index 5dacc1bfd7..f3dd6cc217 100644 --- a/resources/gulp/components/vendors/alchemy-embed.js +++ b/resources/gulp/components/vendors/alchemy-embed.js @@ -15,7 +15,7 @@ gulp.task('copy-alchemy-embed', function(){ return gulp.src('vendor/alchemy/embed-bundle/dist/**/*') .pipe(gulp.dest( config.paths.build + 'vendors/alchemy-embed-medias')); } - return gulp.src(config.paths.vendors + 'alchemy-embed-medias/dist/**/*') + return gulp.src(config.paths.nodes + 'alchemy-embed-medias/dist/**/*') .pipe(gulp.dest( config.paths.build + 'vendors/alchemy-embed-medias')); }); gulp.task('watch-alchemy-embed-js', function() { diff --git a/resources/gulp/components/vendors/modernizr.js b/resources/gulp/components/vendors/modernizr.js index 803a953bd6..1136e2d61e 100644 --- a/resources/gulp/components/vendors/modernizr.js +++ b/resources/gulp/components/vendors/modernizr.js @@ -4,6 +4,6 @@ var utils = require('../../utils.js'); gulp.task('build-modernizr', [], function(){ return utils.buildJsGroup([ - config.paths.vendors + 'modernizr/modernizr.js' + config.paths.nodes + 'npm-modernizr/modernizr.js' ], 'modernizr', 'vendors/modernizr'); }); \ No newline at end of file diff --git a/resources/gulp/install.js b/resources/gulp/install.js index 164a85c49c..bbde23b4ab 100644 --- a/resources/gulp/install.js +++ b/resources/gulp/install.js @@ -17,12 +17,7 @@ gulp.task('clean:assetsPath', function(done){ return del([config.paths.build + '/**/*'], done); }); -gulp.task('install-bower-dependencies', function(){ - return gulp.src(['./bower.json']) - .pipe(install()); -}); - -gulp.task('build-dependencies', ['install-bower-dependencies'], function(){ +gulp.task('build-dependencies', function () { gulp.start('build'); gulp.start('build-css'); });