From 4530d8b1d57484b1d4152121575d954b097c6bb6 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Fri, 8 Nov 2019 23:44:59 +0200 Subject: [PATCH] Fix typescript crash --- package-lock.json | 29 +++++++++---------- package.json | 2 +- .../SignupQuestionsWidget.tsx | 4 ++- tsconfig.json | 8 ++--- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index b053f2b..c0b50f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -355,6 +355,7 @@ "version": "24.0.22", "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.22.tgz", "integrity": "sha512-t2OvhNZnrNjlzi2i0/cxbLVM59WN15I2r1Qtb7wDv28PnV9IzrPtagFRey/S9ezdLD0zyh1XGMQIEQND2YEfrw==", + "dev": true, "requires": { "@types/jest-diff": "*" } @@ -362,7 +363,8 @@ "@types/jest-diff": { "version": "20.0.1", "resolved": "https://registry.npmjs.org/@types/jest-diff/-/jest-diff-20.0.1.tgz", - "integrity": "sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==" + "integrity": "sha512-yALhelO3i0hqZwhjtcr6dYyaLoCHbAMshwtj6cGxTvHZAKXHsYGdff6E8EPw3xLKY0ELUTQ69Q1rQiJENnccMA==", + "dev": true }, "@types/lodash": { "version": "4.14.146", @@ -2617,8 +2619,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", - "dev": true, - "optional": true + "dev": true }, "basic-auth": { "version": "2.0.1", @@ -3147,14 +3148,6 @@ "dev": true, "requires": { "base64-js": "^1.1.2" - }, - "dependencies": { - "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==", - "dev": true - } } }, "browserify-aes": { @@ -6393,18 +6386,24 @@ } }, "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", + "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", "dev": true, "requires": { "depd": "~1.1.2", - "inherits": "2.0.3", + "inherits": "2.0.4", "setprototypeof": "1.1.1", "statuses": ">= 1.5.0 < 2", "toidentifier": "1.0.0" } }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, "ipaddr.js": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", diff --git a/package.json b/package.json index c98b539..99f96d6 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ } }, "devDependencies": { + "@types/jest": "24.0.22", "@types/node": "10.14.7", "@types/react": "16.8.18", "@types/react-dom": "16.8.4", @@ -109,7 +110,6 @@ "webpack-node-externals": "1.7.2" }, "dependencies": { - "@types/jest": "24.0.22", "axios": "0.19.0", "date-fns": "2.0.0-alpha.27", "js-cookie": "2.2.0", diff --git a/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx b/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx index 64b10da..0889425 100644 --- a/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx +++ b/src/components/SignupQuestionsWidget/SignupQuestionsWidget.tsx @@ -1,9 +1,11 @@ import * as React from "react"; import * as shortid from "shortid"; +import OptionsWidget from "./OptionsWidget"; import { DragDropContext, Droppable } from "react-beautiful-dnd"; -import { Question } from "."; +import { Question, InputProps, optionTypes } from "." import * as AddIcon from "../../assets/img/add-icon.png"; import "./SignupQuestionsWidget.scss"; +import TypeWidget from "./TypeWidget"; import QuestionList from "./QuestionList"; export interface SignupQuestionsWidgetProps { diff --git a/tsconfig.json b/tsconfig.json index 60c152d..80c2af9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,11 +3,11 @@ "outDir": "./dist/", "sourceMap": true, "noImplicitAny": false, - "esModuleInterop": true, + // "esModuleInterop": true, "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "allowSyntheticDefaultImports": true, - "resolveJsonModule": true, + // "emitDecoratorMetadata": true, + // "allowSyntheticDefaultImports": true, + // "resolveJsonModule": true, "module": "commonjs", "target": "es5", "jsx": "react",