Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/audio-fix #663

Merged
merged 39 commits into from
Feb 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
94f9215
fix: :art: fix goto
leifermendez Feb 22, 2023
089075e
ci: remove yarn
leifermendez Feb 22, 2023
33626c1
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 22, 2023
ad00705
ci: remove yarn
leifermendez Feb 22, 2023
d91e769
ci: :zap: add cli netlify
leifermendez Feb 22, 2023
5e3bc6f
Merge branch 'feat/pnpm' of github.com:codigoencasa/bot-whatsapp into…
leifermendez Feb 22, 2023
236cdf6
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 22, 2023
40283ce
Merge pull request #655 from codigoencasa/feat/pnpm
leifermendez Feb 22, 2023
356378b
ci: :zap: add cli netlify
leifermendez Feb 22, 2023
a986d85
Merge branch 'feat/pnpm' of github.com:codigoencasa/bot-whatsapp into…
leifermendez Feb 22, 2023
444f83c
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 22, 2023
5acf827
Merge pull request #656 from codigoencasa/feat/pnpm
leifermendez Feb 22, 2023
be12ee4
ci: fix
leifermendez Feb 22, 2023
3c57e53
Merge branch 'feat/pnpm' of github.com:codigoencasa/bot-whatsapp into…
leifermendez Feb 22, 2023
7e2008a
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 22, 2023
4ea7a66
Merge pull request #657 from codigoencasa/feat/pnpm
leifermendez Feb 22, 2023
376d619
ci: fix
leifermendez Feb 23, 2023
76760c1
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 23, 2023
310ba6f
Merge pull request #658 from codigoencasa/feat/pnpm
leifermendez Feb 23, 2023
515700c
ci: fix
leifermendez Feb 23, 2023
72d5bb6
Merge branch 'feat/pnpm' of github.com:codigoencasa/bot-whatsapp into…
leifermendez Feb 23, 2023
8609f6b
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 23, 2023
98c3f8a
Merge pull request #659 from codigoencasa/feat/pnpm
leifermendez Feb 23, 2023
7e47caf
ci: fix
leifermendez Feb 23, 2023
03d2ea8
ci: fix
leifermendez Feb 23, 2023
c9f648b
Merge branch 'feat/pnpm' of github.com:codigoencasa/bot-whatsapp into…
leifermendez Feb 23, 2023
59dd0ff
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 23, 2023
a9f3b89
Merge pull request #660 from codigoencasa/feat/pnpm
leifermendez Feb 23, 2023
e1ae3b6
ci: fix
leifermendez Feb 23, 2023
b6796b7
Merge branch 'feat/pnpm' of github.com:codigoencasa/bot-whatsapp into…
leifermendez Feb 23, 2023
ffc4a5c
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 23, 2023
9220397
Feat/pnpm
leifermendez Feb 23, 2023
5b51427
ci: fix
leifermendez Feb 23, 2023
05977a1
Merge branch 'feat/pnpm' of github.com:codigoencasa/bot-whatsapp into…
leifermendez Feb 23, 2023
b30e0b6
Merge branch 'release/next' into feat/pnpm
leifermendez Feb 23, 2023
a0701af
fix: :bug: message npm audit
leifermendez Feb 23, 2023
ac06905
Merge branch 'feat/pnpm' of github.com:codigoencasa/bot-whatsapp into…
leifermendez Feb 23, 2023
d38deda
ci(hook): improve
leifermendez Feb 23, 2023
730c7ee
docs: :art: add algolia
leifermendez Feb 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/netlify-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
- run: corepack enable

- name: Install NPM Dependencies
run: pnpm install --immutable --network-timeout 300000
run: pnpm install --frozen-lockfile

- name: Add netlify
run: pnpm add netlify-cli -D
run: pnpm install netlify-cli -w

- name: Create .env build file
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/netlify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
- run: corepack enable

- name: Install NPM Dependencies
run: pnpm install --immutable --network-timeout 300000
run: pnpm install --frozen-lockfile

- name: Add netlify
run: pnpm add netlify-cli -D
run: pnpm install netlify-cli -w

- name: Create .env build file
run: |
Expand Down
63 changes: 47 additions & 16 deletions .github/workflows/releases-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:

jobs:
############ RELEASE ############
release:
name: Release
build:
name: Build DEV
runs-on: ubuntu-latest
outputs:
commit: ${{ steps.vars.outputs.commit }}
Expand Down Expand Up @@ -37,30 +37,61 @@ jobs:
- name: Build Package
run: pnpm build:full

- uses: actions/cache@v3
with:
path: ./packages
key: packages-key
release:
name: Release DEV
runs-on: ubuntu-latest
needs:
- build
outputs:
commit: ${{ steps.vars.outputs.commit }}
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{github.event.after}}
persist-credentials: false

