From 039dd25059be26dd0126ffda6918d8c8d782a54c Mon Sep 17 00:00:00 2001 From: YFdyh000 Date: Sat, 26 Jan 2019 08:21:58 +0800 Subject: [PATCH 1/2] Migrate `bower` to `yarn` using bower-away and grunt-npm-bower p.s. `npm ERR! error: pathspec '~1.3.5' did not match any file(s) known to git` for `npm install` --- .gitignore | 3 +- README.md | 2 +- omega-build/package.json | 2 +- omega-web/bower.json | 132 -------------------------------- omega-web/grunt/aliases.coffee | 3 +- omega-web/grunt/bower.coffee | 6 -- omega-web/grunt/npmBower.coffee | 5 ++ omega-web/package.json | 119 +++++++++++++++++++++++++++- 8 files changed, 127 insertions(+), 145 deletions(-) delete mode 100644 omega-web/bower.json delete mode 100644 omega-web/grunt/bower.coffee create mode 100644 omega-web/grunt/npmBower.coffee diff --git a/.gitignore b/.gitignore index a088b6f05..08b25532d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -node_modules -bower_components +node_modules diff --git a/README.md b/README.md index e38096df8..160c6b895 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ To build the project: # Install node and npm first (make sure npm --version > 2.0), then: - sudo npm install -g grunt-cli@1.2.0 bower + sudo npm install -g grunt-cli@1.2.0 yarn # In the project folder: cd omega-build npm run deps # This runs npm install in every module. diff --git a/omega-build/package.json b/omega-build/package.json index 979a37f8c..9a33c044d 100644 --- a/omega-build/package.json +++ b/omega-build/package.json @@ -7,7 +7,7 @@ "grunt-hub": "^0.7.0" }, "scripts": { - "deps": "npm install && (cd ../omega-pac && npm install) && (cd ../omega-target && npm install) && (cd ../omega-web && npm install && bower install) && (cd ../omega-target-chromium-extension/ && npm install)", + "deps": "npm install && (cd ../omega-pac && npm install) && (cd ../omega-target && npm install) && (cd ../omega-web && yarn) && (cd ../omega-target-chromium-extension/ && npm install)", "dev": "(cd ../omega-pac && npm run dev) && (cd ../omega-target && npm run dev) && (cd ../omega-web && npm run dev) && (cd ../omega-target-chromium-extension/ && npm run dev)" } } diff --git a/omega-web/bower.json b/omega-web/bower.json deleted file mode 100644 index bd3aa4af2..000000000 --- a/omega-web/bower.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "name": "switchyomega", - "version": "0.0.1", - "authors": [ - "FelisCatus " - ], - "description": "The ultimate proxy switcher.", - "keywords": [ - "proxy", - "pac", - "extension" - ], - "license": "GPL", - "homepage": "https://github.com/FelisCatus/SwitchyOmega", - "private": true, - "ignore": [ - "**/.*", - "node_modules", - "bower_components", - "test", - "tests" - ], - "dependencies": { - "angular": "~1.7.2", - "angular-animate": "~1.7.2", - "angular-loader": "~1.7.2", - "angular-i18n": "~1.7.2", - "angular-sanitize": "~1.7.2", - - "angular-bootstrap": "~0.12.0", - "angular-ui-router": "~0.2.18", - "bootstrap": "~3.3.2", - "script.js": "~2.5.3", - "ngprogress": "~1.0.4", - "angular-ui-sortable": "~0.13.3", - "jsondiffpatch": "~0.1.7", - "angular-spectrum-colorpicker": "~1.3.5", - "blob": "*", - "FileSaver": "=1.3.3", - "angular-ui-utils": "bower-validate", - "angular-ladda": "~0.2.1", - "shepherd.js": "~0.5.1", - "jqueryui-touch-punch": "*" - }, - "exportsOverride": { - "script.js": { - "": "dist/*.min.js" - }, - "jquery": { - "": "dist/jquery.min.js" - }, - "jquery-ui": { - "": [] - }, - "jqueryui-touch-punch": { - "": "jquery.ui.touch-punch.min.js" - }, - "angular": { - "": "angular.min.js" - }, - "angular-animate": { - "": "*.min.js" - }, - "angular-bootstrap": { - "": "ui-bootstrap-tpls.min.js" - }, - "angular-i18n": { - "": [ - "angular-locale_en-us.js", - "angular-locale_zh-cn.js", - "angular-locale_zh-hk.js", - "angular-locale_zh-tw.js" - ] - }, - "angular-loader": { - "": "*.min.js" - }, - "angular-sanitize": { - "": "*.min.js" - }, - "angular-spectrum-colorpicker": { - "": "dist/*.min.js" - }, - "angular-ui-router": { - "": "release/*.min.js" - }, - "angular-ui-sortable": { - "": "*.min.js" - }, - "angular-ui-utils": { - "": "*.min.js" - }, - "bootstrap": { - "css": "dist/css/bootstrap.min.css", - "fonts": "dist/fonts/*", - "js": "js/dropdown.*" - }, - "ngprogress": { - "": "build/*.min.js" - }, - "jsondiffpatch": { - "": "public/build/jsondiffpatch.min.js" - }, - "shepherd.js": { - "": [ - "*.min.js", - "css/shepherd-theme-arrows.css" - ] - }, - "spectrum": { - "": [ - "*.js", - "*.css" - ] - }, - "FileSaver": { - "": "*.min.js" - }, - "blob": { - "": "*.js" - }, - "ladda": { - "": [ - "dist/ladda-themeless.min.css", - "dist/ladda.min.js" - ] - } - }, - "resolutions": { - "angular": "~1.7.2" - } -} diff --git a/omega-web/grunt/aliases.coffee b/omega-web/grunt/aliases.coffee index 9d45fdbe9..5f4042f8d 100644 --- a/omega-web/grunt/aliases.coffee +++ b/omega-web/grunt/aliases.coffee @@ -6,6 +6,7 @@ module.exports = 'autoprefixer' 'coffeelint' 'coffee' - 'bower' + 'npmBower' ] + npm: ['npmBower'] test: ['mochaTest'] diff --git a/omega-web/grunt/bower.coffee b/omega-web/grunt/bower.coffee deleted file mode 100644 index 0c5c4646c..000000000 --- a/omega-web/grunt/bower.coffee +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = - install: - options: - copy: true - targetDir: 'build/lib/' - layout: 'byComponent' diff --git a/omega-web/grunt/npmBower.coffee b/omega-web/grunt/npmBower.coffee new file mode 100644 index 000000000..f5c924b06 --- /dev/null +++ b/omega-web/grunt/npmBower.coffee @@ -0,0 +1,5 @@ +module.exports = + options: + cleanTargetDir: true + targetDir: 'build/lib' + verbose: true diff --git a/omega-web/package.json b/omega-web/package.json index eeceaa24c..ad5df1926 100644 --- a/omega-web/package.json +++ b/omega-web/package.json @@ -7,7 +7,6 @@ "coffeelint": "^1.16.0", "grunt": "^0.4.5", "grunt-autoprefixer": "^1.0.1", - "grunt-bower-task": "^0.5.0", "grunt-coffeelint": "^0.0.13", "grunt-contrib-coffee": "^0.11.1", "grunt-contrib-concat": "^0.5.0", @@ -17,10 +16,126 @@ "grunt-contrib-watch": "^0.6.1", "grunt-mocha-test": "~0.11.0", "grunt-ng-annotate": "^0.3.2", + "grunt-npm-bower": "0.0.4", "load-grunt-config": "^0.13.1", "omega-pac": "../omega-pac" }, "scripts": { - "dev": "npm link omega-pac && npm link" + "dev": "npm link omega-pac && npm link", + "postinstall": "node -e \"try { require('fs').symlinkSync(require('path').resolve('node_modules/@bower_components'), 'bower_components', 'junction') } catch (e) { }\"" + }, + "dependencies": { + "@bower_components/angular": "angular/bower-angular#1.7.6", + "@bower_components/angular-animate": "angular/bower-angular-animate#~1.7.2", + "@bower_components/angular-bootstrap": "angular-ui/bootstrap-bower#~2.5.0", + "@bower_components/angular-i18n": "angular/bower-angular-i18n#~1.7.2", + "@bower_components/angular-ladda": "remotty/angular-ladda#~0.4.3", + "@bower_components/angular-loader": "angular/bower-angular-loader#~1.7.2", + "@bower_components/angular-sanitize": "angular/bower-angular-sanitize#~1.7.2", + "@bower_components/angular-spectrum-colorpicker": "Jimdo/angular-spectrum-colorpicker#~1.3.5", + "@bower_components/angular-ui-router": "angular-ui/angular-ui-router-bower#~1.0.20", + "@bower_components/angular-ui-sortable": "angular-ui/ui-sortable#~0.19.0", + "@bower_components/angular-ui-utils": "angular-ui/ui-utils#bower-validate", + "@bower_components/blob": "eligrey/Blob.js#*", + "@bower_components/bootstrap": "twbs/bootstrap#~3.4.0", + "@bower_components/FileSaver": "eligrey/FileSaver.js#~2.0.0", + "@bower_components/jquery": "jquery/jquery-dist#1.9.1 - 3", + "@bower_components/jquery-ui": "components/jqueryui#>=1.8", + "@bower_components/jqueryui-touch-punch": "furf/jquery-ui-touch-punch#*", + "@bower_components/jsondiffpatch": "benjamine/JsonDiffPatch#~0.3.11", + "@bower_components/ladda": "hakimel/Ladda#>=0.9.8", + "@bower_components/ngprogress": "VictorBjelkholm/ngProgress#~1.1.3", + "@bower_components/script.js": "ded/script.js#~2.5.3", + "@bower_components/shepherd.js": "HubSpot/shepherd#~2.3.2", + "@bower_components/spectrum": "bgrins/spectrum#1.6.0", + "@bower_components/spin.js": "fgnass/spin.js#~2.0.2", + "@bower_components/tether": "HubSpot/tether#~0.6.5" + }, + "engines": { + "yarn": ">= 1.0.0" + }, + "exportsOverride": { + "@bower_components/script.js": { + "": "dist/*.min.js" + }, + "@bower_components/jquery": { + "": "dist/jquery.min.js" + }, + "@bower_components/jquery-ui": { + "": [] + }, + "@bower_components/jqueryui-touch-punch": { + "": "jquery.ui.touch-punch.min.js" + }, + "@bower_components/angular": { + "": "angular.min.js" + }, + "@bower_components/angular-animate": { + "": "*.min.js" + }, + "@bower_components/angular-bootstrap": { + "": "ui-bootstrap-tpls.min.js" + }, + "@bower_components/angular-i18n": { + "": [ + "angular-locale_en-us.js", + "angular-locale_zh-cn.js", + "angular-locale_zh-hk.js", + "angular-locale_zh-tw.js" + ] + }, + "@bower_components/angular-loader": { + "": "*.min.js" + }, + "@bower_components/angular-sanitize": { + "": "*.min.js" + }, + "@bower_components/angular-spectrum-colorpicker": { + "": "dist/*.min.js" + }, + "@bower_components/angular-ui-router": { + "": "release/*.min.js" + }, + "@bower_components/angular-ui-sortable": { + "": "*.min.js" + }, + "@bower_components/angular-ui-utils": { + "": "*.min.js" + }, + "@bower_components/bootstrap": { + "css": "dist/css/bootstrap.min.css", + "fonts": "dist/fonts/*", + "js": "js/dropdown.*" + }, + "@bower_components/ngprogress": { + "": "build/*.min.js" + }, + "@bower_components/jsondiffpatch": { + "": "public/build/jsondiffpatch.min.js" + }, + "@bower_components/shepherd.js": { + "": [ + "*.min.js", + "css/shepherd-theme-arrows.css" + ] + }, + "@bower_components/spectrum": { + "": [ + "*.js", + "*.css" + ] + }, + "@bower_components/FileSaver": { + "": "*.min.js" + }, + "@bower_components/blob": { + "": "*.js" + }, + "@bower_components/ladda": { + "": [ + "dist/ladda-themeless.min.css", + "dist/ladda.min.js" + ] + } } } From ed2154f0ac4d49b79793a3513dbdee291537a832 Mon Sep 17 00:00:00 2001 From: YFdyh000 Date: Sat, 26 Jan 2019 12:06:47 +0800 Subject: [PATCH 2/2] update .circleci/config.yml --- .circleci/config.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e5103b3d..67afa4371 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,16 +25,12 @@ jobs: keys: - v2-dependencies-web-{{ checksum "omega-web/package.json" }} - v2-dependencies-web - - restore_cache: - keys: - - v2-dependencies-webbower-{{ checksum "omega-web/bower.json" }} - - v2-dependencies-webbower - restore_cache: keys: - v2-dependencies-targetchromium-{{ checksum "omega-target-chromium-extension/package.json" }} - v2-dependencies-targetchromium - - run: sudo npm install -g grunt-cli@1.2.0 bower web-ext json + - run: sudo npm install -g grunt-cli@1.2.0 yarn web-ext json - run: (cd omega-build && npm run deps) - save_cache: @@ -49,10 +45,6 @@ jobs: paths: - omega-web/node_modules key: v2-dependencies-web-{{ checksum "omega-web/package.json" }} - - save_cache: - paths: - - omega-web/bower_components - key: v2-dependencies-webbower-{{ checksum "omega-web/bower.json" }} - save_cache: paths: - omega-target-chromium-extension/node_modules