From 92e4ca76f4df64acae3b157f049c3894600c802c Mon Sep 17 00:00:00 2001 From: Roman Axelrod Date: Thu, 18 Aug 2022 06:21:12 +0300 Subject: [PATCH] Version upgrade --- build.cjs => build.js | 17 +++++++++----- package-lock.json | 52 +++++++++++++------------------------------ package.json | 12 +++++----- server.js | 2 +- 4 files changed, 34 insertions(+), 49 deletions(-) rename build.cjs => build.js (60%) diff --git a/build.cjs b/build.js similarity index 60% rename from build.cjs rename to build.js index 7d67ea9..00fb8bd 100755 --- a/build.cjs +++ b/build.js @@ -1,15 +1,15 @@ #!/usr/bin/env node -const {exec} = require('child_process'); -const config = require('config'); -const Generator = require("yeoman-generator"); +import {exec} from 'child_process'; +import config from 'config'; +import Generator from "yeoman-generator"; -const isDev = process.env.NODE_ENV === 'development'; // Check README file in case you get "missing files" error. +const isDev = process.env.NODE_ENV === 'development' || config.get('isDev'); // Check README file in case you get "missing files" error. const modulePath = isDev ? '' : 'node_modules/create-block-dev-tool/'; const blockName = config.has('blockName') ? config.get('blockName') : 'development'; -module.exports = class extends Generator { +class buildGenerator extends Generator { async prompting() { this.data = await this.prompt([ { @@ -25,7 +25,7 @@ module.exports = class extends Generator { writing() { new Promise((resolve => { if (['WordPress', 'PHP'].includes(this.data.platfrom)) { - exec(`cd adapters/php && composer install && php build.php '${blockName}' '${modulePath}'`, function (error, stdout, stderr) { + exec(`cd platforms/php && composer install && php build.php '${blockName}' '${modulePath}'`, function (error, stdout) { console.log(stdout); resolve(); }); @@ -41,3 +41,8 @@ module.exports = class extends Generator { }); } } + +import yeoman from 'yeoman-environment'; + +const build = new buildGenerator([], {env: yeoman.createEnv()}, {}); +build.run().then(() => null); diff --git a/package-lock.json b/package-lock.json index 09561c0..3918509 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,18 @@ { "name": "create-block-dev-tool", - "version": "1.0.4", + "version": "1.0.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "create-block-dev-tool", - "version": "1.0.4", + "version": "1.0.5", "license": "ISC", "dependencies": { + "@braintree/sanitize-url": "^6.0.0", "browser-sync": "^2.27.9", "config": "^3.3.7", + "escape-html": "^1.0.3", "express": "^4.17.3", "express-handlebars": "^6.0.4", "fs-extra": "^10.0.1", @@ -23,28 +25,28 @@ "lodash-es": "^4.17.21", "mkdirp": "^1.0.4", "open": "^8.4.0", + "sanitize-html": "^2.7.1", "sass": "^1.50.1", + "yeoman-environment": "^3.10.0", "yeoman-generator": "^5.6.1", "yo": "4.3.0" }, "bin": { + "component-build": "build.js", "component-dev": "server.js" }, "devDependencies": { "@babel/preset-react": "^7.18.6", - "@braintree/sanitize-url": "^6.0.0", "@modular-css/rollup": "^28.2.2", "@rollup/plugin-babel": "^5.3.1", "@rollup/plugin-commonjs": "^22.0.2", "@rollup/plugin-node-resolve": "^13.3.0", "@rollup/plugin-replace": "^4.0.0", - "escape-html": "^1.0.3", "react": "^18.2.0", "react-dom": "^18.2.0", "rollup": "^2.77.2", "rollup-plugin-copy": "^3.4.0", "rollup-plugin-jsx": "^1.0.3", - "sanitize-html": "^2.7.1", "styled-components": "^5.3.5" } }, @@ -482,8 +484,7 @@ "node_modules/@braintree/sanitize-url": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz", - "integrity": "sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w==", - "dev": true + "integrity": "sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w==" }, "node_modules/@emotion/is-prop-valid": { "version": "1.2.0", @@ -3683,7 +3684,6 @@ "version": "4.2.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -3907,7 +3907,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, "dependencies": { "domelementtype": "^2.0.1", "domhandler": "^4.2.0", @@ -3921,7 +3920,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, "funding": [ { "type": "github", @@ -3933,7 +3931,6 @@ "version": "4.3.1", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, "dependencies": { "domelementtype": "^2.2.0" }, @@ -3948,7 +3945,6 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, "dependencies": { "dom-serializer": "^1.0.1", "domelementtype": "^2.2.0", @@ -4167,7 +4163,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -6648,7 +6643,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -9146,7 +9140,6 @@ "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", - "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -10674,8 +10667,7 @@ "node_modules/parse-srcset": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", - "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==", - "dev": true + "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==" }, "node_modules/parseurl": { "version": "1.3.3", @@ -11051,7 +11043,6 @@ "version": "8.4.16", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz", "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==", - "dev": true, "funding": [ { "type": "opencollective", @@ -12128,7 +12119,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.1.tgz", "integrity": "sha512-oOpe8l4J8CaBk++2haoN5yNI5beekjuHv3JRPKUx/7h40Rdr85pemn4NkvUB3TcBP7yjat574sPlcMAyv4UQig==", - "dev": true, "dependencies": { "deepmerge": "^4.2.2", "escape-string-regexp": "^4.0.0", @@ -16335,8 +16325,7 @@ "@braintree/sanitize-url": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz", - "integrity": "sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w==", - "dev": true + "integrity": "sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w==" }, "@emotion/is-prop-valid": { "version": "1.2.0", @@ -18866,8 +18855,7 @@ "deepmerge": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", - "dev": true + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" }, "default-compare": { "version": "1.0.0", @@ -19031,7 +19019,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, "requires": { "domelementtype": "^2.0.1", "domhandler": "^4.2.0", @@ -19041,14 +19028,12 @@ "domelementtype": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==" }, "domhandler": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, "requires": { "domelementtype": "^2.2.0" } @@ -19057,7 +19042,6 @@ "version": "2.8.0", "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, "requires": { "dom-serializer": "^1.0.1", "domelementtype": "^2.2.0", @@ -19242,8 +19226,7 @@ "entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" }, "env-paths": { "version": "1.0.0", @@ -21199,7 +21182,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, "requires": { "domelementtype": "^2.0.1", "domhandler": "^4.0.0", @@ -23079,8 +23061,7 @@ "nanoid": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", - "dev": true + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" }, "nanomatch": { "version": "1.2.13", @@ -24218,8 +24199,7 @@ "parse-srcset": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz", - "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==", - "dev": true + "integrity": "sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==" }, "parseurl": { "version": "1.3.3", @@ -24496,7 +24476,6 @@ "version": "8.4.16", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz", "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==", - "dev": true, "requires": { "nanoid": "^3.3.4", "picocolors": "^1.0.0", @@ -25313,7 +25292,6 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.1.tgz", "integrity": "sha512-oOpe8l4J8CaBk++2haoN5yNI5beekjuHv3JRPKUx/7h40Rdr85pemn4NkvUB3TcBP7yjat574sPlcMAyv4UQig==", - "dev": true, "requires": { "deepmerge": "^4.2.2", "escape-string-regexp": "^4.0.0", diff --git a/package.json b/package.json index b56eab3..0cc38dc 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,23 @@ { "name": "create-block-dev-tool", - "version": "1.0.4", + "version": "1.0.5", "scripts": { "start": "component-dev", "dev": "NODE_ENV=development node server.js", "generate-block": "yo ./generators/block/index.cjs", "build": "rollup --config rollup.config.js", "build-platform": "NODE_ENV=development yo ./build.cjs", + "build-platform-cli": "component-build", "dev-js": "rollup --config rollup.config.js --watch" }, "license": "ISC", "main": "server.js", "type": "module", "dependencies": { + "@braintree/sanitize-url": "^6.0.0", "browser-sync": "^2.27.9", "config": "^3.3.7", + "escape-html": "^1.0.3", "express": "^4.17.3", "express-handlebars": "^6.0.4", "fs-extra": "^10.0.1", @@ -25,12 +28,11 @@ "gulp-sourcemaps": "^3.0.0", "gulp-uglify": "^3.0.2", "lodash-es": "^4.17.21", - "@braintree/sanitize-url": "^6.0.0", - "escape-html": "^1.0.3", - "sanitize-html": "^2.7.1", "mkdirp": "^1.0.4", "open": "^8.4.0", + "sanitize-html": "^2.7.1", "sass": "^1.50.1", + "yeoman-environment": "^3.10.0", "yeoman-generator": "^5.6.1", "yo": "4.3.0" }, @@ -50,6 +52,6 @@ }, "bin": { "component-dev": "./server.js", - "component-build": "yo ./build.cjs" + "component-build": "./build.js" } } diff --git a/server.js b/server.js index 0b16f02..27ea9d6 100755 --- a/server.js +++ b/server.js @@ -22,7 +22,7 @@ import {escape} from "lodash-es"; * Constants */ -const isDev = process.env.NODE_ENV === 'development'; // Check README file in case you get "missing files" error. +const isDev = process.env.NODE_ENV === 'development' || config.get('isDev'); // Check README file in case you get "missing files" error. const modulePath = isDev ? '' : 'node_modules/create-block-dev-tool/'; const projectDir = modulePath;