diff --git a/packages/redux-devtools-app/buildUmd.mjs b/packages/redux-devtools-app/buildUmd.mjs index dbe66e36..8c3db4a7 100644 --- a/packages/redux-devtools-app/buildUmd.mjs +++ b/packages/redux-devtools-app/buildUmd.mjs @@ -14,7 +14,7 @@ await esbuild.build({ define: { 'process.env.NODE_ENV': prod ? '"production"' : '"development"', }, - entryPoints: ['src/ReduxDevToolsApp.js'], + entryPoints: ['src/index.tsx'], loader: { '.woff2': 'dataurl', }, diff --git a/packages/redux-devtools-app/package.json b/packages/redux-devtools-app/package.json index 4c8efce7..53a2535a 100644 --- a/packages/redux-devtools-app/package.json +++ b/packages/redux-devtools-app/package.json @@ -87,6 +87,7 @@ "@types/socketcluster-client": "^16.0.0", "@types/styled-components": "^5.1.26", "@types/testing-library__jest-dom": "^5.14.9", + "@types/webpack-env": "^1.18.1", "@typescript-eslint/eslint-plugin": "^6.5.0", "@typescript-eslint/parser": "^6.5.0", "babel-loader": "^9.1.3", diff --git a/packages/redux-devtools-app/src/ReduxDevToolsApp.js b/packages/redux-devtools-app/src/ReduxDevToolsApp.js deleted file mode 100644 index 40793c04..00000000 --- a/packages/redux-devtools-app/src/ReduxDevToolsApp.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('./index').Root; diff --git a/packages/redux-devtools-app/tsconfig.webpack.json b/packages/redux-devtools-app/tsconfig.webpack.json index d02c0a8f..d728d6be 100644 --- a/packages/redux-devtools-app/tsconfig.webpack.json +++ b/packages/redux-devtools-app/tsconfig.webpack.json @@ -3,5 +3,5 @@ "compilerOptions": { "types": ["node", "webpack-dev-server"] }, - "include": ["webpack.config.ts", "webpack.config.umd.ts"] + "include": ["webpack.config.ts"] } diff --git a/packages/redux-devtools-app/webpack.config.umd.ts b/packages/redux-devtools-app/webpack.config.umd.ts deleted file mode 100644 index d3f4e829..00000000 --- a/packages/redux-devtools-app/webpack.config.umd.ts +++ /dev/null @@ -1,69 +0,0 @@ -import * as path from 'path'; -import * as webpack from 'webpack'; -import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; - -export default (env: { production?: boolean } = {}): webpack.Configuration => ({ - mode: env.production ? 'production' : 'development', - entry: { - app: ['./src/index'], - }, - output: { - library: 'ReduxDevToolsApp', - libraryExport: 'Root', - libraryTarget: 'umd', - path: path.resolve(__dirname, 'umd'), - filename: env.production - ? 'redux-devtools-app.min.js' - : 'redux-devtools-app.js', - }, - module: { - rules: [ - { - test: /\.(js|ts)x?$/, - loader: 'babel-loader', - exclude: /node_modules/, - }, - { - test: /\.html$/, - loader: 'html-loader', - }, - { - test: /\.css$/, - use: [{ loader: 'style-loader' }, { loader: 'css-loader' }], - }, - { - test: /\.woff2$/, - type: 'asset/inline', - }, - ], - }, - resolve: { - extensions: ['.js', '.jsx', '.ts', '.tsx'], - }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env': { - PLATFORM: JSON.stringify('web'), - }, - }), - new ForkTsCheckerWebpackPlugin({ - typescript: { - configFile: 'tsconfig.json', - }, - }), - ], - externals: { - react: { - root: 'React', - commonjs2: 'react', - commonjs: 'react', - amd: 'react', - }, - 'react-dom': { - root: 'ReactDOM', - commonjs2: 'react-dom', - commonjs: 'react-dom', - amd: 'react-dom', - }, - }, -}); diff --git a/packages/redux-devtools-cli/app/index.html b/packages/redux-devtools-cli/app/index.html index b857dafd..f18bb094 100644 --- a/packages/redux-devtools-cli/app/index.html +++ b/packages/redux-devtools-cli/app/index.html @@ -33,7 +33,7 @@