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

🔖 Prepare latest release #1296

Merged
merged 45 commits into from
Apr 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
2d3574c
Merge pull request #4 from jovotech/v4/latest
ngocht Dec 2, 2021
a493471
Merge branch 'jovotech:v4/latest' into v4/latest
fbublitz Dec 17, 2021
5245f2a
Merge branch 'jovotech:v4/latest' into v4/latest
ngocht Jan 5, 2022
23c39d2
Merge branch 'jovotech:v4/latest' into v4/latest
ngocht Jan 20, 2022
7e18941
Merge branch 'jovotech:v4/latest' into v4/latest
fbublitz Jan 21, 2022
61e7f0f
Merge branch 'jovotech:v4/latest' into v4/latest
ngocht Feb 18, 2022
016a3fb
Merge remote-tracking branch 'upstream/v4/latest' into v4/latest
rubenaeg Mar 24, 2022
896a8d5
:sparkles: Allow access of nlu properties
rubenaeg Mar 30, 2022
e9b0cba
fix google assistant capability
kouz75 Apr 3, 2022
c7adde6
:recycle: Prioritize root properties
rubenaeg Apr 13, 2022
faf232f
fix google assistant capability
kouz75 Apr 14, 2022
a423b4d
:fire: Remove overriding getInput() in CoreRequest
rubenaeg Apr 19, 2022
9cb769d
📝 Add notes about manual project creation
Apr 20, 2022
09edaa8
💡 Update links in server comments
Apr 20, 2022
b9f74b6
📝 Fix link
Apr 20, 2022
413e3ef
:bookmark: Publish
aswetlow Apr 20, 2022
0ac7a14
add unit
kouz75 Apr 20, 2022
ebe00cd
fix linter
kouz75 Apr 21, 2022
d38bbc3
📝 Update AWS Lambda docs with function URLs
Apr 21, 2022
223df9d
📝 Improve DynamoDB docs
Apr 21, 2022
4dd6eb7
Merge remote-tracking branch 'origin/v4/dev' into v4/docs/smaller-fixes
Apr 21, 2022
055422f
Merge remote-tracking branch 'origin/v4/dev' into v4/docs/smaller-fixes
Apr 21, 2022
2382ca1
Merge branch 'v4/dev' of https://github.com/jovotech/jovo-framework i…
aswetlow Apr 21, 2022
76cc3e4
:sparkles: Add LinkAccountCardOutput
rmtuckerphx Apr 23, 2022
67fd4fb
Allow message param
rmtuckerphx Apr 23, 2022
2ff5d57
Merge branch 'v4/dev' of https://github.com/jovotech/jovo-framework i…
aswetlow Apr 25, 2022
690a514
✨ Add Google Assistant example
Apr 25, 2022
45b5c8d
🐛 Fix invocation name overrides
Apr 25, 2022
31379d0
🔀 Merge pull request #1288 from jovotech/v4/docs/smaller-fixes
Apr 25, 2022
d057287
🔀 Merge pull request #1271 from die-lautmaler/fix/input-nlu-access
Apr 25, 2022
467d0de
📝 Add request section with `getUnit` reference
Apr 25, 2022
bdfc1e5
🔀 Merge pull request #1286 from kouz75/v4/feature/alexa-unit
Apr 25, 2022
376f034
Merge remote-tracking branch 'jovo/v4/dev' into google_assistant_capa…
Apr 25, 2022
5f228c1
📝 Fix docs
Apr 25, 2022
6379cac
🔀 Merge pull request #1274 from shirkalab/google_assistant_capability
Apr 25, 2022
d5339f3
🔀 Merge pull request #1293 from jovotech/v4/bugfix/googleassistant-in…
Apr 25, 2022
f4f8566
Merge branch 'v4/dev' of https://github.com/jovotech/jovo-framework i…
aswetlow Apr 25, 2022
b4e792b
📝 Add Account Linking docs for Alexa
Apr 25, 2022
b0f940b
🔀 Merge pull request #1291 from rmtuckerphx/feature/linkaccountcard
Apr 25, 2022
0e8cd47
Merge branch 'v4/dev' of https://github.com/jovotech/jovo-framework i…
aswetlow Apr 25, 2022
7e594d5
:construction_worker: Update publish npm script
aswetlow Apr 25, 2022
568b0a0
:construction_worker: Add gitmoji to commit message
aswetlow Apr 25, 2022
067e34d
Merge pull request #1294 from jovotech/v4/improvements/cicd
aswetlow Apr 25, 2022
607ff09
:bug: Make button property optional #1272
aswetlow Apr 25, 2022
501cb71
Merge pull request #1295 from jovotech/v4/fix/google-assistant-types
aswetlow Apr 25, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:

