Merge branch 'master' into dev

This commit is contained in:
rca 2024-07-16 05:35:16 +09:00
commit 1be3c2fbcd
9 changed files with 29 additions and 158 deletions

File diff suppressed because one or more lines are too long

1
lambda/index.js.map Normal file
View File

@ -0,0 +1 @@
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

View File

@ -1,16 +1 @@
{
"name": "@amzn/hello-world",
"version": "1.2.0",
"description": "alexa utility for quickly building skills",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "Amazon Alexa",
"license": "Apache License",
"dependencies": {
"ask-sdk-core": "^2.7.0",
"ask-sdk-model": "^1.19.0",
"aws-sdk": "^2.326.0"
}
}
{"name":"@amzn/hello-world","description":"alexa utility for quickly building skills","version":"1.2.0","main":"index.js","license":"Apache License","dependencies":{"@types/node":"^20.14.10","@types/webpack":"^5.28.5","@types/webpack-node-externals":"^3.0.4","ask-sdk-core":"^2.7.0","ask-sdk-model":"^1.19.0","aws-sdk":"^2.326.0","pjson":"^1.0.9","ts-loader":"^9.5.1","ts-node":"^10.9.2","typescript":"^5.5.3","webpack":"^5.93.0","webpack-cli":"^5.1.4","webpack-node-externals":"^3.0.0"}}

View File

@ -0,0 +1,13 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
const pjson_1 = require("pjson");
const packageJson = {
name: pjson_1.name,
description: pjson_1.description,
version: pjson_1.version,
main: pjson_1.main,
license: pjson_1.license,
dependencies: pjson_1.dependencies,
};
console.log(JSON.stringify(packageJson));
//# sourceMappingURL=gen-package-json.js.map

View File

@ -0,0 +1 @@
{"version":3,"file":"gen-package-json.js","sourceRoot":"","sources":["../../src/tools/gen-package-json.ts"],"names":[],"mappings":";;AAAA,iCAOe;AACf,MAAM,WAAW,GAAG;IAChB,IAAI,EAAJ,YAAI;IACJ,WAAW,EAAX,mBAAW;IACX,OAAO,EAAP,eAAO;IACP,IAAI,EAAJ,YAAI;IACJ,OAAO,EAAP,eAAO;IACP,YAAY,EAAZ,oBAAY;CACf,CAAC;AACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC"}

12
package-lock.json generated
View File

@ -13,7 +13,6 @@
"@types/webpack": "^5.28.5",
"@types/webpack-node-externals": "^3.0.4",
"ask-sdk-core": "^2.7.0",
"ask-sdk-dynamodb-persistence-adapter": "^2.14.0",
"ask-sdk-model": "^1.19.0",
"aws-sdk": "^2.326.0",
"pjson": "^1.0.9",
@ -454,17 +453,6 @@
"ask-sdk-model": "^1.29.0"
}
},
"node_modules/ask-sdk-dynamodb-persistence-adapter": {
"version": "2.14.0",
"resolved": "https://registry.npmjs.org/ask-sdk-dynamodb-persistence-adapter/-/ask-sdk-dynamodb-persistence-adapter-2.14.0.tgz",
"integrity": "sha512-ZEwZ/ijyzUy+U2/L/L3EtFSBbwg3oLqECW3DtWT5udigFnEAFGEtT7j9iQ3sQw1R2NdIE4R3c4ALH+sngWrZdQ==",
"dependencies": {
"aws-sdk": "^2.163.0"
},
"peerDependencies": {
"ask-sdk-core": "^2.0.0"
}
},
"node_modules/ask-sdk-model": {
"version": "1.86.0",
"resolved": "https://registry.npmjs.org/ask-sdk-model/-/ask-sdk-model-1.86.0.tgz",

View File

@ -4,7 +4,7 @@
"description": "alexa utility for quickly building skills",
"main": "index.js",
"scripts": {
"build": "webpack --config webpack.config.ts",
"build": "tsc",
"pjson": "ts-node ./src/tools/gen-package-json.ts > ./lambda/package.json",
"clean": "rm -rf ./lambda/*"
},
@ -15,7 +15,6 @@
"@types/webpack": "^5.28.5",
"@types/webpack-node-externals": "^3.0.4",
"ask-sdk-core": "^2.7.0",
"ask-sdk-dynamodb-persistence-adapter": "^2.14.0",
"ask-sdk-model": "^1.19.0",
"aws-sdk": "^2.326.0",
"pjson": "^1.0.9",

View File

@ -1,6 +1,4 @@
import Alexa from 'ask-sdk-core';
import AWS from 'aws-sdk';
import { DynamoDbPersistenceAdapter } from 'ask-sdk-dynamodb-persistence-adapter';
const LaunchRequestHandler = {
canHandle(handlerInput: Alexa.HandlerInput) {
@ -21,34 +19,12 @@ const HelloWorldIntentHandler = {
return Alexa.getRequestType(handlerInput.requestEnvelope) === 'IntentRequest'
&& Alexa.getIntentName(handlerInput.requestEnvelope) === 'HelloWorldIntent';
},
// async handle(handlerInput: Alexa.HandlerInput) {
//
// const attributesManager = handlerInput.attributesManager;
//
// const attributes = await attributesManager.getPersistentAttributes();
//
// if (attributes.counter === undefined) {
// attributes.counter = 0;
// } else {
// attributes.counter += 1;
// }
//
// attributesManager.setPersistentAttributes(attributes);
//
// const speakOutput = 'Hello World! You have invoked this skill ' + attributes.counter + ' times.';
//
// return handlerInput.responseBuilder
// .speak(speakOutput)
// //.reprompt('add a reprompt if you want to keep the session open for the user to respond')
// .getResponse();
// }
handle(handlerInput: Alexa.HandlerInput) {
const message = 'Hello World!';
const speakOutput = 'Hello World!';
return handlerInput.responseBuilder
.speak(message)
.speak(speakOutput)
//.reprompt('add a reprompt if you want to keep the session open for the user to respond')
.getResponse();
}
};
@ -171,12 +147,5 @@ exports.handler = Alexa.SkillBuilders.custom()
IntentReflectorHandler)
.addErrorHandlers(
ErrorHandler)
.withPersistenceAdapter(
new DynamoDbPersistenceAdapter({
tableName: process.env.DYNAMODB_PERSISTENCE_TABLE_NAME || 'kidshift-table',
createTable: false,
dynamoDBClient: new AWS.DynamoDB({ apiVersion: 'latest', region: process.env.DYNAMODB_PERSISTENCE_REGION })
})
)
.withCustomUserAgent('sample/hello-world/v1.2')
.lambda();

View File

@ -4,6 +4,7 @@
"lib": [
"es2017"
],
"outDir": "./lambda",
"module": "commonjs",
"moduleResolution": "node",
"strict": true,
@ -12,6 +13,7 @@
"preserveConstEnums": true,
"sourceMap": true
},
"include": ["src/**/*.ts", "src/*.ts"],
"exclude": [
"node_modules"
]