From ec46cfdd657c08c8e90261613f00cfc080f1e1d6 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sat, 10 Dec 2022 21:48:55 +0100 Subject: [PATCH 01/23] fix(ci): :zap: balance version --- packages/bot/package.json | 2 +- packages/cli/package.json | 2 +- packages/create-bot-whatsapp/package.json | 2 +- packages/database/package.json | 2 +- packages/provider/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/bot/package.json b/packages/bot/package.json index 18f4ce0..98eb9c7 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.4-alpha.0", + "version": "0.0.6-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 5f29641..e294213 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.4-alpha.0", + "version": "0.0.5-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index 4a76abf..c54f30a 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.13-alpha.0", + "version": "0.0.14-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index cc44837..0e088d5 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.4-alpha.0", + "version": "0.0.5-alpha.0", "description": "Esto es el conector a mysql, pg, mongo", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/packages/provider/package.json b/packages/provider/package.json index 9cb7956..e3571f1 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.10-alpha.0", + "version": "0.0.11-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], From 6617107ab824215c449e26eae6c2bb327ecfc092 Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Sun, 11 Dec 2022 05:48:51 -0600 Subject: [PATCH 02/23] fix: pre-copy fix --- starters/apps/base-twilio-memory/package.json | 2 +- starters/apps/base-twilio-mongo/package.json | 2 +- starters/apps/base-twilio-mysql/package.json | 2 +- starters/apps/base-wweb-memory/package.json | 2 +- starters/apps/base-wweb-mongo/package.json | 2 +- starters/apps/base-wweb-mysql/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/starters/apps/base-twilio-memory/package.json b/starters/apps/base-twilio-memory/package.json index b2c29e1..b2448c8 100644 --- a/starters/apps/base-twilio-memory/package.json +++ b/starters/apps/base-twilio-memory/package.json @@ -4,7 +4,7 @@ "description": "", "main": "app.js", "scripts": { - "pre-copy": "cd .. && yarn run copy.lib example-app-base", + "pre-copy": "cd .. && yarn run copy.lib base-twilio-memory", "start": "node app.js" }, "keywords": [], diff --git a/starters/apps/base-twilio-mongo/package.json b/starters/apps/base-twilio-mongo/package.json index b2c29e1..a4b841e 100644 --- a/starters/apps/base-twilio-mongo/package.json +++ b/starters/apps/base-twilio-mongo/package.json @@ -4,7 +4,7 @@ "description": "", "main": "app.js", "scripts": { - "pre-copy": "cd .. && yarn run copy.lib example-app-base", + "pre-copy": "cd .. && yarn run copy.lib base-twilio-mongo", "start": "node app.js" }, "keywords": [], diff --git a/starters/apps/base-twilio-mysql/package.json b/starters/apps/base-twilio-mysql/package.json index b2c29e1..870ed85 100644 --- a/starters/apps/base-twilio-mysql/package.json +++ b/starters/apps/base-twilio-mysql/package.json @@ -4,7 +4,7 @@ "description": "", "main": "app.js", "scripts": { - "pre-copy": "cd .. && yarn run copy.lib example-app-base", + "pre-copy": "cd .. && yarn run copy.lib base-twilio-mysql", "start": "node app.js" }, "keywords": [], diff --git a/starters/apps/base-wweb-memory/package.json b/starters/apps/base-wweb-memory/package.json index b2c29e1..b009b4f 100644 --- a/starters/apps/base-wweb-memory/package.json +++ b/starters/apps/base-wweb-memory/package.json @@ -4,7 +4,7 @@ "description": "", "main": "app.js", "scripts": { - "pre-copy": "cd .. && yarn run copy.lib example-app-base", + "pre-copy": "cd .. && yarn run copy.lib base-wweb-memory", "start": "node app.js" }, "keywords": [], diff --git a/starters/apps/base-wweb-mongo/package.json b/starters/apps/base-wweb-mongo/package.json index b2c29e1..a805681 100644 --- a/starters/apps/base-wweb-mongo/package.json +++ b/starters/apps/base-wweb-mongo/package.json @@ -4,7 +4,7 @@ "description": "", "main": "app.js", "scripts": { - "pre-copy": "cd .. && yarn run copy.lib example-app-base", + "pre-copy": "cd .. && yarn run copy.lib base-wweb-mongo", "start": "node app.js" }, "keywords": [], diff --git a/starters/apps/base-wweb-mysql/package.json b/starters/apps/base-wweb-mysql/package.json index b2c29e1..f24129b 100644 --- a/starters/apps/base-wweb-mysql/package.json +++ b/starters/apps/base-wweb-mysql/package.json @@ -4,7 +4,7 @@ "description": "", "main": "app.js", "scripts": { - "pre-copy": "cd .. && yarn run copy.lib example-app-base", + "pre-copy": "cd .. && yarn run copy.lib base-wweb-mysql", "start": "node app.js" }, "keywords": [], From 08e2552907c48cfeaac843457a18bf2032e6f8aa Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Sun, 11 Dec 2022 05:55:31 -0600 Subject: [PATCH 03/23] fix: pre-copy fix --- starters/apps/base/README.md | 12 ------- starters/apps/base/app.js | 28 ---------------- starters/apps/base/package.json | 16 ---------- starters/apps/basic/README.md | 12 ------- starters/apps/basic/app.js | 55 -------------------------------- starters/apps/basic/package.json | 16 ---------- 6 files changed, 139 deletions(-) delete mode 100644 starters/apps/base/README.md delete mode 100644 starters/apps/base/app.js delete mode 100644 starters/apps/base/package.json delete mode 100644 starters/apps/basic/README.md delete mode 100644 starters/apps/basic/app.js delete mode 100644 starters/apps/basic/package.json diff --git a/starters/apps/base/README.md b/starters/apps/base/README.md deleted file mode 100644 index f8e0e90..0000000 --- a/starters/apps/base/README.md +++ /dev/null @@ -1,12 +0,0 @@ -### BASE APP - -Este bot contiene un flujo basico en el cual una persona (cliente) escribe **"hola"** y el bot responde. -- Bienvenido a mi tienda -- Como puedo ayudarte? -- Tengo: Zapatos Bolsos etc.. - ------- -- [Discord](https://link.codigoencasa.com/DISCORD) -- [Twitter](https://twitter.com/leifermendez) -- [Youtube](https://www.youtube.com/watch?v=5lEMCeWEJ8o&list=PL_WGMLcL4jzWPhdhcUyhbFU6bC0oJd2BR) -- [Telegram](https://t.me/leifermendez) diff --git a/starters/apps/base/app.js b/starters/apps/base/app.js deleted file mode 100644 index 61a4bb0..0000000 --- a/starters/apps/base/app.js +++ /dev/null @@ -1,28 +0,0 @@ -const { - createBot, - createProvider, - createFlow, - addKeyword, -} = require('@bot-whatsapp/bot') - -const WebWhatsappProvider = require('@bot-whatsapp/provider/web-whatsapp') -const MockAdapter = require('@bot-whatsapp/database/mock') - -const flowPrincipal = addKeyword(['hola', 'ole', 'HOLA']) - .addAnswer('Bienvenido a mi tienda') - .addAnswer('Como puedo ayudarte?') - .addAnswer(['Tengo:', 'Zapatos', 'Bolsos', 'etc..']) - -const main = async () => { - const adapterDB = new MockAdapter() - const adapterFlow = createFlow([flowPrincipal]) - const adapterProvider = createProvider(WebWhatsappProvider) - - createBot({ - flow: adapterFlow, - provider: adapterProvider, - database: adapterDB, - }) -} - -main() diff --git a/starters/apps/base/package.json b/starters/apps/base/package.json deleted file mode 100644 index b2c29e1..0000000 --- a/starters/apps/base/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "bot-whatsapp-base", - "version": "1.0.0", - "description": "", - "main": "app.js", - "scripts": { - "pre-copy": "cd .. && yarn run copy.lib example-app-base", - "start": "node app.js" - }, - "keywords": [], - "dependencies": { - "whatsapp-web.js": "^1.18.3" - }, - "author": "", - "license": "ISC" -} diff --git a/starters/apps/basic/README.md b/starters/apps/basic/README.md deleted file mode 100644 index 98c9930..0000000 --- a/starters/apps/basic/README.md +++ /dev/null @@ -1,12 +0,0 @@ -### BASIC APP - -Este bot contiene un flujo basico en el cual una persona (cliente) escribe **"hola"** y el bot responde. - - -![](https://i.imgur.com/0z0G91w.png) - ------- -- [Discord](https://link.codigoencasa.com/DISCORD) -- [Twitter](https://twitter.com/leifermendez) -- [Youtube](https://www.youtube.com/watch?v=5lEMCeWEJ8o&list=PL_WGMLcL4jzWPhdhcUyhbFU6bC0oJd2BR) -- [Telegram](https://t.me/leifermendez) diff --git a/starters/apps/basic/app.js b/starters/apps/basic/app.js deleted file mode 100644 index 78d9132..0000000 --- a/starters/apps/basic/app.js +++ /dev/null @@ -1,55 +0,0 @@ -const { - createBot, - createProvider, - createFlow, - addKeyword, - addChild, -} = require('@bot-whatsapp/bot') - -const WebWhatsappProvider = require('@bot-whatsapp/provider/web-whatsapp') -const MockAdapter = require('@bot-whatsapp/database/mock') - -/** - * Declarando flujo hijo - */ - -const flowZapatos = addKeyword(['zapatos', 'ZAPATOS']) - .addAnswer('🤯 Veo que elegiste zapatos') - .addAnswer('Tengo muchos zapatos...bla bla') - -const flowBolsos = addKeyword(['bolsos', 'BOLSOS']) - .addAnswer('🙌 Veo que elegiste bolsos') - .addAnswer('Tengo muchos bolsos...bla bla') - -/** - * Declarando flujo principal - */ -const flowPrincipal = addKeyword(['hola', 'ole', 'HOLA']) - .addAnswer('Bienvenido a mi tienda') - .addAnswer('Como puedo ayudarte?') - .addAnswer(['Tengo:', 'Zapatos', 'Bolsos', 'etc..']) - .addAnswer('Escribe zapatos o bolsos') - .addAnswer( - 'esperando respuesta...', - { capture: true }, - (ctx) => { - console.log('Aqui puedes ver más info del usuario...') - console.log('Puedes enviar un mail, hook, etc..') - console.log(ctx) - }, - [...addChild(flowBolsos), ...addChild(flowZapatos)] - ) - -const main = async () => { - const adapterDB = new MockAdapter() - const adapterFlow = createFlow([flowPrincipal]) - const adapterProvider = createProvider(WebWhatsappProvider) - - createBot({ - flow: adapterFlow, - provider: adapterProvider, - database: adapterDB, - }) -} - -main() diff --git a/starters/apps/basic/package.json b/starters/apps/basic/package.json deleted file mode 100644 index baa6f3b..0000000 --- a/starters/apps/basic/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "bot-whatsapp-basic", - "version": "1.0.0", - "description": "", - "main": "app.js", - "scripts": { - "pre-copy": "cd .. && yarn run copy.lib example-app-basic", - "start": "node app.js" - }, - "keywords": [], - "dependencies": { - "whatsapp-web.js": "^1.18.3" - }, - "author": "", - "license": "ISC" -} From 7797c2b46133697e2a591adab2b67e66b34a1cfe Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 11 Dec 2022 20:59:28 +0100 Subject: [PATCH 04/23] fix(cli): :zap: update cli copy --- packages/cli/create-app/index.js | 6 +++--- packages/cli/interactive/index.js | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/cli/create-app/index.js b/packages/cli/create-app/index.js index ce6f199..c00fe5b 100644 --- a/packages/cli/create-app/index.js +++ b/packages/cli/create-app/index.js @@ -16,9 +16,9 @@ const copyFiles = async (from, to) => { * Copiar directorio con archivos * @param {*} templateName */ -const copyBaseApp = async (templateName = null) => { - const BASEP_APP_PATH_FROM = `${process.cwd()}/starters/apps/${templateName}` - const BASEP_APP_PATH_TO = `${process.cwd()}/${templateName}` +const copyBaseApp = async (templateName = null, rootDir = process.cwd()) => { + const BASEP_APP_PATH_FROM = `${rootDir}/starters/apps/${templateName}` + const BASEP_APP_PATH_TO = `${rootDir}/${templateName}` await copyFiles(BASEP_APP_PATH_FROM, BASEP_APP_PATH_TO) } diff --git a/packages/cli/interactive/index.js b/packages/cli/interactive/index.js index 6e30553..b6e6ee0 100644 --- a/packages/cli/interactive/index.js +++ b/packages/cli/interactive/index.js @@ -64,11 +64,6 @@ const startInteractive = async () => { // } // } - /** - * @deprecated - * Question - * @returns - */ // const cleanAllSession = async () => { // const answer = cleanTmp.toLowerCase() || 'n' // if (answer.includes('n')) return true From d3b8310180d2ad813733b1d18f2c32d7d947740a Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 11 Dec 2022 21:58:13 +0100 Subject: [PATCH 05/23] fix(cli): :zap: create-starter --- .gitignore | 2 +- packages/cli/create-app/index.js | 6 +- packages/cli/interactive/index.js | 65 ++++++++++--------- packages/cli/package.json | 3 +- packages/cli/rollup-cli.config.js | 9 ++- packages/create-bot-whatsapp/package.json | 2 +- .../rollup-create.config.js | 10 +-- 7 files changed, 51 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 606fd39..bb10ef4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /node_modules -/packages/create-bot-whatsapp/starters +/packages/*/starters /packages/*/node_modules /packages/*/dist /packages/*/docs/dist diff --git a/packages/cli/create-app/index.js b/packages/cli/create-app/index.js index c00fe5b..3890e7e 100644 --- a/packages/cli/create-app/index.js +++ b/packages/cli/create-app/index.js @@ -16,9 +16,9 @@ const copyFiles = async (from, to) => { * Copiar directorio con archivos * @param {*} templateName */ -const copyBaseApp = async (templateName = null, rootDir = process.cwd()) => { - const BASEP_APP_PATH_FROM = `${rootDir}/starters/apps/${templateName}` - const BASEP_APP_PATH_TO = `${rootDir}/${templateName}` +const copyBaseApp = async (fromDir = process.cwd(), toDir = process.cwd()) => { + const BASEP_APP_PATH_FROM = `${fromDir}` + const BASEP_APP_PATH_TO = `${toDir}` await copyFiles(BASEP_APP_PATH_FROM, BASEP_APP_PATH_TO) } diff --git a/packages/cli/interactive/index.js b/packages/cli/interactive/index.js index b6e6ee0..6eccea9 100644 --- a/packages/cli/interactive/index.js +++ b/packages/cli/interactive/index.js @@ -1,8 +1,25 @@ const prompts = require('prompts') -const { yellow, red } = require('kleur') +const { yellow, red, cyan } = require('kleur') const { copyBaseApp } = require('../create-app') +const { join } = require('path') +const { existsSync } = require('fs') const { checkNodeVersion, checkOs } = require('../check') +const bannerDone = () => { + console.log(``) + console.log( + cyan( + [ + `[Agradecimientos]: Este es un proyecto OpenSource, si tienes intenciones de colaborar puedes hacerlo:`, + `[😉] Comprando un cafe https://www.buymeacoffee.com/leifermendez`, + `[⭐] Dar estrella https://github.com/leifermendez/bot-whatsapp`, + `[🚀] Realizando mejoras en el codigo`, + ].join('\n') + ) + ) + console.log(``) +} + const startInteractive = async () => { const questions = [ { @@ -49,43 +66,29 @@ const startInteractive = async () => { } const response = await prompts(questions, { onCancel }) const { outDir = '', providerDb = [], providerWs = [] } = response - /** - * @deprecated - * Question - * @returns - */ - // const installOrUdpateDep = async () => { - // const answer = dependencies.toLowerCase() || 'n' - // if (answer.includes('n')) return true - // if (answer.includes('y')) { - // await installAll() - // return true - // } - // } - - // const cleanAllSession = async () => { - // const answer = cleanTmp.toLowerCase() || 'n' - // if (answer.includes('n')) return true - - // if (answer.includes('y')) { - // await cleanSession() - // return true - // } - // } - - /** - * Crear una app (copiar plantilla) - * @returns - */ const createApp = async (templateName = null) => { if (!templateName) throw new Error('TEMPLATE_NAME_INVALID: ', templateName) + + const possiblesPath = [ + join(__dirname, 'starters', 'apps', templateName), + join(__dirname, '..', 'starters', 'apps', templateName), + join(__dirname, '..', '..', 'starters', 'apps', templateName), + ] + const answer = outDir.toLowerCase() || 'n' if (answer.includes('n')) return true if (answer.includes('y')) { - await copyBaseApp(templateName) + const indexOfPath = possiblesPath.find((a) => existsSync(a)) + await copyBaseApp(indexOfPath, join(process.cwd(), templateName)) + console.log(``) + console.log(yellow(`cd ${templateName}`)) + console.log(yellow(`npm install`)) + console.log(yellow(`npm start`)) + console.log(``) + return outDir } } @@ -104,7 +107,6 @@ const startInteractive = async () => { ) process.exit(1) } - console.log(yellow(`'Deberia crer una carpeta en root/provider'`)) return answer } @@ -129,6 +131,7 @@ const startInteractive = async () => { const dbAdapter = await dbProvider() const NAME_DIR = ['base', providerAdapter, dbAdapter].join('-') await createApp(NAME_DIR) + bannerDone() } module.exports = { startInteractive } diff --git a/packages/cli/package.json b/packages/cli/package.json index e294213..9b15777 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.5-alpha.0", + "version": "0.0.14-alpha.0", "description": "", "main": "index.js", "devDependencies": { @@ -10,6 +10,7 @@ "kleur": "^4.1.5" }, "files": [ + "./starters/", "./lib/cli/bundle.cli.cjs" ], "bin": { diff --git a/packages/cli/rollup-cli.config.js b/packages/cli/rollup-cli.config.js index a28c560..597071b 100644 --- a/packages/cli/rollup-cli.config.js +++ b/packages/cli/rollup-cli.config.js @@ -1,5 +1,6 @@ const banner = require('../../config/banner.rollup.json') const commonjs = require('@rollup/plugin-commonjs') +const copy = require('rollup-plugin-copy') const { nodeResolve } = require('@rollup/plugin-node-resolve') const { join } = require('path') @@ -12,5 +13,11 @@ module.exports = { file: PATH, format: 'cjs', }, - plugins: [commonjs(), nodeResolve()], + plugins: [ + copy({ + targets: [{ src: 'starters/*', dest: join(__dirname, 'starters') }], + }), + commonjs(), + nodeResolve(), + ], } diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index c54f30a..360b928 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.14-alpha.0", + "version": "0.0.20-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/create-bot-whatsapp/rollup-create.config.js b/packages/create-bot-whatsapp/rollup-create.config.js index cc5eb34..9ba77ed 100644 --- a/packages/create-bot-whatsapp/rollup-create.config.js +++ b/packages/create-bot-whatsapp/rollup-create.config.js @@ -1,6 +1,6 @@ const banner = require('../../config/banner.rollup.json') const commonjs = require('@rollup/plugin-commonjs') -const copy = require('rollup-plugin-copy') + const { nodeResolve } = require('@rollup/plugin-node-resolve') const { join } = require('path') @@ -13,11 +13,5 @@ module.exports = { file: PATH, format: 'cjs', }, - plugins: [ - copy({ - targets: [{ src: 'starters/*', dest: join(__dirname, 'starters') }], - }), - commonjs(), - nodeResolve(), - ], + plugins: [commonjs(), nodeResolve()], } From 51466bf1c71b46e1559f655e08ab58baa4943c87 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 11 Dec 2022 22:09:29 +0100 Subject: [PATCH 06/23] ci(ci): :zap: push --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 017ec38..ccedbc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,6 +78,13 @@ jobs: - name: Release @bot-whatsapp/provider run: yarn node ./scripts/release.js --name=provider --version= --token="${{ secrets.NPM_TOKEN }}" + - name: Commit Versioning + run: | + git config --global user.name 'Leifer Mendez (githubaction)' + git config --global user.email 'leifermendez@users.noreply.github.com' + git commit -am "Update versioning" + git push + ############ UNIT TEST ############ test-unit: name: Unit Tests From decccb672afd74df6478cb3b82c77bc435341b7d Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 11 Dec 2022 22:10:42 +0100 Subject: [PATCH 07/23] ci(ci): :zap: push --- packages/bot/package.json | 2 +- packages/cli/package.json | 2 +- packages/create-bot-whatsapp/package.json | 2 +- packages/database/package.json | 2 +- packages/provider/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/bot/package.json b/packages/bot/package.json index 98eb9c7..c63bbc6 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.6-alpha.0", + "version": "0.0.8-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 9b15777..94335a9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.14-alpha.0", + "version": "0.0.15-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index 360b928..1fd5e99 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.20-alpha.0", + "version": "0.0.21-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index 0e088d5..eb760fa 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.5-alpha.0", + "version": "0.0.7-alpha.0", "description": "Esto es el conector a mysql, pg, mongo", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/packages/provider/package.json b/packages/provider/package.json index e3571f1..750b32f 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.11-alpha.0", + "version": "0.0.13-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], From 73ea7c0063755263f9410afee33a70c6cb3e3867 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 11 Dec 2022 22:16:09 +0100 Subject: [PATCH 08/23] ci(version): :zap: updated versions every packages --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ccedbc4..dee6b68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,7 +82,7 @@ jobs: run: | git config --global user.name 'Leifer Mendez (githubaction)' git config --global user.email 'leifermendez@users.noreply.github.com' - git commit -am "Update versioning" + git commit -am "ci(version): :zap: updated versions every packages" git push ############ UNIT TEST ############ From 0059a1e7fb2449c7ede7197ffc6dc391e3eafeda Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 11 Dec 2022 22:18:01 +0100 Subject: [PATCH 09/23] ci(version): :zap: updated versions every packages --- packages/bot/package.json | 2 +- packages/cli/package.json | 2 +- packages/create-bot-whatsapp/package.json | 2 +- packages/database/package.json | 2 +- packages/provider/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/bot/package.json b/packages/bot/package.json index c63bbc6..9678d76 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.8-alpha.0", + "version": "0.0.10-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 94335a9..55093bd 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.15-alpha.0", + "version": "0.0.17-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index 1fd5e99..d1e0206 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.21-alpha.0", + "version": "0.0.23-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index eb760fa..bbfd5da 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.7-alpha.0", + "version": "0.0.9-alpha.0", "description": "Esto es el conector a mysql, pg, mongo", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/packages/provider/package.json b/packages/provider/package.json index 750b32f..151c888 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.13-alpha.0", + "version": "0.0.15-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], From c7ff6b479468af3e8b32f601eed6c764dbd639bc Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 11 Dec 2022 22:26:29 +0100 Subject: [PATCH 10/23] ci(version): :zap: updated versions every packages --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dee6b68..2ccc31a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref }} - name: Setup Node uses: actions/setup-node@v3 From 255ba86506a764d5d2326143e4342130eb024aba Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Sun, 11 Dec 2022 22:31:21 +0100 Subject: [PATCH 11/23] ci(version): :zap: updated versions every packages --- packages/bot/package.json | 2 +- packages/cli/package.json | 2 +- packages/create-bot-whatsapp/package.json | 2 +- packages/database/package.json | 2 +- packages/provider/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/bot/package.json b/packages/bot/package.json index 9678d76..b8b809c 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.10-alpha.0", + "version": "0.0.12-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 55093bd..7e66448 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.17-alpha.0", + "version": "0.0.19-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index d1e0206..4b060de 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.23-alpha.0", + "version": "0.0.25-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index bbfd5da..a51f8ce 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.9-alpha.0", + "version": "0.0.11-alpha.0", "description": "Esto es el conector a mysql, pg, mongo", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/packages/provider/package.json b/packages/provider/package.json index 151c888..b121850 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.15-alpha.0", + "version": "0.0.17-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], From e48b29ed29961fe91eeeb23dd6c4e71e934e032e Mon Sep 17 00:00:00 2001 From: "Leifer Mendez (githubaction)" Date: Sun, 11 Dec 2022 21:35:22 +0000 Subject: [PATCH 12/23] ci(version): :zap: updated versions every packages --- packages/bot/package.json | 2 +- packages/cli/package.json | 2 +- packages/create-bot-whatsapp/bin/create.js | 0 packages/create-bot-whatsapp/package.json | 2 +- packages/database/package.json | 2 +- packages/provider/package.json | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 packages/create-bot-whatsapp/bin/create.js diff --git a/packages/bot/package.json b/packages/bot/package.json index b8b809c..c3c1819 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.12-alpha.0", + "version": "0.0.13-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 7e66448..274df2d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.19-alpha.0", + "version": "0.0.20-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/bin/create.js b/packages/create-bot-whatsapp/bin/create.js old mode 100644 new mode 100755 diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index 4b060de..4b54827 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.25-alpha.0", + "version": "0.0.26-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index a51f8ce..98786ba 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.11-alpha.0", + "version": "0.0.12-alpha.0", "description": "Esto es el conector a mysql, pg, mongo", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/packages/provider/package.json b/packages/provider/package.json index b121850..7c99889 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.17-alpha.0", + "version": "0.0.18-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], From aad129ea94933037d7eb68d53f7d0477aa41b8d2 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 00:31:06 +0100 Subject: [PATCH 13/23] Create FUNDING.yml --- .github/FUNDING.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..036c86e --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,9 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +custom: https://www.buymeacoffee.com/leifermendez From 8d897f824e27a55ca011163092a813a7e8f426af Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 10:46:02 +0100 Subject: [PATCH 14/23] fix(ci): :zap: github action --- .github/workflows/ci.yml | 16 ++++++---------- README.md | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ccc31a..f6d2725 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,12 +1,8 @@ name: BotWhatsapp CI on: - push: - branches: - - main pull_request: branches: - - main - dev jobs: @@ -80,12 +76,12 @@ jobs: - name: Release @bot-whatsapp/provider run: yarn node ./scripts/release.js --name=provider --version= --token="${{ secrets.NPM_TOKEN }}" - - name: Commit Versioning - run: | - git config --global user.name 'Leifer Mendez (githubaction)' - git config --global user.email 'leifermendez@users.noreply.github.com' - git commit -am "ci(version): :zap: updated versions every packages" - git push + - name: Commit Versioning & Push changes + uses: actions-js/push@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + message: 'ci(version): :zap: automatic - ${date} updated versions every packages' + branch: 'dev' ############ UNIT TEST ############ test-unit: diff --git a/README.md b/README.md index 854af44..a75b6be 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ -------- 🦊 Documentación: [https://bot-whatsapp.pages.dev/](https://bot-whatsapp.pages.dev/) Video como hacer PR: https://youtu.be/Lxt8Acob6aU - -- [ ] Evitar dependencias + +🚀 __Roadmap:__ [https://github.com/users/leifermendez/projects/4/views/1](https://github.com/users/leifermendez/projects/4/views/1) **Comunidad** From b465de55a0e511213d1a7760a74efa102172c85e Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 11:02:50 +0100 Subject: [PATCH 15/23] fix(ci): :zap: github action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6d2725..6701047 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} message: 'ci(version): :zap: automatic - ${date} updated versions every packages' - branch: 'dev' + branch: 'next-release' ############ UNIT TEST ############ test-unit: From 9ddf144244cd6877e7d26f576387814459f2befb Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 11:06:25 +0100 Subject: [PATCH 16/23] fix(ci): :zap: github action --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6701047..afd808d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,7 @@ on: pull_request: branches: - dev + - next-release jobs: ############ BUILD PACKAGE ############ @@ -38,6 +39,7 @@ jobs: release: name: Release runs-on: ubuntu-latest + if: github.head_ref == 'next-release' needs: - build-package steps: From dfced8c594e9175c81e837af359631ba055b7e1a Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 11:59:09 +0100 Subject: [PATCH 17/23] fix(ci): :zap: github action --- .github/workflows/ci.yml | 51 ------------------------------- .github/workflows/releases.yml | 56 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 51 deletions(-) create mode 100644 .github/workflows/releases.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afd808d..5309ac9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: pull_request: branches: - dev - - next-release jobs: ############ BUILD PACKAGE ############ @@ -35,56 +34,6 @@ jobs: - name: Build Eslint rules run: yarn lint:fix - ############ RELEASE ############ - release: - name: Release - runs-on: ubuntu-latest - if: github.head_ref == 'next-release' - needs: - - build-package - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref }} - - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: 16.x - cache: 'yarn' - registry-url: https://registry.npmjs.org/ - - - run: corepack enable - - - name: Install NPM Dependencies - run: yarn install --immutable --network-timeout 300000 - - - name: Build Package - run: yarn build - - - name: Release @bot-whatsapp/bot - run: yarn node ./scripts/release.js --name=bot --version= --token="${{ secrets.NPM_TOKEN }}" - - - name: Release @bot-whatsapp/cli - run: yarn node ./scripts/release.js --name=cli --version= --token="${{ secrets.NPM_TOKEN }}" - - - name: Release @bot-whatsapp/create-bot-whatsapp - run: yarn node ./scripts/release.js --name=create-bot-whatsapp --version= --token="${{ secrets.NPM_TOKEN }}" - - - name: Release @bot-whatsapp/database - run: yarn node ./scripts/release.js --name=database --version= --token="${{ secrets.NPM_TOKEN }}" - - - name: Release @bot-whatsapp/provider - run: yarn node ./scripts/release.js --name=provider --version= --token="${{ secrets.NPM_TOKEN }}" - - - name: Commit Versioning & Push changes - uses: actions-js/push@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - message: 'ci(version): :zap: automatic - ${date} updated versions every packages' - branch: 'next-release' - ############ UNIT TEST ############ test-unit: name: Unit Tests diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml new file mode 100644 index 0000000..f56b98b --- /dev/null +++ b/.github/workflows/releases.yml @@ -0,0 +1,56 @@ +name: BotWhatsapp CI + +on: + pull_request: + branches: + - next-release + +jobs: + ############ RELEASE ############ + release: + name: Release + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.head_ref }} + persist-credentials: false + fetch-depth: 0 + + - name: Setup Node + uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + registry-url: https://registry.npmjs.org/ + + - run: corepack enable + + - name: Install NPM Dependencies + run: yarn install --immutable --network-timeout 300000 + + - name: Build Package + run: yarn build + + - name: Release @bot-whatsapp/bot + run: yarn node ./scripts/release.js --name=bot --version= --token="${{ secrets.NPM_TOKEN }}" + + - name: Release @bot-whatsapp/cli + run: yarn node ./scripts/release.js --name=cli --version= --token="${{ secrets.NPM_TOKEN }}" + + - name: Release @bot-whatsapp/create-bot-whatsapp + run: yarn node ./scripts/release.js --name=create-bot-whatsapp --version= --token="${{ secrets.NPM_TOKEN }}" + + - name: Release @bot-whatsapp/database + run: yarn node ./scripts/release.js --name=database --version= --token="${{ secrets.NPM_TOKEN }}" + + - name: Release @bot-whatsapp/provider + run: yarn node ./scripts/release.js --name=provider --version= --token="${{ secrets.NPM_TOKEN }}" + + - name: Commit Versioning & Push changes + uses: actions-js/push@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + message: 'ci(version): :zap: automatic - ${date} updated versions every packages' + branch: 'next-release' From 2ce342a0cb15019d5084ca06dc30e342b030ea10 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 12:10:15 +0100 Subject: [PATCH 18/23] fix(ci): :zap: github action --- packages/bot/package.json | 2 +- packages/cli/package.json | 2 +- packages/create-bot-whatsapp/package.json | 2 +- packages/database/package.json | 2 +- packages/provider/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/bot/package.json b/packages/bot/package.json index c3c1819..5e48152 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.13-alpha.0", + "version": "0.0.15-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 274df2d..c01f647 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.20-alpha.0", + "version": "0.0.22-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index 4b54827..8c16fb0 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.26-alpha.0", + "version": "0.0.28-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index 98786ba..fc31820 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.12-alpha.0", + "version": "0.0.14-alpha.0", "description": "Esto es el conector a mysql, pg, mongo", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/packages/provider/package.json b/packages/provider/package.json index 7c99889..4874821 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.18-alpha.0", + "version": "0.0.20-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], From 4142ca4fd552e7005f3b1397a76b90a2e574d19d Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 14:36:32 +0100 Subject: [PATCH 19/23] fix(ci): :zap: github action --- packages/provider/package.json | 2 +- scripts/release.js | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/packages/provider/package.json b/packages/provider/package.json index 4874821..bb1f21d 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.20-alpha.0", + "version": "0.0.19-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/scripts/release.js b/scripts/release.js index d72522e..9fbc820 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -82,6 +82,24 @@ const updateVersion = async (packageName = null, number = null) => { return { version: newVersion } } +const checkExistVersion = async (packageName = null, version = null) => { + try { + const pkgJson = join(PATH_PACKAGES, packageName) + const pkgJsonObject = readPackage(packageName) + const { stdout } = await cmd( + NPM_COMMAND, + ['view', `${pkgJsonObject.name}@${version}`], + { + stdio: 'inherit', + cwd: pkgJson, + } + ) + return true + } catch (e) { + return false + } +} + const packRelease = async (packageName) => { const pkgJson = join(PATH_PACKAGES, packageName) const { stdout } = await cmd(NPM_COMMAND, ['pack'], { @@ -108,14 +126,19 @@ const publishRelease = async (packageName, latest = null) => { const main = async () => { if (PKG_ARG) { + let EXIST_VERSION = true const tokenNpm = NPM_TOKEN ? NPM_TOKEN.split('=').at(1) : null const pkgName = PKG_ARG ? PKG_ARG.split('=').at(1) : null const pkgNumber = PKG_ARG_VERSION ? PKG_ARG_VERSION.split('=').at(1) : null if (tokenNpm) await npmToken(tokenNpm) - await updateVersion(pkgName, pkgNumber) - await packRelease(pkgName) + + while (EXIST_VERSION) { + const { version } = await updateVersion(pkgName, pkgNumber) + EXIST_VERSION = await checkExistVersion(pkgName, version) + console.log(`[${pkgName} - Version]: `, version, EXIST_VERSION) + } await publishRelease(pkgName, pkgNumber) } } From 7790391b5022b578d9ed4833a554d3d4c595b28b Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 14:43:38 +0100 Subject: [PATCH 20/23] ci(ci): :sparkles: releases action --- .github/workflows/ci.yml | 2 +- .github/workflows/releases.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5309ac9..aa05560 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: BotWhatsapp CI +name: BotWhatsapp Build-Test on: pull_request: diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index f56b98b..f1f74dd 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -1,7 +1,8 @@ -name: BotWhatsapp CI +name: BotWhatsapp Releases on: pull_request: + types: [closed] branches: - next-release @@ -10,6 +11,7 @@ jobs: release: name: Release runs-on: ubuntu-latest + if: github.event.pull_request.merged == 'true' steps: - name: Checkout uses: actions/checkout@v3 From 248d04b666f05fcf33a7494a9ccadfd9c52d9cc9 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 14:50:45 +0100 Subject: [PATCH 21/23] ci(ci): :sparkles: releases action --- .github/workflows/releases.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index f1f74dd..ee38d7d 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -1,8 +1,7 @@ name: BotWhatsapp Releases on: - pull_request: - types: [closed] + push: branches: - next-release @@ -11,7 +10,6 @@ jobs: release: name: Release runs-on: ubuntu-latest - if: github.event.pull_request.merged == 'true' steps: - name: Checkout uses: actions/checkout@v3 From 6a86da285183039395c30acc6a0de36f52c60b59 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 12 Dec 2022 14:55:40 +0100 Subject: [PATCH 22/23] ci(ci): :sparkles: releases action --- .github/workflows/releases.yml | 2 +- scripts/release.js | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index ee38d7d..ecaf98f 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -53,4 +53,4 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} message: 'ci(version): :zap: automatic - ${date} updated versions every packages' - branch: 'next-release' + branch: 'dev' diff --git a/scripts/release.js b/scripts/release.js index 9fbc820..9dfcc62 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -82,6 +82,12 @@ const updateVersion = async (packageName = null, number = null) => { return { version: newVersion } } +/** + * Revisar si la version nueva existe o no en npmjs + * @param {*} packageName + * @param {*} version + * @returns + */ const checkExistVersion = async (packageName = null, version = null) => { try { const pkgJson = join(PATH_PACKAGES, packageName) @@ -100,6 +106,11 @@ const checkExistVersion = async (packageName = null, version = null) => { } } +/** + * Empaquetar + * @param {*} packageName + * @returns + */ const packRelease = async (packageName) => { const pkgJson = join(PATH_PACKAGES, packageName) const { stdout } = await cmd(NPM_COMMAND, ['pack'], { @@ -109,6 +120,12 @@ const packRelease = async (packageName) => { return stdout } +/** + * Lanzar release + * @param {*} packageName + * @param {*} latest + * @returns + */ const publishRelease = async (packageName, latest = null) => { const args = !latest ? ['--tag', 'dev'] : ['--access', 'public'] const pkgJson = join(PATH_PACKAGES, packageName) @@ -124,6 +141,9 @@ const publishRelease = async (packageName, latest = null) => { * Recibe los argumentos entrantes */ +/** + * Init + */ const main = async () => { if (PKG_ARG) { let EXIST_VERSION = true @@ -139,6 +159,7 @@ const main = async () => { EXIST_VERSION = await checkExistVersion(pkgName, version) console.log(`[${pkgName} - Version]: `, version, EXIST_VERSION) } + await packRelease(pkgName) await publishRelease(pkgName, pkgNumber) } } From 10098f018f022e5a14e6214abd0da3f490d57334 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 12 Dec 2022 14:02:54 +0000 Subject: [PATCH 23/23] ci(version): :zap: automatic - ${date} updated versions every packages --- packages/bot/package.json | 2 +- packages/cli/package.json | 2 +- packages/create-bot-whatsapp/package.json | 2 +- packages/database/package.json | 2 +- packages/provider/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/bot/package.json b/packages/bot/package.json index 5e48152..2a9a35c 100644 --- a/packages/bot/package.json +++ b/packages/bot/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/bot", - "version": "0.0.15-alpha.0", + "version": "0.0.18-alpha.0", "description": "", "main": "./lib/bundle.bot.cjs", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index c01f647..06bb8ae 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/cli", - "version": "0.0.22-alpha.0", + "version": "0.0.25-alpha.0", "description": "", "main": "index.js", "devDependencies": { diff --git a/packages/create-bot-whatsapp/package.json b/packages/create-bot-whatsapp/package.json index 8c16fb0..83665e5 100644 --- a/packages/create-bot-whatsapp/package.json +++ b/packages/create-bot-whatsapp/package.json @@ -1,6 +1,6 @@ { "name": "create-bot-whatsapp", - "version": "0.0.28-alpha.0", + "version": "0.0.31-alpha.0", "description": "", "main": "./lib/bundle.create-bot-whatsapp.cjs", "files": [ diff --git a/packages/database/package.json b/packages/database/package.json index fc31820..5ac3692 100644 --- a/packages/database/package.json +++ b/packages/database/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/database", - "version": "0.0.14-alpha.0", + "version": "0.0.17-alpha.0", "description": "Esto es el conector a mysql, pg, mongo", "main": "./lib/mock/index.cjs", "keywords": [], diff --git a/packages/provider/package.json b/packages/provider/package.json index bb1f21d..4b01f03 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -1,6 +1,6 @@ { "name": "@bot-whatsapp/provider", - "version": "0.0.19-alpha.0", + "version": "0.0.23-alpha.0", "description": "Esto es el conector a Twilio, Meta, etc...", "main": "./lib/mock/index.cjs", "keywords": [],