fix: fix the github action workflow and compilation making relative r…

…equire fail issue (#658)
alexa · Oct 8, 2020 · 895c88e · 895c88e
1 parent 148fad2
commit 895c88e
Show file tree

Hide file tree

Showing 39 changed files with 157 additions and 272 deletions.
diff --git a/.github/workflows/ask-sdk-core-unit-test.yml b/.github/workflows/ask-sdk-core-unit-test.yml
diff --git a/.github/workflows/ask-sdk-dynamodb-persistence-adapter-unit-test.yml b/.github/workflows/ask-sdk-dynamodb-persistence-adapter-unit-test.yml
diff --git a/.github/workflows/ask-sdk-express-adapter-unit-test.yml b/.github/workflows/ask-sdk-express-adapter-unit-test.yml
diff --git a/.github/workflows/ask-sdk-runtime-unit-test.yml b/.github/workflows/ask-sdk-runtime-unit-test.yml
diff --git a/.github/workflows/ask-sdk-s3-persistence-adapter-unit-test.yml b/.github/workflows/ask-sdk-s3-persistence-adapter-unit-test.yml
diff --git a/.github/workflows/ask-sdk-unit-test.yml b/.github/workflows/ask-sdk-unit-test.yml
@@ -4,17 +4,9 @@ on:
   push:
     branches:
       - 2.0.x
-    paths:
-      - 'ask-sdk/**'
   pull_request:
     branches:
       - 2.0.x
-    paths:
-      - 'ask-sdk/**'
-
-defaults:
-  run:
-    working-directory: ask-sdk
 
 jobs:
   build:
@@ -30,5 +22,6 @@ jobs:
       with:
         node-version: ${{ matrix.node }}
     - run: npm install
+    - run: npm run bootstrap
     - run: npm run build
     - run: npm run test
diff --git a/.github/workflows/ask-sdk-v1adapter-unit-test.yml b/.github/workflows/ask-sdk-v1adapter-unit-test.yml
diff --git a/ask-sdk-core/.eslintrc.json b/ask-sdk-core/.eslintrc.json
@@ -26,7 +26,7 @@
             "modules": true,
             "impliedStrict": true
         },
-        "project": "tsconfig.json"
+        "project": ["tsconfig.json", "tst/tsconfig.json"]
     },
     "rules": {
 

diff --git a/ask-sdk-core/package.json b/ask-sdk-core/package.json
@@ -2,8 +2,8 @@
   "name": "ask-sdk-core",
   "version": "2.9.0",
   "description": "Core package for Alexa Skills Kit SDK",
-  "main": "dist/lib/index.js",
-  "types": "dist/lib/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
     "compile": "tsc",

diff --git a/ask-sdk-core/tsconfig.json b/ask-sdk-core/tsconfig.json
@@ -1,17 +1,16 @@
 {
-    "compilerOptions": {
-      "target": "es2017",
-      "module": "commonjs",
-      "moduleResolution": "node",
-      "rootDir": "./",
-      "outDir" : "dist",
-      "sourceMap" : true,
-      "alwaysStrict" : true,
-      "declaration" : true,
-      "lib": []
-    },
-    "include": [
-      "lib",
-      "tst"
-    ]
-  }
+  "compilerOptions": {
+    "target": "es2017",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "rootDir": "./lib",
+    "outDir" : "dist",
+    "sourceMap" : true,
+    "alwaysStrict" : true,
+    "declaration" : true,
+    "lib": []
+  },
+  "include": [
+    "lib"
+  ]
+}
diff --git a/ask-sdk-core/tst/tsconfig.json b/ask-sdk-core/tst/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es2017",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "rootDir": "./",
+    "outDir" : "dist",
+    "sourceMap" : true,
+    "alwaysStrict" : true,
+    "declaration" : true,
+    "lib": []
+  }
+}
diff --git a/ask-sdk-dynamodb-persistence-adapter/.eslintrc.json b/ask-sdk-dynamodb-persistence-adapter/.eslintrc.json
@@ -26,7 +26,7 @@
             "modules": true,
             "impliedStrict": true
         },
-        "project": "tsconfig.json"
+        "project": ["tsconfig.json", "tst/tsconfig.json"]
     },
     "rules": {
 

diff --git a/ask-sdk-dynamodb-persistence-adapter/package.json b/ask-sdk-dynamodb-persistence-adapter/package.json
@@ -2,8 +2,8 @@
   "name": "ask-sdk-dynamodb-persistence-adapter",
   "version": "2.9.0",
   "description": "DynamoDB based implementation package of PersistenceAdapter interface in ASK SDK v2 for Node.js",
-  "main": "dist/lib/index.js",
-  "types": "dist/lib/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
     "compile": "tsc",

diff --git a/ask-sdk-dynamodb-persistence-adapter/tsconfig.json b/ask-sdk-dynamodb-persistence-adapter/tsconfig.json
@@ -3,15 +3,14 @@
     "target": "es2017",
     "module": "commonjs",
     "moduleResolution": "node",
-    "rootDir": "./",
+    "rootDir": "./lib",
     "outDir" : "dist",
     "sourceMap" : true,
     "alwaysStrict" : true,
     "declaration" : true,
     "lib": []
   },
   "include": [
-    "lib",
-    "tst"
+    "lib"
   ]
 }
diff --git a/ask-sdk-dynamodb-persistence-adapter/tst/tsconfig.json b/ask-sdk-dynamodb-persistence-adapter/tst/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es2017",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "rootDir": "./",
+    "outDir" : "dist",
+    "sourceMap" : true,
+    "alwaysStrict" : true,
+    "declaration" : true,
+    "lib": []
+  }
+}
diff --git a/ask-sdk-express-adapter/.eslintrc.json b/ask-sdk-express-adapter/.eslintrc.json
@@ -26,7 +26,7 @@
             "modules": true,
             "impliedStrict": true
         },
-        "project": "tsconfig.json"
+        "project": ["tsconfig.json", "tst/tsconfig.json"]
     },
     "rules": {
 

diff --git a/ask-sdk-express-adapter/package.json b/ask-sdk-express-adapter/package.json
@@ -2,8 +2,8 @@
   "name": "ask-sdk-express-adapter",
   "version": "2.1.0",
   "description": "Express adapter package for Alexa Skills Kit SDK",
-  "main": "dist/lib/index.js",
-  "types": "dist/lib/index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc && npm run lint",
     "compile": "tsc",

diff --git a/ask-sdk-express-adapter/tsconfig.json b/ask-sdk-express-adapter/tsconfig.json
@@ -3,15 +3,14 @@
     "target": "es2017",
     "module": "commonjs",
     "moduleResolution": "node",
-    "rootDir": "./",
+    "rootDir": "./lib",
     "outDir" : "dist",
     "sourceMap" : true,
     "alwaysStrict" : true,
     "declaration" : true,
     "lib": []
   },
   "include": [
-    "lib",
-    "tst"
+    "lib"
   ]
 }