From 74483631d09395de248fe97034c059a2a8bb2097 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sun, 22 Jul 2018 16:22:19 +0200 Subject: Move frontend package types out of typescript-typings since this package will be used in both node and browser contexts --- packages/react-shared/src/globals.d.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/react-shared') diff --git a/packages/react-shared/src/globals.d.ts b/packages/react-shared/src/globals.d.ts index 94e63a32d..b633d045c 100644 --- a/packages/react-shared/src/globals.d.ts +++ b/packages/react-shared/src/globals.d.ts @@ -1,3 +1,5 @@ +declare module 'react-highlight'; + declare module '*.json' { const json: any; /* tslint:disable */ -- cgit From 51b6f8bc71cf80528299c0378b3f1cec17a41c31 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 23 Jul 2018 11:42:01 +0200 Subject: Revert "Move frontend package types out of typescript-typings since this package will be used in both node and browser contexts" This reverts commit 74483631d09395de248fe97034c059a2a8bb2097. --- packages/react-shared/src/globals.d.ts | 2 -- 1 file changed, 2 deletions(-) (limited to 'packages/react-shared') diff --git a/packages/react-shared/src/globals.d.ts b/packages/react-shared/src/globals.d.ts index b633d045c..94e63a32d 100644 --- a/packages/react-shared/src/globals.d.ts +++ b/packages/react-shared/src/globals.d.ts @@ -1,5 +1,3 @@ -declare module 'react-highlight'; - declare module '*.json' { const json: any; /* tslint:disable */ -- cgit From f84f8799500bc9dd3050d0fb4d5100423869ce9f Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 23 Jul 2018 14:39:34 +0200 Subject: Stop specifying a specific version of @types/react so there can't be two instances of the type installed --- packages/react-shared/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/react-shared') diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 008972da9..f406830f9 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -38,7 +38,7 @@ "@types/lodash": "4.14.104", "@types/material-ui": "0.18.0", "@types/node": "^8.0.53", - "@types/react": "16.3.13", + "@types/react": "*", "@types/react-dom": "^16.0.3", "@types/react-scroll": "0.0.31", "@types/is-mobile": "0.3.0", -- cgit