From e3345b4fcbfdea8d3105cb039c259b4b9085ac8e Mon Sep 17 00:00:00 2001 From: Rob Garrison Date: Fri, 20 Jul 2018 11:37:07 -0500 Subject: [PATCH] Add stylus-lang-bundle updater --- js/usercss.js | 2 +- package.json | 1 + tools/update-libraries.js | 3 + vendor/README.md | 5 +- .../LICENSE | 57 ++++++++++--------- vendor/stylus-lang-bundle/README.md | 5 ++ .../stylus.min.js | 0 7 files changed, 42 insertions(+), 31 deletions(-) rename vendor/{stylus-lang => stylus-lang-bundle}/LICENSE (90%) create mode 100644 vendor/stylus-lang-bundle/README.md rename vendor/{stylus-lang => stylus-lang-bundle}/stylus.min.js (100%) diff --git a/js/usercss.js b/js/usercss.js index ff3c9c9a..8f5e6eda 100644 --- a/js/usercss.js +++ b/js/usercss.js @@ -47,7 +47,7 @@ var usercss = (() => { }, stylus: { preprocess(source, vars) { - return loadScript('/vendor/stylus-lang/stylus.min.js').then(() => ( + return loadScript('/vendor/stylus-lang-bundle/stylus.min.js').then(() => ( new Promise((resolve, reject) => { const varDef = Object.keys(vars).map(key => `${key} = ${vars[key].value};\n`).join(''); if (!Error.captureStackTrace) Error.captureStackTrace = () => {}; diff --git a/package.json b/package.json index 689aad18..b510e482 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "lz-string-unsafe": "^1.4.4-beta", "semver-bundle": "^0.1.0", "stylelint-bundle": "^8.0.0", + "stylus-lang-bundle": "^0.54.5", "updates": "^4.0.0" }, "scripts": { diff --git a/tools/update-libraries.js b/tools/update-libraries.js index 1870e253..eb6610d0 100644 --- a/tools/update-libraries.js +++ b/tools/update-libraries.js @@ -52,6 +52,9 @@ const files = { ], 'stylelint-bundle': [ 'stylelint-bundle.min.js' + ], + 'stylus-lang-bundle': [ + 'stylus.min.js' ] }; diff --git a/vendor/README.md b/vendor/README.md index 614aedf1..5fc80a61 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -8,8 +8,8 @@ Using this repo, run `npm install`... the latest versions of: * `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. -* `semver-bundle` (https://github.com/openstyles/semver-bundle) is installed.

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

+* `semver-bundle` (https://github.com/openstyles/semver-bundle) is installed. +* `stylus-lang` (https://github.com/openstyles/stylus-lang-bundle) is installed.

* The necessary build tools are installed; see `devDependencies` in the `package.json`. ## Running the build script @@ -23,3 +23,4 @@ The following changes are made: * `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`. +* `stylus-lang-bundle`: The `stylus.min.js` file is copied directly into `vendor/stylus-lang-bundle`. diff --git a/vendor/stylus-lang/LICENSE b/vendor/stylus-lang-bundle/LICENSE similarity index 90% rename from vendor/stylus-lang/LICENSE rename to vendor/stylus-lang-bundle/LICENSE index 0f96caca..ce962fc4 100644 --- a/vendor/stylus-lang/LICENSE +++ b/vendor/stylus-lang-bundle/LICENSE @@ -1,28 +1,29 @@ -http://stylus-lang.com/ -https://github.com/stylus/stylus/ - -https://github.com/stylus/stylus/blob/dev/LICENSE - - -The MIT License - -Copyright (c) Automattic - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -'Software'), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +http://stylus-lang.com/ +https://github.com/stylus/stylus/ +https://github.com/openstyles/stylus-lang-bundle + +https://github.com/openstyles/stylus-lang-bundle/blob/master/LICENSE + + +The MIT License + +Copyright (c) Automattic + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +'Software'), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/stylus-lang-bundle/README.md b/vendor/stylus-lang-bundle/README.md new file mode 100644 index 00000000..4886d09f --- /dev/null +++ b/vendor/stylus-lang-bundle/README.md @@ -0,0 +1,5 @@ +## Stylus-lang-bundle v0.0.0 + +stylus-lang-bundle installed via npm - source repo: + +https://github.com/openstyles/stylus-lang-bundle/blob/v0.0.0/stylus.min.js diff --git a/vendor/stylus-lang/stylus.min.js b/vendor/stylus-lang-bundle/stylus.min.js similarity index 100% rename from vendor/stylus-lang/stylus.min.js rename to vendor/stylus-lang-bundle/stylus.min.js