(#468) use npm packages to replace bower dependencies

LouisBarranqueiro · Mar 19, 2018 · 6f64f58 · 6f64f58
1 parent bf84949
commit 6f64f58
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 73 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/.eslintignore b/.eslintignore
@@ -1,4 +1,3 @@
 node_modules/
-source/_bower_components/
 source/assets/
-source/_js/smartresize.js
+source/_js/smartresize.js
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 .sass-cache
 assets
 node_modules
-_bower_components
diff --git a/bower.json b/bower.json
diff --git a/package.json b/package.json
@@ -4,7 +4,6 @@
   "description": "A gorgeous responsive theme for Hexo blog framework",
   "main": "Gruntfile.js",
   "scripts": {
-    "postinstall": "./node_modules/bower/bin/bower install",
     "start": "npm run grunt -- default",
     "build": "npm run prod",
     "prod": "npm run grunt -- buildProd",
@@ -30,14 +29,13 @@
   },
   "homepage": "https://github.com/LouisBarranqueiro/hexo-theme-tranquilpeak",
   "devDependencies": {
-    "bower": "1.8.2",
     "eslint": "4.18.2",
     "eslint-config-google": "0.9.1",
     "grunt": "1.0.2",
-    "grunt-bower": "0.21.4",
     "grunt-cli": "1.2.0",
     "grunt-contrib-clean": "1.1.0",
     "grunt-contrib-concat": "1.0.1",
+    "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-cssmin": "2.2.1",
     "grunt-contrib-uglify": "3.3.0",
     "grunt-contrib-watch": "1.0.0",
@@ -51,7 +49,10 @@
     "rand-token": "0.4.0"
   },
   "dependencies": {
+    "@fancyapps/fancybox": "3.2.5",
+    "font-awesome": "4.7.0",
     "hexo-util": "0.6.3",
+    "jquery": "3.3.1",
     "jsdom": "11.6.2",
     "strip-indent": "2.0.0"
   },

diff --git a/tasks/config/bower.js b/tasks/config/bower.js
diff --git a/tasks/config/copy.js b/tasks/config/copy.js
@@ -0,0 +1,64 @@
+var jsDestFolder = './source/assets/js/';
+var cssDestFolder = './source/assets/css/';
+var fontsDestFolder = './source/assets/fonts/';
+
+var fancyboxPath = './node_modules/@fancyapps/fancybox';
+var fontAwesomePath = './node_modules/font-awesome';
+var jqueryPath = './node_modules/jquery';
+
+module.exports = function(grunt) {
+    grunt.config.set('copy', {
+        // Copy all needed files by types
+        dev: {
+            files: [
+                // fancybox
+                {
+                    src: fancyboxPath + '/dist/jquery.fancybox.css',
+                    dest: cssDestFolder,
+                    flatten: true,
+                    expand: true
+                },
+                {
+                    src: fancyboxPath + '/dist/jquery.fancybox.js',
+                    dest: jsDestFolder,
+                    flatten: true,
+                    expand: true
+                },
+                {
+                    src: fancyboxPath + '/src/js/thumbs.js',
+                    dest: jsDestFolder,
+                    flatten: true,
+                    expand: true
+                },
+                {
+                    src: fancyboxPath + '/src/css/thumbs.css',
+                    dest: cssDestFolder,
+                    flatten: true,
+                    expand: true
+                },
+                // font-awesome
+                {
+                    src: fontAwesomePath + '/css/font-awesome.css',
+                    dest: cssDestFolder,
+                    flatten: true,
+                    expand: true
+                },
+                {
+                    src: fontAwesomePath + '/fonts/*',
+                    dest: fontsDestFolder,
+                    flatten: true,
+                    expand: true
+                },
+                // jquery
+                {
+                    src: jqueryPath + '/dist/jquery.js',
+                    dest: jsDestFolder,
+                    flatten: true,
+                    expand: true
+                }
+            ]
+        }
+    });
+
+    grunt.loadNpmTasks('grunt-contrib-copy');
+};
diff --git a/tasks/register/build.js b/tasks/register/build.js
@@ -2,7 +2,7 @@ module.exports = function(grunt) {
   // Build (environment : development)
   grunt.registerTask('build', [
     'clean:build',
-    'bower:dev',
+    'copy:dev',
     'syncAssets',
     'linkAssets',
     'replace:cssFancybox',

diff --git a/tasks/register/buildProd.js b/tasks/register/buildProd.js
@@ -2,7 +2,7 @@ module.exports = function(grunt) {
   // Build (environment : production)
   grunt.registerTask('buildProd', [
     'clean:build',
-    'bower:dev',
+    'copy:dev',
     'syncAssets',
     'replace:cssFancybox',
     'replace:cssTranquilpeak',