From c87bcf1e3e1ca18dd0ebd133dcf790feb9bf5748 Mon Sep 17 00:00:00 2001 From: printempw Date: Fri, 30 Jun 2017 12:13:45 +0800 Subject: [PATCH] Deprecate bower and use yarn instead --- .bowerrc | 3 --- README-en.md | 9 ++++----- README.md | 3 +-- bower.json | 33 --------------------------------- gulpfile.js | 45 ++++++++++++++++++++++++--------------------- package.json | 13 +++++++++++++ yarn.lock | 44 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 86 insertions(+), 64 deletions(-) delete mode 100644 .bowerrc delete mode 100644 bower.json diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index c820a43b..00000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "resources/assets/src/bower_components" -} diff --git a/README-en.md b/README-en.md index 52a53f4e..deedb734 100644 --- a/README-en.md +++ b/README-en.md @@ -23,12 +23,12 @@ Features - Easy-to-use - Visual page for user/player/texture management - Detailed option pages -- Security - - User passwords will be well encrypted +- Security + - User passwords will be well encrypted - Email verification for registration (available as plugin) - Score system for preventing evil requests - Extensible - - Plenty of plugins available + - Plenty of plugins available - Integration with Authme/CrazyLogin/Discuz Requirements @@ -62,8 +62,7 @@ Clone the code from GitHub and install dependencies: ``` $ git clone https://github.com/printempw/blessing-skin-server.git $ composer install -$ npm install -$ bower install +$ yarn install ``` Build the things! diff --git a/README.md b/README.md index 31b6249a..815c8702 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,7 @@ Blessing Skin Server 对您的服务器有一定的要求。在大多数情况 ``` $ git clone https://github.com/printempw/blessing-skin-server.git $ composer install -$ npm install -$ bower install +$ yarn install ``` 构建代码！ diff --git a/bower.json b/bower.json deleted file mode 100644 index 88e00a64..00000000 --- a/bower.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "blessing-skin-server", - "description": "Just a simple open-source Minecraft skin server written in PHP.", - "main": "", - "authors": [ - "printempw" - ], - "license": "GPL-3.0", - "homepage": "", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "assets/bower_components", - "textures", - ".env" - ], - "dependencies": { - "AdminLTE": "admin-lte#^2.3.5", - "highlight-js": "^9.5.0", - "iCheck": "fronteed/icheck#^1.0.2", - "jquery": "2.2.3", - "toastr": "^2.1.2", - "font-awesome": "Font-Awesome#^4.6.3", - "bootstrap-fileinput": "^4.3.3", - "bootstrap": "^3.3.6", - "sweetalert2": "^4.1.6", - "jqPaginator": "^1.2.0" - }, - "resolutions": { - "jquery": "1.9.1 - 3" - } -} diff --git a/gulpfile.js b/gulpfile.js index d9e0d0ea..816594f0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -27,26 +27,26 @@ var distPath = 'resources/assets/dist/'; var vendorScripts = [ 'jquery/dist/jquery.min.js', 'bootstrap/dist/js/bootstrap.min.js', - 'AdminLTE/dist/js/app.min.js', + 'admin-lte/dist/js/app.min.js', 'bootstrap-fileinput/js/fileinput.min.js', - 'AdminLTE/plugins/datatables/jquery.dataTables.min.js', - 'AdminLTE/plugins/datatables/dataTables.bootstrap.min.js', - 'iCheck/icheck.min.js', - 'toastr/toastr.min.js', - 'es6-promise/es6-promise.auto.min.js', + 'admin-lte/plugins/datatables/jquery.dataTables.min.js', + 'admin-lte/plugins/datatables/dataTables.bootstrap.min.js', + 'icheck/icheck.min.js', + 'toastr/build/toastr.min.js', + 'es6-promise/dist/es6-promise.auto.min.js', 'sweetalert2/dist/sweetalert2.min.js', - 'jqPaginator/dist/jqPaginator.min.js', + 'jqPaginator/dist/1.2.0/jqPaginator.min.js', 'resources/assets/dist/scripts/general.js', ]; var vendorStyles = [ 'bootstrap/dist/css/bootstrap.min.css', - 'AdminLTE/dist/css/AdminLTE.min.css', - 'AdminLTE/plugins/datatables/dataTables.bootstrap.css', + 'admin-lte/dist/css/AdminLTE.min.css', + 'admin-lte/plugins/datatables/dataTables.bootstrap.css', 'bootstrap-fileinput/css/fileinput.min.css', 'font-awesome/css/font-awesome.min.css', - 'iCheck/skins/square/blue.css', - 'toastr/toastr.min.css', + 'icheck/skins/square/blue.css', + 'toastr/build/toastr.min.css', 'sweetalert2/dist/sweetalert2.min.css', ]; @@ -65,8 +65,8 @@ var fonts = [ ]; var images = [ - 'iCheck/skins/square/blue.png', - 'iCheck/skins/square/blue@2x.png', + 'icheck/skins/square/blue.png', + 'icheck/skins/square/blue@2x.png', 'resources/assets/src/images/**', 'bootstrap-fileinput/img/loading.gif', 'bootstrap-fileinput/img/loading-sm.gif', @@ -79,15 +79,18 @@ elixir((mix) => { .task('compile-es6') .task('compile-sass') - .scripts(convertBowerRelativePath(vendorScripts), distPath + 'scripts/app.min.js', './') - .styles(convertBowerRelativePath(vendorStyles), distPath + 'styles/app.min.css', './') + .scripts(convertNpmRelativePath(vendorScripts), distPath + 'scripts/app.min.js', './') + .styles(convertNpmRelativePath(vendorStyles), distPath + 'styles/app.min.css', './') .replace(distPath + 'styles/app.min.css', replacements) // copy fonts & images - .copy(convertBowerRelativePath(fonts), distPath + 'fonts/') - .copy(convertBowerRelativePath(images), distPath + 'images/') - .copy(convertBowerRelativePath(['AdminLTE/dist/css/skins']), distPath + 'styles/skins') - .copy(['skin-preview/**', 'Chart.min.js'].map(relativePath => srcPath + 'vendor/' + relativePath), distPath + 'scripts/'); + .copy(convertNpmRelativePath(fonts), distPath + 'fonts/') + .copy(convertNpmRelativePath(images), distPath + 'images/') + .copy(convertNpmRelativePath(['admin-lte/dist/css/skins']), distPath + 'styles/skins') + .copy( + ['skin-preview/**', 'Chart.min.js'].map(relativePath => `${srcPath}vendor/${relativePath}`), + distPath + 'scripts/' + ); }); // compile sass @@ -166,9 +169,9 @@ gulp.task('watch', () => { gulp.watch(srcPath + 'scripts/general.js', ['scripts']); }); -function convertBowerRelativePath(paths) { +function convertNpmRelativePath(paths) { return paths.map(relativePath => { - return relativePath.startsWith('resources') ? relativePath : (srcPath + 'bower_components/' + relativePath); + return relativePath.startsWith('resources') ? relativePath : ('node_modules/' + relativePath); }); } diff --git a/package.json b/package.json index 5badfca0..e77c4bf5 100644 --- a/package.json +++ b/package.json @@ -27,5 +27,18 @@ "gulp-zip": "^3.2.0", "laravel-elixir": "^6.0.0-15", "laravel-elixir-replace": "^1.1.2" + }, + "dependencies": { + "admin-lte": "^2.3.11", + "bootstrap": "^3.3.7", + "bootstrap-fileinput": "^4.4.2", + "es6-promise": "^4.1.1", + "font-awesome": "^4.7.0", + "highlight.js": "^9.12.0", + "icheck": "^1.0.2", + "jqPaginator": "^1.2.0", + "jquery": "^3.2.1", + "sweetalert2": "^6.6.5", + "toastr": "^2.1.2" } } diff --git a/yarn.lock b/yarn.lock index 5a0482e6..30eda234 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36,6 +36,10 @@ acorn@4.X: version "4.0.13" resolved "http://registry.npm.taobao.org/acorn/download/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" +admin-lte@^2.3.11: + version "2.3.11" + resolved "http://registry.npm.taobao.org/admin-lte/download/admin-lte-2.3.11.tgz#da56dcd34d42e9ef1af362be15520a053a9d43db" + ajv@^4.9.1: version "4.11.8" resolved "http://registry.npm.taobao.org/ajv/download/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -624,6 +628,14 @@ boom@2.x.x: dependencies: hoek "2.x.x" +bootstrap-fileinput@^4.4.2: + version "4.4.2" + resolved "http://registry.npm.taobao.org/bootstrap-fileinput/download/bootstrap-fileinput-4.4.2.tgz#55aac15e1563b6855f6df131245bf75a4270597a" + +bootstrap@^3.3.7: + version "3.3.7" + resolved "http://registry.npm.taobao.org/bootstrap/download/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71" + brace-expansion@^1.0.0, brace-expansion@^1.1.7: version "1.1.8" resolved "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292" @@ -1025,6 +1037,10 @@ error-ex@^1.2.0: dependencies: is-arrayish "^0.2.1" +es6-promise@^4.1.1: + version "4.1.1" + resolved "http://registry.npm.taobao.org/es6-promise/download/es6-promise-4.1.1.tgz#8811e90915d9a0dba36274f0b242dbda78f9c92a" + escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3: version "1.0.5" resolved "http://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -1146,6 +1162,10 @@ flagged-respawn@^0.3.2: version "0.3.2" resolved "http://registry.npm.taobao.org/flagged-respawn/download/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" +font-awesome@^4.7.0: + version "4.7.0" + resolved "http://registry.npm.taobao.org/font-awesome/download/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" + for-in@^1.0.1: version "1.0.2" resolved "http://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -1681,6 +1701,10 @@ hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" +highlight.js@^9.12.0: + version "9.12.0" + resolved "http://registry.npm.taobao.org/highlight.js/download/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e" + hoek@2.x.x: version "2.16.3" resolved "http://registry.npm.taobao.org/hoek/download/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" @@ -1710,6 +1734,10 @@ http-signature@~1.1.0: jsprim "^1.2.2" sshpk "^1.7.0" +icheck@^1.0.2: + version "1.0.2" + resolved "http://registry.npm.taobao.org/icheck/download/icheck-1.0.2.tgz#06d08da3d47ae448c153b2639b86e9ad7fdf7128" + image-size@~0.5.0: version "0.5.5" resolved "http://registry.npm.taobao.org/image-size/download/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" @@ -1933,6 +1961,14 @@ istextorbinary@1.0.2: binaryextensions "~1.0.0" textextensions "~1.0.0" +jqPaginator@^1.2.0: + version "1.2.0" + resolved "http://registry.npm.taobao.org/jqPaginator/download/jqPaginator-1.2.0.tgz#9ccab8024dae9e7ab5f7aca0573149c967b298d1" + +jquery@^3.2.1: + version "3.2.1" + resolved "http://registry.npm.taobao.org/jquery/download/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" + js-base64@^2.1.8, js-base64@^2.1.9: version "2.1.9" resolved "http://registry.npm.taobao.org/js-base64/download/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" @@ -3310,6 +3346,10 @@ supports-color@^3.2.3: dependencies: has-flag "^1.0.0" +sweetalert2@^6.6.5: + version "6.6.5" + resolved "http://registry.npm.taobao.org/sweetalert2/download/sweetalert2-6.6.5.tgz#ffffc1064711ff7870bc8aefe1678f95ecc290db" + tar@^2.0.0: version "2.2.1" resolved "http://registry.npm.taobao.org/tar/download/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" @@ -3363,6 +3403,10 @@ to-fast-properties@^1.0.1: version "1.0.3" resolved "http://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47" +toastr@^2.1.2: + version "2.1.2" + resolved "http://registry.npm.taobao.org/toastr/download/toastr-2.1.2.tgz#fd69066ae7578a5b3357725fc9c7c335e9b681df" + tough-cookie@~2.3.0: version "2.3.2" resolved "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"