From a6c9aca96f6500607bf0fada563f2e5b31a454ff Mon Sep 17 00:00:00 2001 From: Alex Dimitrov Date: Sat, 25 May 2019 18:18:21 +0300 Subject: [PATCH 1/3] Update assets update reporting; move tools in /tools folder --- inc/theme-version.php | 2 +- package-lock.json | 99 ++++++++++++++++++++ package.json | 8 +- assets-version.js => tools/assets-version.js | 5 +- zip.sh => tools/zip.sh | 0 5 files changed, 108 insertions(+), 6 deletions(-) rename assets-version.js => tools/assets-version.js (82%) rename zip.sh => tools/zip.sh (100%) diff --git a/inc/theme-version.php b/inc/theme-version.php index 08d7d8a..ae70eab 100644 --- a/inc/theme-version.php +++ b/inc/theme-version.php @@ -13,5 +13,5 @@ * with a REGEX expression from root/index.js file. */ if ( ! defined( 'DX_ASSETS_VERSION' ) ) { - define( 'DX_ASSETS_VERSION', '00000000-0' ); + define( 'DX_ASSETS_VERSION', '20190525-11' ); } diff --git a/package-lock.json b/package-lock.json index 1cfc807..b15482e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1315,6 +1315,12 @@ "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", "dev": true }, + "async-limiter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", + "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "dev": true + }, "async-settle": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz", @@ -2349,6 +2355,13 @@ "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, + "bindings": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", + "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=", + "dev": true, + "optional": true + }, "bl": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", @@ -3110,6 +3123,17 @@ "assert-plus": "^1.0.0" } }, + "deasync": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.15.tgz", + "integrity": "sha512-pxMaCYu8cQIbGkA4Y1R0PLSooPIpH1WgFBLeJ+zLxQgHfkZG86ViJSmZmONSjZJ/R3NjwkMcIWZAzpLB2G9/CA==", + "dev": true, + "optional": true, + "requires": { + "bindings": "~1.2.1", + "node-addon-api": "^1.6.0" + } + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -7520,6 +7544,13 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "node-addon-api": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.3.tgz", + "integrity": "sha512-FXWH6mqjWgU8ewuahp4spec8LkroFZK2NicOv6bNwZC3kcwZUI8LeZdG80UzTSLLhK4T7MsgNwlYDVRlDdfTDg==", + "dev": true, + "optional": true + }, "node-gyp": { "version": "3.8.0", "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", @@ -8449,6 +8480,15 @@ "strict-uri-encode": "^1.0.0" } }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.0" + } + }, "raw-body": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.1.7.tgz", @@ -9253,6 +9293,37 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "simple-websocket": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/simple-websocket/-/simple-websocket-5.1.1.tgz", + "integrity": "sha512-1yCq3y3XtzENKnCT5ycsV2f45PlQoIQOKeSlOMQ43Z2rKkIxLsJz3dZRRccHJE/rdbMozLUl/SRisdLchX2TrQ==", + "dev": true, + "requires": { + "debug": "^3.1.0", + "inherits": "^2.0.1", + "randombytes": "^2.0.3", + "readable-stream": "^2.0.5", + "safe-buffer": "^5.0.1", + "ws": "^3.3.1" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "dev": true + } + } + }, "slash": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", @@ -10146,6 +10217,12 @@ } } }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "dev": true + }, "unbzip2-stream": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz", @@ -10397,6 +10474,17 @@ "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", "dev": true }, + "v": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/v/-/v-0.3.0.tgz", + "integrity": "sha1-R1r4phlvZuTaizN11enufbdvaB8=", + "dev": true, + "requires": { + "deasync": "^0.1.9", + "debug": "^2.6.1", + "simple-websocket": "^5.0.0" + } + }, "v8flags": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz", @@ -10578,6 +10666,17 @@ "mkdirp": "^0.5.1" } }, + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", + "dev": true, + "requires": { + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" + } + }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", diff --git a/package.json b/package.json index fb43246..e6293ee 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "gulp-babel": "^8.0.0", "gulp-clean-css": "^4.2.0", "gulp-concat": "^2.6.1", + "gulp-filter": "^5.1.0", "gulp-imagemin": "^5.0.3", "gulp-livereload": "^4.0.1", "gulp-newer": "^1.4.0", @@ -30,14 +31,13 @@ "moment": "^2.24.0", "replace-in-file": "^4.1.0", "sass-lint": "^1.13.1", - "gulp-filter": "^5.1.0" + "v": "^0.3.0" }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "gulp": "./node_modules/.bin/gulp", - "ziptheme": "bash zip.sh", - "ver": "node assets-version.js", - "hello": "echo \"Hello\" ", + "ziptheme": "bash tools/zip.sh", + "ver": "node tools/assets-version.js", "projectConf": "sudo npm i -g gulp-cli gulp && echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p" }, "author": "DevriX", diff --git a/assets-version.js b/tools/assets-version.js similarity index 82% rename from assets-version.js rename to tools/assets-version.js index 72446fe..0fa5f32 100644 --- a/assets-version.js +++ b/tools/assets-version.js @@ -42,5 +42,8 @@ fs.readFile(someFile, 'utf8', function (err,data) { if (err) return console.log(err); }); - console.log("Assets version has been updated!"); + console.log("--------------------------------------------------------------") + console.log("Assets version has been updated: \x1b[33m%s\x1b[0m", time + '-' + currentVersion); + console.log("To update them again, make sure to run \x1b[33mgulp\x1b[0m again."); + console.log("--------------------------------------------------------------\n") }); diff --git a/zip.sh b/tools/zip.sh similarity index 100% rename from zip.sh rename to tools/zip.sh From 0a47a69a25f27ebb1630e31a74f6411975f5e46f Mon Sep 17 00:00:00 2001 From: mariyan96 Date: Tue, 28 May 2019 13:18:57 +0300 Subject: [PATCH 2/3] Added Renaming Script: When the script is run with "npm run rename" the user needs to anwer how does he what to rename the text domain (dxstarter), project (DevriX Starter) and the Package name (DevriX_Starter). --- package.json | 6 ++++-- tools/initial-setup.js | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 tools/initial-setup.js diff --git a/package.json b/package.json index e6293ee..25502b4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "dxstarter", + "name": "mariyan", "version": "1.5.0", "description": "Quick settings for developing themes.", "main": "Gulpfile.js", @@ -30,6 +30,7 @@ "gulp-uglify": "^3.0.2", "moment": "^2.24.0", "replace-in-file": "^4.1.0", + "replace-in-files": "^1.1.4", "sass-lint": "^1.13.1", "v": "^0.3.0" }, @@ -38,7 +39,8 @@ "gulp": "./node_modules/.bin/gulp", "ziptheme": "bash tools/zip.sh", "ver": "node tools/assets-version.js", - "projectConf": "sudo npm i -g gulp-cli gulp && echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p" + "projectConf": "sudo npm i -g gulp-cli gulp && echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p", + "rename": "node tools/initial-setup.js" }, "author": "DevriX", "license": "ISC", diff --git a/tools/initial-setup.js b/tools/initial-setup.js new file mode 100644 index 0000000..e1ceb66 --- /dev/null +++ b/tools/initial-setup.js @@ -0,0 +1,49 @@ +#!/usr/bin/env node +const replaceInFiles = require('replace-in-files'); +const readline = require('readline').createInterface({ + input: process.stdin, + output: process.stdout +}) + +let options = { + files: './**', + from: /dxstarter/g, + to: 'dxstarter', + optionsForFiles: { + "ignore": [ + "./node_modules/**", + "./tools/**" + ] + } +}; + +readline.question(`How would you want to be your text domain called (dxstarter)? `, function (textDomain) { + rename('dxstarter', textDomain, renameProject) + +}) + +function renameProject() { + readline.question(`How would you want to be your project called (DevriX Starter)? `, function (project) { + rename('DevriX Starter', project, renamePackage) + + }) +} + +function renamePackage() { + readline.question(`How would you want to be your package called (DevriX_Starter)? `, function (packageName) { + rename('DevriX_Starter', packageName) + readline.close() + }) +} + +function rename(toRenameFrom, toRenameTo, callback) { + options.from = new RegExp(toRenameFrom, "g") + options.to = toRenameTo + replaceInFiles(options).then(() => { + if (callback) { + callback() + } + }).catch(error => { + console.error('Error occurred:', error); + }); +} \ No newline at end of file From 716da36387d044cd41015e837b4747f2402ebcb8 Mon Sep 17 00:00:00 2001 From: mariyan96 Date: Tue, 28 May 2019 13:23:39 +0300 Subject: [PATCH 3/3] Removed debuggings --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25502b4..cccf6b7 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "mariyan", + "name": "dxstarter", "version": "1.5.0", "description": "Quick settings for developing themes.", "main": "Gulpfile.js",