Merge branch 'main' into fix-ckdtf-typos

hashicorp · Aug 26, 2021 · 979da8e · 979da8e
2 parents 0ab7980 + 7e0593a
commit 979da8e
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 263 deletions.
diff --git a/packages/cdktf-cli/jest.config.js b/packages/cdktf-cli/jest.config.js
@@ -1,9 +1,9 @@
 module.exports = {
-  "roots": [
+  roots: [
     "<rootDir>"
   ],
   testMatch: ['**/*.test.ts', '**/*.test.tsx'],
-  "transform": {
+  transform: {
     "^.+\\.tsx?$": "ts-jest"
   },
   moduleFileExtensions: [

diff --git a/packages/cdktf-cli/test/get/generator/__snapshots__/complex-computed-types.test.js.snap b/packages/cdktf-cli/test/get/generator/__snapshots__/complex-computed-types.test.js.snap
diff --git a/packages/cdktf/jest.config.js b/packages/cdktf/jest.config.js
@@ -0,0 +1,16 @@
+module.exports = {
+    roots: [
+      "<rootDir>"
+    ],
+    collectCoverage: true,
+    testMatch: ['**/*.test.ts', '**/*.test.tsx'],
+    transform: {
+      "^.+\\.tsx?$": "ts-jest"
+    },
+    moduleFileExtensions: [
+      "js",
+      "ts",
+      "tsx"
+    ],
+  }
+
diff --git a/packages/cdktf/package.json b/packages/cdktf/package.json
@@ -91,12 +91,6 @@
     "json-schema-to-typescript": "^8.0.1",
     "typescript": "^3.9.7"
   },
-  "jest": {
-    "collectCoverage": true,
-    "moduleFileExtensions": [
-      "js"
-    ]
-  },
   "dependencies": {
     "archiver": "5.3.0"
   },

diff --git a/...f/test/__snapshots__/backend.test.js.snap → ...f/test/__snapshots__/backend.test.ts.snap b/...f/test/__snapshots__/backend.test.js.snap → ...f/test/__snapshots__/backend.test.ts.snap
diff --git a/...st/__snapshots__/data-source.test.js.snap → ...st/__snapshots__/data-source.test.ts.snap b/...st/__snapshots__/data-source.test.js.snap → ...st/__snapshots__/data-source.test.ts.snap
diff --git a/...ktf/test/__snapshots__/local.test.js.snap → ...ktf/test/__snapshots__/local.test.ts.snap b/...ktf/test/__snapshots__/local.test.js.snap → ...ktf/test/__snapshots__/local.test.ts.snap
diff --git a/...tf/test/__snapshots__/output.test.js.snap → ...tf/test/__snapshots__/output.test.ts.snap b/...tf/test/__snapshots__/output.test.js.snap → ...tf/test/__snapshots__/output.test.ts.snap
diff --git a/.../test/__snapshots__/provider.test.js.snap → .../test/__snapshots__/provider.test.ts.snap b/.../test/__snapshots__/provider.test.js.snap → .../test/__snapshots__/provider.test.ts.snap
diff --git a/...t/__snapshots__/remote-state.test.js.snap → ...t/__snapshots__/remote-state.test.ts.snap b/...t/__snapshots__/remote-state.test.js.snap → ...t/__snapshots__/remote-state.test.ts.snap
diff --git a/.../test/__snapshots__/resource.test.js.snap → .../test/__snapshots__/resource.test.ts.snap b/.../test/__snapshots__/resource.test.js.snap → .../test/__snapshots__/resource.test.ts.snap
diff --git a/...ktf/test/__snapshots__/stack.test.js.snap → ...ktf/test/__snapshots__/stack.test.ts.snap b/...ktf/test/__snapshots__/stack.test.js.snap → ...ktf/test/__snapshots__/stack.test.ts.snap
diff --git a/...shots__/terraform-hcl-module.test.js.snap → ...shots__/terraform-hcl-module.test.ts.snap b/...shots__/terraform-hcl-module.test.js.snap → ...shots__/terraform-hcl-module.test.ts.snap
diff --git a/...dktf/test/__snapshots__/util.test.js.snap → ...dktf/test/__snapshots__/util.test.ts.snap b/...dktf/test/__snapshots__/util.test.js.snap → ...dktf/test/__snapshots__/util.test.ts.snap
diff --git a/.../test/__snapshots__/variable.test.js.snap → .../test/__snapshots__/variable.test.ts.snap b/.../test/__snapshots__/variable.test.js.snap → .../test/__snapshots__/variable.test.ts.snap