From a979917eafe8f8417ac54b115e36de1303438581 Mon Sep 17 00:00:00 2001 From: delambo Date: Wed, 22 Jan 2025 09:50:52 -0500 Subject: [PATCH 1/2] support sass pkg imports --- packages/kyt-core/src/config/webpack.dev.client.js | 11 ++++++++++- packages/kyt-core/src/config/webpack.dev.server.js | 11 ++++++++++- packages/kyt-core/src/config/webpack.prod.client.js | 4 ++++ packages/kyt-core/src/config/webpack.prod.server.js | 11 ++++++++++- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/packages/kyt-core/src/config/webpack.dev.client.js b/packages/kyt-core/src/config/webpack.dev.client.js index 671bb335..603ddaab 100644 --- a/packages/kyt-core/src/config/webpack.dev.client.js +++ b/packages/kyt-core/src/config/webpack.dev.client.js @@ -6,6 +6,7 @@ const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware') const { kytWebpackPlugins } = require('kyt-runtime/webpack'); const { clientSrcPath, assetsBuildPath, publicBuildPath, publicSrcPath } = require('kyt-utils/paths')(); +const { NodePackageImporter } = require('sass'); const getPolyfill = require('./getPolyfill'); const postcssLoader = require('../utils/getPostcssLoader'); @@ -86,7 +87,15 @@ module.exports = options => { }, }, postcssLoader, - 'sass-loader', + { + loader: 'sass-loader', + options: { + sourceMap: true, + sassOptions: { + pkgImporter: new NodePackageImporter(), + }, + }, + }, ], exclude: [publicSrcPath], }, diff --git a/packages/kyt-core/src/config/webpack.dev.server.js b/packages/kyt-core/src/config/webpack.dev.server.js index 0b22c837..40807e45 100644 --- a/packages/kyt-core/src/config/webpack.dev.server.js +++ b/packages/kyt-core/src/config/webpack.dev.server.js @@ -4,6 +4,7 @@ const webpack = require('webpack'); const nodeExternals = require('webpack-node-externals'); const { serverSrcPath, serverBuildPath, clientAssetsFile, loadableAssetsFile, publicSrcPath } = require('kyt-utils/paths')(); +const { NodePackageImporter } = require('sass'); const StartServerPlugin = require('./StartServerPlugin'); const postcssLoader = require('../utils/getPostcssLoader'); const getPolyfill = require('./getPolyfill'); @@ -68,7 +69,15 @@ module.exports = options => { }, }, postcssLoader, - 'sass-loader', + { + loader: 'sass-loader', + options: { + sourceMap: true, + sassOptions: { + pkgImporter: new NodePackageImporter(), + }, + }, + }, ], exclude: [publicSrcPath], }, diff --git a/packages/kyt-core/src/config/webpack.prod.client.js b/packages/kyt-core/src/config/webpack.prod.client.js index 7d5a16a1..4e784b3e 100644 --- a/packages/kyt-core/src/config/webpack.prod.client.js +++ b/packages/kyt-core/src/config/webpack.prod.client.js @@ -1,6 +1,7 @@ // Production webpack config for client code const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); +const { NodePackageImporter } = require('sass'); const { clientSrcPath, assetsBuildPath, publicSrcPath } = require('kyt-utils/paths')(); const { kytWebpackPlugins } = require('kyt-runtime/webpack'); const postcssLoader = require('../utils/getPostcssLoader'); @@ -44,6 +45,9 @@ module.exports = options => ({ loader: 'sass-loader', options: { sourceMap: true, + sassOptions: { + pkgImporter: new NodePackageImporter(), + }, }, }, ], diff --git a/packages/kyt-core/src/config/webpack.prod.server.js b/packages/kyt-core/src/config/webpack.prod.server.js index 856c4c1f..471998b4 100644 --- a/packages/kyt-core/src/config/webpack.prod.server.js +++ b/packages/kyt-core/src/config/webpack.prod.server.js @@ -2,6 +2,7 @@ const webpack = require('webpack'); const nodeExternals = require('webpack-node-externals'); +const { NodePackageImporter } = require('sass'); const { serverSrcPath, serverBuildPath, publicSrcPath } = require('kyt-utils/paths')(); const postcssLoader = require('../utils/getPostcssLoader'); const getPolyfill = require('./getPolyfill'); @@ -51,7 +52,15 @@ module.exports = options => { }, }, postcssLoader, - 'sass-loader', + { + loader: 'sass-loader', + options: { + sourceMap: true, + sassOptions: { + pkgImporter: new NodePackageImporter(), + }, + }, + }, ], exclude: [publicSrcPath], }, From 13528485a2e3f5662904124ed101c7d3bc33bd48 Mon Sep 17 00:00:00 2001 From: delambo Date: Wed, 22 Jan 2025 15:23:40 -0500 Subject: [PATCH 2/2] test without on prod --- .../kyt-core/src/config/webpack.prod.client.js | 12 ++++++------ .../kyt-core/src/config/webpack.prod.server.js | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/kyt-core/src/config/webpack.prod.client.js b/packages/kyt-core/src/config/webpack.prod.client.js index 4e784b3e..fe5d8849 100644 --- a/packages/kyt-core/src/config/webpack.prod.client.js +++ b/packages/kyt-core/src/config/webpack.prod.client.js @@ -43,12 +43,12 @@ module.exports = options => ({ postcssLoader, { loader: 'sass-loader', - options: { - sourceMap: true, - sassOptions: { - pkgImporter: new NodePackageImporter(), - }, - }, + // options: { + // sourceMap: true, + // sassOptions: { + // pkgImporter: new NodePackageImporter(), + // }, + // }, }, ], exclude: [publicSrcPath], diff --git a/packages/kyt-core/src/config/webpack.prod.server.js b/packages/kyt-core/src/config/webpack.prod.server.js index 471998b4..d4e2f8c5 100644 --- a/packages/kyt-core/src/config/webpack.prod.server.js +++ b/packages/kyt-core/src/config/webpack.prod.server.js @@ -2,7 +2,7 @@ const webpack = require('webpack'); const nodeExternals = require('webpack-node-externals'); -const { NodePackageImporter } = require('sass'); +// const { NodePackageImporter } = require('sass'); const { serverSrcPath, serverBuildPath, publicSrcPath } = require('kyt-utils/paths')(); const postcssLoader = require('../utils/getPostcssLoader'); const getPolyfill = require('./getPolyfill'); @@ -54,12 +54,12 @@ module.exports = options => { postcssLoader, { loader: 'sass-loader', - options: { - sourceMap: true, - sassOptions: { - pkgImporter: new NodePackageImporter(), - }, - }, + // options: { + // sourceMap: true, + // sassOptions: { + // pkgImporter: new NodePackageImporter(), + // }, + // }, }, ], exclude: [publicSrcPath],