From 04e7987f09c6d8c90647f4924938766a7626381a Mon Sep 17 00:00:00 2001 From: Nikolay Govorov Date: Thu, 30 Aug 2018 17:18:57 +0300 Subject: [PATCH 1/4] Migrated with shower-cli --- .travis.yml | 2 +- gulpfile.js | 110 --- package-lock.json | 2315 ++++++--------------------------------------- package.json | 16 +- 4 files changed, 307 insertions(+), 2136 deletions(-) delete mode 100644 gulpfile.js diff --git a/.travis.yml b/.travis.yml index 4909f83..efb0983 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,3 @@ language: node_js node_js: - - "6" + - "8" diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 6a7cd43..0000000 --- a/gulpfile.js +++ /dev/null @@ -1,110 +0,0 @@ -const del = require('del'); -const gulp = require('gulp'); -const merge = require('merge-stream'); -const rename = require('gulp-rename'); -const replace = require('gulp-replace'); -const zip = require('gulp-zip'); -const pages = require('gh-pages'); -const sync = require('browser-sync').create(); - -gulp.task('prepare', () => { - - const shower = gulp.src([ - '**', - '!docs{,/**}', - '!node_modules{,/**}', - '!prepared{,/**}', - '!CONTRIBUTING.md', - '!LICENSE.md', - '!README.md', - '!gulpfile.js', - '!netlify.toml', - '!package.json', - '!package-lock.json' - ]) - .pipe(replace( - /()/g, - '$1shower/themes/$3/$4', { skipBinary: true } - )) - .pipe(replace( - /( - + From 4075b50e623406aea884aefdda54c887c2a88265 Mon Sep 17 00:00:00 2001 From: Vadim Makeev Date: Mon, 11 Feb 2019 14:21:04 +0300 Subject: [PATCH 3/4] Update copyright year --- LICENSE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index b295895..7b5527b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # The MIT License -Copyright © 2010–2018 Vadim Makeev, http://pepelsbey.net/ +Copyright © 2010–2019 Vadim Makeev, http://pepelsbey.net/ 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: @@ -12,7 +12,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI # Лицензия MIT -Copyright © 2010–2018 Вадим Макеев, http://pepelsbey.net/ +Copyright © 2010–2019 Вадим Макеев, http://pepelsbey.net/ Данная лицензия разрешает лицам, получившим копию данного программного обеспечения и сопутствующей документации (в дальнейшем именуемыми «Программное Обеспечение»), безвозмездно использовать Программное Обеспечение без ограничений, включая неограниченное право на использование, копирование, изменение, добавление, публикацию, распространение, сублицензирование и/или продажу копий Программного Обеспечения, также как и лицам, которым предоставляется данное Программное Обеспечение, при соблюдении следующих условий: From 83b0c302ec75b861d6591d94bd7bc2ad208c8739 Mon Sep 17 00:00:00 2001 From: Vadim Makeev Date: Tue, 12 Feb 2019 00:25:30 +0300 Subject: [PATCH 4/4] Update themes --- package-lock.json | 53 ++++++++++++++++++++++++++++++++--------------- package.json | 4 ++-- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6e943fb..f7d8366 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,14 +14,14 @@ } }, "@shower/material": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@shower/material/-/material-2.2.0.tgz", - "integrity": "sha512-YID//bROXp5IS8nb6Gv3UFaqrj7LmXfg5mJ0IZEkDT254aWEV3X3ix0f4G+SJpU4XZ9g5EYq5VFupc1LI8Kukw==" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@shower/material/-/material-2.2.1.tgz", + "integrity": "sha512-VbuM5yVo3tTxArT/MXczAkg4F1yKbni/aTT/NL3jIrccXAtEUtOES8LS/I2TWPk4/iJYLrSNSmpQTvizwe2OyQ==" }, "@shower/ribbon": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@shower/ribbon/-/ribbon-3.2.1.tgz", - "integrity": "sha512-ubWAQ85nZfE3oeyqsA1XENK0XaocicbjF/5o4hYDB0pJZdo0fXCFFCMr15O0bmJVM+BmH40xzk88GLMPOEWtCA==" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@shower/ribbon/-/ribbon-3.2.2.tgz", + "integrity": "sha512-/68+0wHo/fupVxeS2bEyYhjVjSpSDbOSNAFkWYBLeuSVq8EHMhKKOXMgYxLQkUX2BTXfU4ZzmtzDEnW1F4LsQw==" }, "accepts": { "version": "1.3.5", @@ -2456,7 +2456,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -2477,12 +2478,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2497,17 +2500,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2624,7 +2630,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2636,6 +2643,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2650,6 +2658,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2657,12 +2666,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2681,6 +2692,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2761,7 +2773,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2773,6 +2786,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2858,7 +2872,8 @@ "safe-buffer": { "version": "5.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -2894,6 +2909,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2913,6 +2929,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -2956,12 +2973,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/package.json b/package.json index 9f566c3..53667d2 100644 --- a/package.json +++ b/package.json @@ -27,8 +27,8 @@ "README.md" ], "dependencies": { - "@shower/material": "^2.2.0", - "@shower/ribbon": "^3.2.1", + "@shower/material": "^2.2.1", + "@shower/ribbon": "^3.2.2", "shower-core": "^2.1.0" }, "devDependencies": {