From e18d69d29f24e513f1abb545dc56050d7cfa23b1 Mon Sep 17 00:00:00 2001 From: Konstantinos Lianos Date: Tue, 9 May 2023 11:53:03 +0300 Subject: [PATCH 1/2] Fix: Add missing dependency (babel-loader) --- .../src/target-react-portlet/dependencies.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/target-react-portlet/dependencies.json b/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/target-react-portlet/dependencies.json index e1f11183df..09f52fc671 100644 --- a/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/target-react-portlet/dependencies.json +++ b/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/target-react-portlet/dependencies.json @@ -3,7 +3,8 @@ "@babel/cli": "^7.7.5", "@babel/core": "^7.7.5", "@babel/preset-env": "^7.7.6", - "@babel/preset-react": "^7.7.4" + "@babel/preset-react": "^7.7.4", + "babel-loader": "^8.0.0-beta.0" }, "dependencies": { "react": "16.8.6", From d2bfa33f5464a4058c905e40bf678d48e9c62b05 Mon Sep 17 00:00:00 2001 From: Konstantinos Lianos Date: Tue, 9 May 2023 11:53:38 +0300 Subject: [PATCH 2/2] Fix: webpack rules for recognizing the babel config file --- .../generator-liferay-js/src/utils/modifier/npmbuildrc.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/utils/modifier/npmbuildrc.js b/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/utils/modifier/npmbuildrc.js index 71d8325664..9a43f797a5 100644 --- a/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/utils/modifier/npmbuildrc.js +++ b/maintenance/projects/js-toolkit/packages/generator-liferay-js/src/utils/modifier/npmbuildrc.js @@ -81,7 +81,11 @@ export default class extends JsonModifier { currentRules.push({ test, - use: loader, + "exclude": "/node_modules/", + "loader": loader, + "options": { + "configFile": "../.babelrc" + } }); prop.set(json, 'webpack.rules', currentRules);