Attempt to fix build

.npmignore

@@ -26,3 +26,4 @@ coverage
 *.gif
 
 .DS_Store
+.idea

package.json

@@ -1,10 +1,10 @@
 {
-  "name": "react-dropzone-uploader",
-  "version": "2.11.0",
+  "name": "@cruisecritic/react-dropzone-uploader",
+  "version": "2.12.5",
   "author": "Kyle Bebak <[email protected]>",
   "description": "React file dropzone and uploader: fully customizable, progress indicators, upload cancellation and restart, zero deps and excellent TypeScript support",
   "main": "./dist/react-dropzone-uploader.js",
-  "types": "./dist/Dropzone.tsx",
+  "types": "./dist/Dropzone.d.ts",
   "keywords": [
     "react",
     "react-component",
@@ -23,9 +23,9 @@
   },
   "license": "MIT",
   "peerDependencies": {
+    "prop-types": ">=15.5.10",
     "react": ">=16.2.0",
-    "react-dom": ">=16.2.0",
-    "prop-types": ">=15.5.10"
+    "react-dom": ">=16.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.1.2",
@@ -41,7 +41,7 @@
     "babel-jest": "^23.6.0",
     "babel-loader": "^8.0.4",
     "babel-polyfill": "^6.26.0",
-    "css-loader": "^1.0.0",
+    "css-loader": "^6.7.1",
     "docusaurus-init": "^1.0.2",
     "enzyme": "^3.7.0",
     "enzyme-adapter-react-16": "^1.7.0",
@@ -54,21 +54,22 @@
     "react-styleguidist": "^8.0.6",
     "react-test-renderer": "^16.6.3",
     "react-toastify": "^4.5.2",
-    "style-loader": "^0.23.1",
-    "typescript": "^3.4.1",
-    "uglifyjs-webpack-plugin": "^2.0.1",
-    "url-loader": "^1.1.2",
-    "webpack": "^4.21.0",
-    "webpack-cli": "^3.1.2",
-    "webpack-dev-server": "^3.1.14"
+    "style-loader": "^3.3.1",
+    "terser-webpack-plugin": "^5.3.3",
+    "ts-loader": "^9.3.0",
+    "typescript": "^4.7.3",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.73.0",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.9.2"
   },
   "jest": {
     "moduleNameMapper": {
       "\\.(png|jpg|jpeg|gif|svg|woff|woff2)$": "<rootDir>/tests/fileMock.js"
     }
   },
   "scripts": {
-    "build": "rm dist/* && tsc && NODE_ENV=production webpack --config webpack.build.config.js && cp src/styles.css dist/styles.css && cp src/*.ts* dist",
+    "build": "rm -rf dist && tsc && NODE_ENV=production webpack --config webpack.build.config.js",
     "dev": "tsc -w -p tsconfig.dev.json & webpack-dev-server --config webpack.config.js --mode development --open",
     "styleguide": "tsc -w & styleguidist server",
     "build-styleguide": "tsc && styleguidist build",

src/Dropzone.tsx

@@ -501,7 +501,9 @@ class Dropzone extends React.Component<IDropzoneProps, { active: boolean; dragge
     try {
       params = await getUploadParams(fileWithMeta)
     } catch (e) {
-      console.error('Error Upload Params', e.stack)
+      if (e instanceof Error) {
+        console.error('Error Upload Params', e.stack)
+      }
     }
     if (params === null) return
     const { url, method = 'POST', body, fields = {}, headers = {}, meta: extraMeta = {} } = params

tsconfig.json

@@ -6,7 +6,9 @@
     "skipLibCheck": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "strict": true
+    "strict": true,
+    "outDir": "dist",
+    "declaration": true
   },
   "include": ["src/*.tsx", "src/*.ts"],
   "exclude": ["node_modules"]

webpack.build.config.js

@@ -1,6 +1,7 @@
 /* eslint import/no-extraneous-dependencies: 0 */
-const UglifyJSPlugin = require('uglifyjs-webpack-plugin')
+const TerserPlugin = require("terser-webpack-plugin");
 const path = require('path')
+const CopyPlugin = require("copy-webpack-plugin");
 
 if (process.env.NODE_ENV !== 'production') {
   throw new Error('Production builds must have NODE_ENV=production.')
@@ -12,36 +13,51 @@ function createConfig(entry, output) {
     entry,
     output,
     optimization: {
-      minimizer: [new UglifyJSPlugin()],
+      minimizer: [new TerserPlugin()],
     },
     module: {
       rules: [
         {
-          test: /\.js?$/,
-          exclude: /node_modules/,
-          use: 'babel-loader',
+          test: /\.tsx?$/,
+          loader: 'ts-loader',
+          exclude: /node_modules/
         },
         {
           test: /\.css$/,
-          loaders: ['style-loader', 'css-loader'],
+          loader: 'style-loader',
         },
         {
           test: /\.(png|jpg|jpeg|gif|svg|woff|woff2)$/,
           exclude: /node_modules/,
-          loader: 'url-loader?limit=10000',
+          loader: 'url-loader',
+          options: {
+            limit: 10000
+          }
         },
+
       ],
     },
+    resolve: {
+      extensions: ['.tsx', '.ts', '.js', '.js']
+    },
+    plugins: [
+      new CopyPlugin([
+        "src/styles.css",
+        {from: "src/assets/cancel.svg", to: "assets"},
+        {from: "src/assets/remove.svg", to: "assets"},
+        {from: "src/assets/restart.svg", to: "assets"},
+      ]),
+    ]
   }
 }
 
 module.exports = [
-  createConfig('./src/Dropzone.js', {
+  createConfig('./src/Dropzone.tsx', {
     path: path.resolve('dist'),
     libraryTarget: 'commonjs2',
     filename: 'react-dropzone-uploader.js',
   }),
-  createConfig('./src/Dropzone.js', {
+  createConfig('./src/Dropzone.tsx', {
     path: path.resolve('dist'),
     libraryTarget: 'umd',
     filename: 'react-dropzone-uploader.umd.js',