diff --git a/install-usercss.html b/install-usercss.html index 0858ee02..9caec3d1 100644 --- a/install-usercss.html +++ b/install-usercss.html @@ -16,7 +16,7 @@ - + diff --git a/manifest.json b/manifest.json index 4a335bf4..dbec994f 100644 --- a/manifest.json +++ b/manifest.json @@ -38,7 +38,7 @@ "background/update.js", "background/refresh-all-tabs.js", "background/openusercss-api.js", - "vendor/node-semver/semver.js", + "vendor/semver-bundle/semver.js", "vendor-overwrites/colorpicker/colorconverter.js" ] }, diff --git a/package.json b/package.json index ea4dbd9c..54000f0e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "jsonlint": "^1.6.3", "less": "^3.7.1", "lz-string-unsafe": "^1.4.4-beta", + "semver-bundle": "^0.1.0", "updates": "^3.2.3" }, "scripts": { diff --git a/tools/update-libraries.js b/tools/update-libraries.js index b2c03abe..1cbd47d2 100644 --- a/tools/update-libraries.js +++ b/tools/update-libraries.js @@ -46,6 +46,9 @@ const files = { ], 'lz-string-unsafe': [ 'lz-string-unsafe.min.js → lz-string-unsafe.min.js' + ], + 'semver-bundle': [ + 'dist/semver.js → semver.js' ] }; diff --git a/vendor/README.md b/vendor/README.md index cb44413f..614aedf1 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -7,8 +7,8 @@ Using this repo, run `npm install`... the latest versions of: * `CodeMirror` (https://github.com/codemirror/CodeMirror) is installed. * `jsonlint` (https://github.com/zaach/jsonlint) is installed. * `less` (https://github.com/less/less.js) is installed. -* `lz-string-unsafe` (https://github.com/openstyles/lz-string-unsafe) is installed.

-* **TODO**: `node-semver` (https://github.com/eight04/node-semver-bundle) is installed. +* `lz-string-unsafe` (https://github.com/openstyles/lz-string-unsafe) is installed. +* `semver-bundle` (https://github.com/openstyles/semver-bundle) is installed.

* **TODO**: `stylus-lang` (https://github.com/eight04/stylus-lang-bundle) is installed.

* The necessary build tools are installed; see `devDependencies` in the `package.json`. @@ -22,3 +22,4 @@ The following changes are made: * `jsonlint`: The uncompressed `lib/jsonlint.js` is copied directly to `vendor/jsonlint`. * `less`: The compressed `dist/less.min.js` file is copied directly into `vendor/less`. * `lz-string-unsafe`: The compressed `lz-string-unsafe.min.js` file is copied directly into `vendor/lz-string-unsafe`. +* `semver-bundle`: The `dist/semver.js` file is copied directly into `vendor/semver`. diff --git a/vendor/node-semver/README.md b/vendor/node-semver/README.md deleted file mode 100644 index 7810bff9..00000000 --- a/vendor/node-semver/README.md +++ /dev/null @@ -1 +0,0 @@ -See https://github.com/eight04/node-semver-bundle. \ No newline at end of file diff --git a/vendor/node-semver/LICENSE b/vendor/semver-bundle/LICENSE similarity index 85% rename from vendor/node-semver/LICENSE rename to vendor/semver-bundle/LICENSE index c81ae8ce..3b9af184 100644 --- a/vendor/node-semver/LICENSE +++ b/vendor/semver-bundle/LICENSE @@ -1,20 +1,19 @@ -https://github.com/eight04/node-semver-bundle - -https://github.com/eight04/node-semver-bundle/blob/master/LICENSE - - -The ISC License - -Copyright (c) Isaac Z. Schlueter and Contributors - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +https://github.com/openstyles/semver-bundle + +https://github.com/openstyles/semver-bundle/blob/master/LICENSE + +The ISC License + +Copyright (c) Isaac Z. Schlueter and Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/vendor/semver-bundle/README.md b/vendor/semver-bundle/README.md new file mode 100644 index 00000000..84afa7bb --- /dev/null +++ b/vendor/semver-bundle/README.md @@ -0,0 +1,5 @@ +## Semver-bundle v0.0.0 + +semver-bundle installed via npm - source repo: + +https://github.com/openstyles/semver-bundle/blob/v0.0.0/dist/semver.js diff --git a/vendor/node-semver/semver.js b/vendor/semver-bundle/semver.js similarity index 100% rename from vendor/node-semver/semver.js rename to vendor/semver-bundle/semver.js