Merge pull request #645 from Shreyas-vgr/2.0.x

docs: API docs generation fix.
alexa · Aug 18, 2020 · 16d7460 · 16d7460
2 parents 3703b4a + a115b58
commit 16d7460
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,5 +2,4 @@ dist/
 node_modules/
 typedoc/
 package-lock.json
-lerna-debug.log
-.DS_Store
+.DS_Store
diff --git a/.travis.yml b/.travis.yml
diff --git a/alexa-apis-for-nodejs b/alexa-apis-for-nodejs
diff --git a/ask-sdk-core/package.json b/ask-sdk-core/package.json
@@ -6,6 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
+    "compile": "tsc",
     "test": "cross-env TS_NODE_FILES=true mocha -r ts-node/register \"./tst/**/*.spec.ts\"",
     "lint": "eslint \"lib/**/*.{ts,tsx}\" \"tst/**/*.{ts,tsx}\"",
     "clean": "rm -rf ./dist",
@@ -38,24 +39,19 @@
     "@types/mocha": "^5.0.0",
     "@types/node": "^9.6.1",
     "@types/sinon": "^7.0.13",
-    "@typescript-eslint/eslint-plugin": "^3.3.0",
-    "@typescript-eslint/parser": "^3.3.0",
+    "@typescript-eslint/eslint-plugin": "^3.9.0",
+    "@typescript-eslint/parser": "^3.9.0",
     "ask-sdk-model": "^1.29.0",
     "chai": "^4.1.2",
     "cross-env": "^7.0.2",
     "del": "^3.0.0",
-    "eslint": "^7.2.0",
-    "eslint-config-airbnb-base": "^14.2.0",
-    "eslint-plugin-import": "^2.21.2",
-    "eslint-plugin-prefer-arrow": "^1.2.1",
+    "eslint": "^7.6.0",
     "eslint-plugin-tsdoc": "^0.2.6",
-    "gulp": "^4.0.0",
     "mocha": "^5.0.5",
     "nock": "^9.2.3",
     "nyc": "^14.1.1",
     "sinon": "^7.0.13",
     "ts-node": "^6.0.1",
-    "tslint": "^5.9.1",
     "typescript": "^3.5.3"
   },
   "repository": "github:alexa/alexa-skills-kit-sdk-for-nodejs",

diff --git a/ask-sdk-dynamodb-persistence-adapter/package.json b/ask-sdk-dynamodb-persistence-adapter/package.json
@@ -6,6 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
+    "compile": "tsc",
     "test": "cross-env TS_NODE_FILES=true mocha -r ts-node/register \"./tst/**/*.spec.ts\"",
     "lint": "eslint \"lib/**/*.{ts,tsx}\" \"tst/**/*.{ts,tsx}\"",
     "clean": "rm -rf ./dist",

diff --git a/ask-sdk-express-adapter/package.json b/ask-sdk-express-adapter/package.json
@@ -6,6 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
+    "compile": "tsc",
     "test": "cross-env TS_NODE_FILES=true mocha -r ts-node/register \"./tst/**/*.spec.ts\"",
     "lint": "eslint \"lib/**/*.{ts,tsx}\" \"tst/**/*.{ts,tsx}\"",
     "clean": "rm -rf ./dist",

diff --git a/ask-sdk-runtime/package.json b/ask-sdk-runtime/package.json
@@ -6,6 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
+    "compile": "tsc",
     "test": "cross-env TS_NODE_FILES=true mocha -r ts-node/register \"./tst/**/*.spec.ts\"",
     "lint": "eslint \"lib/**/*.{ts,tsx}\" \"tst/**/*.{ts,tsx}\"",
     "clean": "rm -rf ./dist",

diff --git a/ask-sdk-s3-persistence-adapter/package.json b/ask-sdk-s3-persistence-adapter/package.json
@@ -6,6 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
+    "compile": "tsc",
     "test": "cross-env TS_NODE_FILES=true mocha -r ts-node/register \"./tst/**/*.spec.ts\"",
     "lint": "eslint \"lib/**/*.{ts,tsx}\" \"tst/**/*.{ts,tsx}\"",
     "clean": "rm -rf ./dist",

diff --git a/ask-sdk-v1adapter/package.json b/ask-sdk-v1adapter/package.json
@@ -6,6 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
+    "compile": "tsc",
     "test": "cross-env TS_NODE_FILES=true mocha -r ts-node/register \"./tst/**/*.spec.ts\"",
     "lint": "eslint \"lib/**/*.{ts,tsx}\" \"tst/**/*.{ts,tsx}\"",
     "clean": "rm -rf ./dist",

diff --git a/ask-sdk/package.json b/ask-sdk/package.json
@@ -6,6 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
+    "compile": "tsc",
     "test": "cross-env TS_NODE_FILES=true mocha -r ts-node/register \"./tst/**/*.spec.ts\"",
     "lint": "eslint \"lib/**/*.{ts,tsx}\" \"tst/**/*.{ts,tsx}\"",
     "clean": "rm -rf ./dist",

diff --git a/ask-smapi-sdk/package.json b/ask-smapi-sdk/package.json
@@ -6,6 +6,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
+    "compile": "tsc",
     "test": "cross-env TS_NODE_FILES=true mocha -r ts-node/register \"./tst/**/*.spec.ts\"",
     "lint": "eslint \"lib/**/*.{ts,tsx}\" \"tst/**/*.{ts,tsx}\"",
     "clean": "rm -rf ./dist",

diff --git a/lerna.json b/lerna.json
@@ -6,7 +6,8 @@
     "ask-sdk-dynamodb-persistence-adapter",
     "ask-sdk-runtime",
     "ask-sdk-s3-persistence-adapter",
-    "ask-sdk-v1adapter"
+    "ask-sdk-v1adapter",
+    "ask-sdk-express-adapter"
   ],
   "command": {
     "bootstrap": {

diff --git a/package.json b/package.json
@@ -1,18 +1,15 @@
 {
 	"private": true,
 	"scripts": {
-		"lerna": "./node_modules/.bin/lerna",
-		"bootstrap": "npm run lerna -- bootstrap --hoist --nohoist=ts-node",
-		"gulp": "npm run lerna -- exec ./node_modules/.bin/gulp",
-		"tsc": "npm run gulp -- tsc",
-		"tslint": "npm run gulp -- tslint",
-		"test": "npm run gulp -- test",
-		"clean-build": "npm run gulp -- clean",
-		"clean-node_modules": "npm run lerna -- clean",
-		"clean-all": "npm run clean-build && npm run clean-node_modules"
+		"setup": "./node_modules/.bin/lerna exec npm install",
+		"bootstrap": "./node_modules/.bin/lerna bootstrap --force-local --hoist",
+		"compile": "./node_modules/.bin/lerna exec npm run compile",
+		"docs": "rm -rf ./alexa-sdk-node-typedoc && ./node_modules/.bin/typedoc --out alexa-sdk-node-typedoc"
 	},
 	"devDependencies": {
-		"lerna": "^3.16.4"
+		"lerna": "^3.16.4",
+		"typedoc": "^0.17.8",
+		"typescript": "^3.9.5"
 	},
 	"name": "alexa-skills-kit-sdk-for-nodejs"
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -19,7 +19,8 @@
     "ask-sdk-runtime/lib",
     "ask-sdk-s3-persistence-adapter/lib",
     "ask-sdk-v1adapter/lib",
-    "ask-sdk-express-adapter/lib"
+    "ask-sdk-express-adapter/lib",
+    "ask-smapi-sdk/lib"
   ],
   "exclude" : [
     "node_modules"