diff --git a/resources/assets/js/app.ts b/resources/assets/js/app.ts index 10fdc70..03e22fe 100644 --- a/resources/assets/js/app.ts +++ b/resources/assets/js/app.ts @@ -1,4 +1,4 @@ -import * as Cookies from 'js-cookie'; +import Cookies from 'js-cookie'; import { fetchPostJson, fetchDeleteJson, ResponseError } from './fetch'; import { linkCard, pageSelector, deleteCheckinModal } from './tissue'; diff --git a/resources/assets/js/checkin.tsx b/resources/assets/js/checkin.tsx index 80b5a88..5be6ce0 100644 --- a/resources/assets/js/checkin.tsx +++ b/resources/assets/js/checkin.tsx @@ -1,5 +1,5 @@ -import * as React from 'react'; -import * as ReactDOM from 'react-dom'; +import React from 'react'; +import ReactDOM from 'react-dom'; import { CheckinForm } from './components/CheckinForm'; const initialState = JSON.parse(document.getElementById('initialState')?.textContent as string); diff --git a/resources/assets/js/components/CheckBox.tsx b/resources/assets/js/components/CheckBox.tsx index 30a7226..fb64b2c 100644 --- a/resources/assets/js/components/CheckBox.tsx +++ b/resources/assets/js/components/CheckBox.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; type CheckboxProps = { id: string; diff --git a/resources/assets/js/components/CheckinForm.tsx b/resources/assets/js/components/CheckinForm.tsx index 442b436..e3ff20b 100644 --- a/resources/assets/js/components/CheckinForm.tsx +++ b/resources/assets/js/components/CheckinForm.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; +import React from 'react'; import { useState } from 'react'; -import * as classNames from 'classnames'; +import classNames from 'classnames'; import { CheckBox } from './CheckBox'; import { FieldError, StandaloneFieldError } from './FieldError'; import { TagInput } from './TagInput'; diff --git a/resources/assets/js/components/FieldError.tsx b/resources/assets/js/components/FieldError.tsx index 61ec77e..3cb2154 100644 --- a/resources/assets/js/components/FieldError.tsx +++ b/resources/assets/js/components/FieldError.tsx @@ -1,4 +1,4 @@ -import * as React from 'react'; +import React from 'react'; type FieldErrorProps = { errors?: string[]; diff --git a/resources/assets/js/components/MetadataPreview.tsx b/resources/assets/js/components/MetadataPreview.tsx index 5a3db0c..7e3c5e8 100644 --- a/resources/assets/js/components/MetadataPreview.tsx +++ b/resources/assets/js/components/MetadataPreview.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; +import React from 'react'; import { useEffect, useState } from 'react'; -import * as classNames from 'classnames'; +import classNames from 'classnames'; import { fetchGet, ResponseError } from '../fetch'; enum MetadataLoadState { diff --git a/resources/assets/js/components/TagInput.tsx b/resources/assets/js/components/TagInput.tsx index 2d12e24..493302e 100644 --- a/resources/assets/js/components/TagInput.tsx +++ b/resources/assets/js/components/TagInput.tsx @@ -1,6 +1,6 @@ -import * as React from 'react'; +import React from 'react'; import { useState, useRef } from 'react'; -import * as classNames from 'classnames'; +import classNames from 'classnames'; type TagInputProps = { id: string; diff --git a/resources/assets/js/home.ts b/resources/assets/js/home.ts index 2d6f431..84ad1de 100644 --- a/resources/assets/js/home.ts +++ b/resources/assets/js/home.ts @@ -1,4 +1,4 @@ -import * as Chart from 'chart.js'; +import Chart from 'chart.js'; const graph = document.getElementById('global-count-graph') as HTMLCanvasElement; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion diff --git a/resources/assets/js/user/profile.ts b/resources/assets/js/user/profile.ts index 8557397..d3d4b72 100644 --- a/resources/assets/js/user/profile.ts +++ b/resources/assets/js/user/profile.ts @@ -1,4 +1,4 @@ -import * as CalHeatMap from 'cal-heatmap'; +import CalHeatMap from 'cal-heatmap'; import { subMonths } from 'date-fns'; if (document.getElementById('cal-heatmap')) { diff --git a/resources/assets/js/user/stats.ts b/resources/assets/js/user/stats.ts index 7b23235..f3c0c2a 100644 --- a/resources/assets/js/user/stats.ts +++ b/resources/assets/js/user/stats.ts @@ -1,5 +1,5 @@ -import * as CalHeatMap from 'cal-heatmap'; -import * as Chart from 'chart.js'; +import CalHeatMap from 'cal-heatmap'; +import Chart from 'chart.js'; import { addMonths, format } from 'date-fns'; // eslint-disable-next-line @typescript-eslint/no-non-null-assertion diff --git a/tsconfig.json b/tsconfig.json index 4801f69..6c2eca6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,7 +6,8 @@ "moduleResolution": "node", "strict": true, "experimentalDecorators": true, - "jsx": "react" + "jsx": "react", + "esModuleInterop": true }, "include": [ "resources/assets/js/**/*"