From 9178bc083ec33a31775e55376c9b3108bf83d218 Mon Sep 17 00:00:00 2001 From: Leifer Mendez Date: Mon, 14 Nov 2022 19:44:58 +0100 Subject: [PATCH] fix rollup --- package.json | 10 +++--- packages/bot/index.js | 10 ++++++ packages/bot/rollup-bot.config.js | 2 +- packages/cli/rollup-cli.config.js | 2 +- packages/database/rollup-cli.config.js | 2 +- packages/provider/index.js | 11 ------- packages/provider/package.json | 7 ++--- packages/provider/rollup-provider.config.js | 34 +++++++++++++++------ 8 files changed, 45 insertions(+), 33 deletions(-) delete mode 100644 packages/provider/index.js diff --git a/package.json b/package.json index 16273ce..20f2228 100644 --- a/package.json +++ b/package.json @@ -4,17 +4,17 @@ "description": "Bot de wahtsapp open source para MVP o pequeños negocios", "main": "app.js", "private": true, + "type": "module", "scripts": { - "cli:rollup": "rollup ./packages/cli/index.js --config ./packages/cli/rollup-cli.config.js ", - "io:rollup": "rollup ./packages/io/index.js --config ./packages/io/rollup-cli.config.js", - "bot:rollup": "rollup ./packages/bot/index.js --config ./packages/bot/rollup-bot.config.js", - "provider:rollup": "rollup ./packages/provider/index.js --config ./packages/provider/rollup-provider.config.js", + "cli:rollup": "rollup --config ./packages/cli/rollup-cli.config.js ", + "bot:rollup": "rollup --config ./packages/bot/rollup-bot.config.js", + "provider:rollup": "rollup --config ./packages/provider/rollup-provider.config.js ", "database:rollup": "rollup ./packages/database/index.js --config ./packages/database/rollup-cli.config.js", "format:check": "prettier --check ./packages", "format:write": "prettier --write ./packages", "lint:check": "eslint ./packages", "lint:fix": "eslint --fix ./packages", - "build": "yarn run cli:rollup && yarn run io:rollup && yarn run core:rollup && yarn run provider:rollup && yarn run database:rollup", + "build": "yarn run cli:rollup && yarn run bot:rollup && yarn run provider:rollup && yarn run database:rollup", "link.dist": "", "test.unit": "node ./node_modules/uvu/bin.js packages test", "test.e2e": "node ./node_modules/uvu/bin.js __tests__ test", diff --git a/packages/bot/index.js b/packages/bot/index.js index 5c2d675..0cfafe9 100644 --- a/packages/bot/index.js +++ b/packages/bot/index.js @@ -20,9 +20,19 @@ const createFlow = (args) => { return new FlowClass(args) } +/** + * Crear instancia de clase Provider + * @param {*} args + * @returns + */ +const createProvider = (args) => { + return new FlowClass(args) +} + module.exports = { createBot, createFlow, + createProvider, addKeyword, addAnswer, ProviderClass, diff --git a/packages/bot/rollup-bot.config.js b/packages/bot/rollup-bot.config.js index 97dc00c..0af60e4 100644 --- a/packages/bot/rollup-bot.config.js +++ b/packages/bot/rollup-bot.config.js @@ -5,7 +5,7 @@ const { join } = require('path') const PATH = join(__dirname, 'lib', 'bundle.bot.cjs') module.exports = { - input: 'index.js', + input: join(__dirname, 'index.js'), output: { file: PATH, format: 'cjs', diff --git a/packages/cli/rollup-cli.config.js b/packages/cli/rollup-cli.config.js index 818a8d1..047909c 100644 --- a/packages/cli/rollup-cli.config.js +++ b/packages/cli/rollup-cli.config.js @@ -5,7 +5,7 @@ const { join } = require('path') const PATH = join(__dirname, 'lib', 'cli', 'bundle.cli.cjs') module.exports = { - input: 'index.js', + input: join(__dirname, 'index.js'), output: { file: PATH, format: 'cjs', diff --git a/packages/database/rollup-cli.config.js b/packages/database/rollup-cli.config.js index fa39873..d3edda3 100644 --- a/packages/database/rollup-cli.config.js +++ b/packages/database/rollup-cli.config.js @@ -5,7 +5,7 @@ const { join } = require('path') const PATH = join(__dirname, 'lib', 'database', 'bundle.database.cjs') module.exports = { - input: 'index.js', + input: join(__dirname, 'index.js'), output: { file: PATH, format: 'cjs', diff --git a/packages/provider/index.js b/packages/provider/index.js deleted file mode 100644 index c4f5cb8..0000000 --- a/packages/provider/index.js +++ /dev/null @@ -1,11 +0,0 @@ -const MockProvider = require('./mock') -const WebWhatsappProvider = require('./web-whatsapp') -const TwilioProvider = require('./twilio') -const { ProviderClass } = require('@bot-whatsapp/bot') - -module.exports = { - WebWhatsappProvider, - MockProvider, - TwilioProvider, - ProviderClass, -} diff --git a/packages/provider/package.json b/packages/provider/package.json index a3f5514..9e66586 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -2,7 +2,7 @@ "name": "@bot-whatsapp/provider", "version": "0.0.1", "description": "Esto es el conector a Twilio, Meta, etc...", - "main": "./lib/bundle.provider.cjs", + "main": "./lib/bundle.mock.cjs", "private": true, "scripts": { "test.unit": "cross-env NODE_ENV=test node ../../node_modules/uvu/bin.js tests" @@ -15,9 +15,6 @@ "qr-image": "^3.2.0" }, "files": [ - "./lib/bundle.provider.cjs", - "./mock/*", - "./twilio/*", - "./web-whatsapp/*" + "./lib/*" ] } diff --git a/packages/provider/rollup-provider.config.js b/packages/provider/rollup-provider.config.js index 7cd6346..0fecae0 100644 --- a/packages/provider/rollup-provider.config.js +++ b/packages/provider/rollup-provider.config.js @@ -1,13 +1,29 @@ const { join } = require('path') const commonjs = require('@rollup/plugin-commonjs') -const PATH = join(__dirname, 'lib', 'bundle.provider.cjs') - -module.exports = { - input: 'index.js', - output: { - file: PATH, - format: 'cjs', +module.exports = [ + { + input: join(__dirname, 'web-whatsapp', 'index.js'), + output: { + file: join(__dirname, 'lib', 'bundle.web-whatsapp.cjs'), + format: 'cjs', + }, + plugins: [commonjs()], }, - plugins: [commonjs()], -} + { + input: join(__dirname, 'twilio', 'index.js'), + output: { + file: join(__dirname, 'lib', 'bundle.twilio.cjs'), + format: 'cjs', + }, + plugins: [commonjs()], + }, + { + input: join(__dirname, 'mock', 'index.js'), + output: { + file: join(__dirname, 'lib', 'bundle.mock.cjs'), + format: 'cjs', + }, + plugins: [commonjs()], + }, +]