- uses: pnpm/action-setup@v2.2.4

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 16.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

- run: corepack enable

- name: Install NPM Dependencies
run: pnpm install --frozen-lockfile

- uses: actions/cache@v3
with:
path: ./packages
key: packages-key

- name: Release @bot-whatsapp/bot
run: pnpm node ./scripts/release.js --name=bot --version= --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=bot --version= --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/cli
run: pnpm node ./scripts/release.js --name=cli --version= --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=cli --version= --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/create-bot-whatsapp
run: pnpm node ./scripts/release.js --name=create-bot-whatsapp --version= --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=create-bot-whatsapp --version= --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/database
run: pnpm node ./scripts/release.js --name=database --version= --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=database --version= --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/provider
run: pnpm node ./scripts/release.js --name=provider --version= --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=provider --version= --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/contexts
run: pnpm node ./scripts/release.js --name=contexts --version= --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=contexts --version= --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/portal
run: pnpm node ./scripts/release.js --name=portal --version= --token="${{ secrets.NPM_TOKEN }}"

- name: Commit & Push changes
uses: actions-js/push@master
with:
branch: release/next
github_token: ${{ secrets.GITHUB_TOKEN }}
force: true
run: node ./scripts/release.js --name=portal --version= --token="${{ secrets.NPM_TOKEN }}"
20 changes: 10 additions & 10 deletions .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
run: git config --global user.email "leifer.contacto@gmail.com" && git config --global user.name "Leifer Mendez"

- name: Install NPM Dependencies
run: pnpm install --immutable --network-timeout 300000
run: pnpm install --frozen-lockfile

- name: Set CHANGELOG
run: pnpm release
run: pnpm run release

- name: get-npm-version
id: package-version
Expand All @@ -46,28 +46,28 @@ jobs:
run: pnpm build:full

- name: Release @bot-whatsapp/bot
run: pnpm node ./scripts/release.js --name=bot --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=bot --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/cli
run: pnpm node ./scripts/release.js --name=cli --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=cli --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/create-bot-whatsapp
run: pnpm node ./scripts/release.js --name=create-bot-whatsapp --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=create-bot-whatsapp --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/database
run: pnpm node ./scripts/release.js --name=database --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=database --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/provider
run: pnpm node ./scripts/release.js --name=provider --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=provider --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/contexts
run: pnpm node ./scripts/release.js --name=contexts --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=contexts --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"

- name: Release @bot-whatsapp/portal
run: pnpm node ./scripts/release.js --name=portal --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"
run: node ./scripts/release.js --name=portal --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.NPM_TOKEN }}"

- name: Release Github
run: pnpm node ./scripts/github.js --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.OCTO_TOKEN }}"
run: node ./scripts/github.js --version="${{ steps.package-version.outputs.current-version}}" --token="${{ secrets.OCTO_TOKEN }}"

