fix: ts build

kenoxa · Jul 13, 2020 · 5bf28b7 · 5bf28b7
1 parent b832bc2
commit 5bf28b7
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.cache/yarn/v6
-          key: npm-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+          key: npm-${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             npm-${{ runner.os }}
             npm-
@@ -36,7 +36,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: node_modules
-          key: node_modules-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/package-lock.json') }}
+          key: node_modules-${{ runner.os }}-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install dependencies
         if: steps.cache-modules.outputs.cache-hit != 'true'

diff --git a/package.json b/package.json
@@ -63,6 +63,7 @@
     "spectre.css": "^0.5.9",
     "svelte": "^3.24.0",
     "svelte-check": "^0.1.45",
+    "svelte-fragment-component": "^1.2.0",
     "svelte-htm": "^1.1.0",
     "svelte-loader": "^2.13.6",
     "ts-loader": "^7.0.5",

diff --git a/packages/graphql/package.json b/packages/graphql/package.json
@@ -37,7 +37,6 @@
     "fetch-mock-jest": "^1.3.0",
     "node-fetch": "^2.6.0",
     "nps": "^5.9.12",
-    "svelte-fragment-component": "^1.2.0",
     "typedoc": "0.17.0-3"
   },
   "peerDependencies": {

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,6 +8,7 @@
     "**/.build/**",
     "**/build/**",
     "**/dist/**",
+    "**/docs/**",
     "**/node_modules/**",
     "**/__generated__/**",
     "**/generated/**",

diff --git a/types/index.ts b/types/index.ts
@@ -1,2 +1,4 @@
 import '@carv/types'
 import 'svelte'
+
+import './modules'
diff --git a/packages/graphql/src/modules.d.ts → types/modules.d.ts b/packages/graphql/src/modules.d.ts → types/modules.d.ts
diff --git a/yarn.lock b/yarn.lock
@@ -11947,12 +11947,7 @@ svelte-dev-helper@^1.1.9:
   resolved "https://registry.npmjs.org/svelte-dev-helper/-/svelte-dev-helper-1.1.9.tgz#7d187db5c6cdbbd64d75a32f91b8998bde3273c3"
   integrity sha1-fRh9tcbNu9ZNdaMvkbiZi94yc8M=
 
-svelte-fragment-component@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/svelte-fragment-component/-/svelte-fragment-component-1.1.0.tgz#22fec3bea4f2b34fb80d9a45cc0d6e6a1d0a435f"
-  integrity sha512-zL9t0DcAc7bVFDpp8kr8v8H7qivxhVXHKJ/yhhH/BFyyKCNYZ5xdH1CMJsDC4CLiHeWvyMS0GnkMPBDHxnA+UA==
-
-svelte-fragment-component@^1.2.0:
+svelte-fragment-component@^1.1.0, svelte-fragment-component@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npmjs.org/svelte-fragment-component/-/svelte-fragment-component-1.2.0.tgz#36842c609a15c934b9d32a8bc99c460b0374d796"
   integrity sha512-rRstmz2oAy2Y/7X57tRaIAJdMYsa2K/MOx/YJN/ETb7Bj9U3vjgioz27dMG1hl2vAKFTtQpxDhC31ur7ECwpog==