fix: update webpack config and types

ackama · Jul 11, 2023 · 31f437f · 31f437f
1 parent 54a9808
commit 31f437f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/variants/frontend-base-typescript/types.d.ts b/variants/frontend-base-typescript/types.d.ts
@@ -2,7 +2,8 @@ declare module 'shakapacker' {
   import { Configuration } from 'webpack';
 
   export { merge } from 'webpack-merge';
-  export const webpackConfig: Configuration;
+  export const globalMutableWebpackConfig: Configuration;
+  export function generateWebpackConfig(): Configuration;
 }
 
 declare module 'shakapacker/package/babel/preset.js' {

diff --git a/variants/frontend-base/config/webpack/webpack.config.js b/variants/frontend-base/config/webpack/webpack.config.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { webpackConfig, merge } = require('shakapacker');
+const { generateWebpackConfig, merge } = require('shakapacker');
 const Dotenv = require('dotenv-webpack');
 
 const customConfig = {
@@ -14,4 +14,4 @@ const customConfig = {
 
 // See the shakacode/shakapacker README and docs directory for advice on customizing your webpackConfig.
 
-module.exports = merge(webpackConfig, customConfig);
+module.exports = merge(generateWebpackConfig(), customConfig);
diff --git a/variants/frontend-react-typescript/types.d.ts b/variants/frontend-react-typescript/types.d.ts
@@ -2,7 +2,8 @@ declare module 'shakapacker' {
   import { Configuration } from 'webpack';
 
   export { merge } from 'webpack-merge';
-  export const webpackConfig: Configuration;
+  export const globalMutableWebpackConfig: Configuration;
+  export function generateWebpackConfig(): Configuration;
 }
 
 declare module 'shakapacker/package/babel/preset.js' {