- name: Commit & Push changes
uses: actions-js/push@master
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/node_modules
/packages/repl
/packages/portal/server
/packages/*/starters
/packages/*/node_modules
/packages/*/dist
Expand Down
Empty file modified .husky/commit-msg
100755 → 100644
Empty file.
Empty file modified .husky/pre-commit
100755 → 100644
Empty file.
Empty file modified .husky/pre-push
100755 → 100644
Empty file.
6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"license": "ISC",
"devDependencies": {
"@commitlint/cli": "^17.4.4",
"@rollup/plugin-strip": "^3.0.2",
"@commitlint/config-conventional": "^17.4.4",
"@octokit/core": "^4.2.0",
"@rollup/plugin-commonjs": "^23.0.7",
Expand Down Expand Up @@ -90,8 +91,5 @@
"yarn": "please-use-pnpm",
"pnpm": ">=7.18.0"
},
"author": "Leifer Mendez <leifer.contacto@gmail.com>",
"dependencies": {
"@rollup/plugin-strip": "^3.0.2"
}
"author": "Leifer Mendez <leifer.contacto@gmail.com>"
}
5 changes: 4 additions & 1 deletion packages/bot/core/core.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,14 @@ class CoreClass {
event: 'auth_failure',
func: ({ instructions }) => printer(instructions, '⚡⚡ ERROR AUTH ⚡⚡'),
},

{
event: 'message',
func: (msg) => this.handleMsg(msg),
},
{
event: 'notice',
func: (note) => printer(note),
},
]

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/bot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bot-whatsapp/bot",
"version": "0.0.107-alpha.0",
"version": "0.0.111-alpha.0",
"description": "",
"main": "./lib/bundle.bot.cjs",
"scripts": {
Expand Down
8 changes: 7 additions & 1 deletion packages/bot/rollup-bot.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ module.exports = [
format: 'cjs',
sourcemap: true,
},
plugins: [strip(), commonjs(), nodeResolve()],
plugins: [
strip({
exclude: ['**/interactive.js'],
}),
commonjs(),
nodeResolve(),
],
},
]
1 change: 0 additions & 1 deletion packages/bot/utils/interactive.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const { yellow, bgRed } = require('kleur')
const NODE_ENV = process.env.NODE_ENV || 'dev'
const printer = (message, title) => {
if (NODE_ENV !== 'test') {
// console.clear()
if (title) console.log(bgRed(`${title}`))
console.log(yellow(Array.isArray(message) ? message.join('\n') : message))
console.log(``)
Expand Down
Empty file modified packages/cli/bin/cli.js
100755 → 100644
Empty file.
1 change: 0 additions & 1 deletion packages/cli/create-app/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const fs = require('fs-extra')

/**
* Copy files
*/
Expand Down
24 changes: 21 additions & 3 deletions packages/cli/interactive/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,31 @@ const { intro, outro, confirm, select, spinner, isCancel, cancel, note } = requi
const color = require('picocolors')

const { join } = require('path')
const { existsSync } = require('fs')
const { existsSync, readFileSync } = require('fs')
const { copyBaseApp } = require('../create-app')
const { checkNodeVersion, checkGit } = require('../check')

const PATH_BASE = join(process.cwd())

const pkgJson = () => {
const pkgJson = join(PATH_BASE, 'package.json')
const rawFile = readFileSync(pkgJson, 'utf-8')
return JSON.parse(rawFile)
}

const bannerDone = (templateName = '') => {
note(
[color.yellow(` cd ${templateName} `), color.yellow(` npm install `), color.yellow(` npm start `)].join('\n'),
[
color.yellow(` cd ${templateName} `),
color.yellow(` npm install `),
color.yellow(` npm start `),
``,
`📄 Documentación y Curso:`,
` https://bot-whatsapp.netlify.app`,
``,
`🤖 ¿Problemas? Únete:`,
` https://link.codigoencasa.com/DISCORD`,
].join('\n'),
'Instrucciones:'
)
}
Expand Down Expand Up @@ -50,7 +68,7 @@ const startInteractive = async () => {
console.clear()
console.log('')

intro(color.inverse(' instalador '))
intro(`Vamos a crear un ${color.bgBlue(' Chatbot ')} ✨ (${pkgJson().version})`)

const stepContinue = await confirm({
message: '¿Quieres continuar?',
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bot-whatsapp/cli",
"version": "0.0.72-alpha.0",
"version": "0.0.100-alpha.0",
"description": "",
"main": "index.js",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/contexts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bot-whatsapp/contexts",
"version": "0.0.16-alpha.0",
"version": "0.0.39-alpha.0",
"description": "",
"main": "./lib/bundle.contexts.cjs",
"files": [
Expand Down
Empty file modified packages/create-bot-whatsapp/bin/create.js
100755 → 100644
Empty file.
2 changes: 1 addition & 1 deletion packages/create-bot-whatsapp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-bot-whatsapp",
"version": "0.0.93-alpha.0",
"version": "0.0.116-alpha.0",
"description": "",
"main": "./lib/bundle.create-bot-whatsapp.cjs",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/database/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bot-whatsapp/database",
"version": "0.0.64-alpha.0",
"version": "0.0.86-alpha.0",
"description": "Esto es el conector a mysql, pg, mongo",
"main": "./lib/mock/index.cjs",
"keywords": [],
Expand Down
7 changes: 3 additions & 4 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,11 @@
"typescript": "4.8.4",
"vite": "3.2.4",
"vite-imagetools": "^4.0.11",
"vite-tsconfig-paths": "3.6.0"
"vite-tsconfig-paths": "3.6.0",
"@docsearch/react": "^3.3.3"

},
"engines": {
"node": ">=17.0.0"
},
"dependencies": {
"@docsearch/react": "^3.3.3"
}
}
1 change: 0 additions & 1 deletion packages/docs/src/integrations/react/docsearch.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

import { qwikify$ } from '@builder.io/qwik-react';
import { DocSearch } from '@docsearch/react';
import '@docsearch/css';
import { component$ } from '@builder.io/qwik';

export const DocSearch$ = qwikify$(DocSearch,{eagerness:'visible'});
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default component$(() => {
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="manifest" href="/manifest.json" />

<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@docsearch/css@3" />
<RouterHead />
<DarkThemeLauncher />
<Social />
Expand Down
43 changes: 0 additions & 43 deletions packages/docs/src/routes/react/index.tsx

This file was deleted.

4 changes: 0 additions & 4 deletions packages/portal/.vscode/extensions.json

This file was deleted.

Loading