- run: |
git add .
git commit -m "Release ${{env.RELEASE_VERSION}}"
git commit -m ":bookmark: Release ${{env.RELEASE_VERSION}}"
git push --set-upstream origin v4/latest

- run: npm run publishPackages
Expand Down
18 changes: 18 additions & 0 deletions examples/typescript/googleassistant/basic/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
root: true,
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
parserOptions: {
ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
sourceType: 'module', // Allows for the use of imports
},
extends: [
'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
'prettier/@typescript-eslint', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
'plugin:prettier/recommended', // Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
},
};
5 changes: 5 additions & 0 deletions examples/typescript/googleassistant/basic/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules/
db/
bundle/
bundle.zip
.env
434 changes: 434 additions & 0 deletions examples/typescript/googleassistant/basic/CHANGELOG.md

Large diffs are not rendered by default.

201 changes: 201 additions & 0 deletions examples/typescript/googleassistant/basic/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright {yyyy} {name of copyright owner}

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
57 changes: 57 additions & 0 deletions examples/typescript/googleassistant/basic/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# Jovo Template: Hello World

This template contains a Jovo Sample Voice App with a simple "Hello World!" greeting, asking for the user's name and returning a personalised message. This is the default template for the `jovo new` command.

## Quick Start

To use the Jovo Templates, you'll need the Jovo CLI. You can install it globally with NPM.

```sh
$ npm install -g jovo-cli
```

After successfully installing the Jovo CLI, you can install the template using one of the following commands:

```sh
$ jovo new <directory>

## Alternative
$ jovo new <directory> --template basic
```

> Read more about `jovo new` [here](https://www.jovo.tech/marketplace/jovo-cli#jovo-new).

Change your working directory into your newly created project directory and run your voice app:

```sh
# Change working directory to your previously specified directory.
$ cd <directory>

# Install dependencies.
$ npm install

# Run voice app, optionally with a --watch flag to restart on code changes.
$ jovo run [-w]
```

> Read more about `jovo run` [here](https://www.jovo.tech/marketplace/jovo-cli#jovo-run).

If you now go to the [Jovo Debugger](https://www.jovo.tech/marketplace/jovo-plugin-debugger) by pressing `.` or clicking on the webhook url in the terminal, you can test your voice application right away.

![Debugger Example](./img/debugger.gif)

## Next Steps

Now that you got the template running on the Jovo Debugger, it is time to deploy your voice app! You can find a tutorial for building a complete Alexa skill [here](https://www.jovo.tech/tutorials/alexa-skill-tutorial-nodejs).

To see what else you can do with the Jovo Framework, take a look at the [Jovo Documentation](https://www.jovo.tech/docs/).

## About Jovo

Jovo is the most popular development framework for voice, including platforms like Alexa, Google Assistant, mobile apps, and Raspberry Pi.

- [Jovo Website](https://jovo.tech/)
- [Documentation](https://jovo.tech/docs/)
- [Marketplace](https://www.jovo.tech/marketplace/)
- [Twitter](https://twitter.com/jovotech/)
- [Forum](https://community.jovo.tech/)
4 changes: 4 additions & 0 deletions examples/typescript/googleassistant/basic/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
};
28 changes: 28 additions & 0 deletions examples/typescript/googleassistant/basic/jovo.debugger.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
const { DebuggerConfig } = require('@jovotech/plugin-debugger');

const debuggerConfig = new DebuggerConfig({
locales: ['en'],
buttons: [
{
label: 'LAUNCH',
input: {
type: 'LAUNCH',
},
},
{
label: 'Yes',
input: {
intent: 'YesIntent',
},
},
{
label: 'No',
input: {
intent: 'NoIntent',
},
},
// ...
],
});

module.exports = debuggerConfig;
22 changes: 22 additions & 0 deletions examples/typescript/googleassistant/basic/jovo.project.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
const { ProjectConfig } = require('@jovotech/cli-core');
const { GoogleAssistantCli } = require('@jovotech/platform-googleassistant');

/*
|--------------------------------------------------------------------------
| JOVO PROJECT CONFIGURATION
|--------------------------------------------------------------------------
|
| Information used by the Jovo CLI to build and deploy projects
| Learn more here: www.jovo.tech/docs/project-config
|
*/
const project = new ProjectConfig({
endpoint: '${JOVO_WEBHOOK_URL}',
plugins: [
new GoogleAssistantCli({
projectId: '<yourProjectId>',
}),
],
});

module.exports = project;
17 changes: 17 additions & 0 deletions examples/typescript/googleassistant/basic/models/en.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"invocation": "my test app",
"intents": [
{
"name": "HelloWorldIntent",
"phrases": ["hi", "hello", "say hello", "say hello world"]
},
{
"name": "YesIntent",
"phrases": ["yes", "yes please", "sure"]
},
{
"name": "NoIntent",
"phrases": ["no", "no thanks"]
}
]
}
Loading