Fix some bugs #3

Merged
ksv741 merged 5 commits from description into main 2024-03-29 07:21:47 +03:00
7 changed files with 9 additions and 9 deletions
Showing only changes of commit 8e17846992 - Show all commits

View File

@ -15,7 +15,7 @@ const getBabelLoader = (options: WebpackOptions): webpack.RuleSetRule | null =>
return { return {
test: /\.[j|t]sx?$/, test: /\.[j|t]sx?$/,
loader: 'babel-loader', loader: require.resolve('babel-loader'),
options: { options: {
...babelLoader, ...babelLoader,
presets: [ presets: [

View File

@ -16,7 +16,7 @@ const getEsbuildLoader = (options: WebpackOptions): webpack.RuleSetRule | null =
return { return {
test: /\.[j|t]sx?$/, test: /\.[j|t]sx?$/,
loader: 'esbuild-loader', loader: require.resolve('esbuild-loader'),
options: { options: {
loader: 'tsx', loader: 'tsx',
jsx: 'automatic', jsx: 'automatic',

View File

@ -20,7 +20,7 @@ const getSwcLoader = (options: WebpackOptions): webpack.RuleSetRule | null => {
return { return {
test: /\.[j|t]sx?$/, test: /\.[j|t]sx?$/,
exclude: /(node_modules|bower_components)/, exclude: /(node_modules|bower_components)/,
loader: 'swc-loader', loader: require.resolve('swc-loader'),
options: { options: {
...swcLoader, ...swcLoader,
sync: true, sync: true,

View File

@ -15,7 +15,7 @@ const getTsLoader = (options: WebpackOptions): webpack.RuleSetRule | null => {
return { return {
test: /\.[j|t]sx?$/, test: /\.[j|t]sx?$/,
loader: 'ts-loader', loader: require.resolve('ts-loader'),
options: { options: {
...tsLoader, ...tsLoader,
}, },

View File

@ -23,7 +23,7 @@ const getCssLoader = (options: WebpackOptions): webpack.RuleSetRule => {
? styleLoader === 'off' ? styleLoader === 'off'
? null ? null
: { : {
loader: 'style-loader', loader: require.resolve('style-loader'),
options: styleLoader, options: styleLoader,
} }
: miniCssLoader === 'off' : miniCssLoader === 'off'
@ -35,7 +35,7 @@ const getCssLoader = (options: WebpackOptions): webpack.RuleSetRule => {
cssLoader === 'off' cssLoader === 'off'
? null ? null
: { : {
loader: 'css-loader', loader: require.resolve('css-loader'),
options: { options: {
sourceMap: isDev, sourceMap: isDev,
...cssLoader, ...cssLoader,
@ -49,7 +49,7 @@ const getCssLoader = (options: WebpackOptions): webpack.RuleSetRule => {
postCssLoader === 'off' postCssLoader === 'off'
? null ? null
: { : {
loader: 'postcss-loader', loader: require.resolve('postcss-loader'),
options: { options: {
...postCssLoader, ...postCssLoader,
postcssOptions: { postcssOptions: {

View File

@ -21,7 +21,7 @@ const getSassLoader = (options: WebpackOptions): webpack.RuleSetRule | null => {
// @ts-ignore // @ts-ignore
...getCssLoader(options).use, ...getCssLoader(options).use,
{ {
loader: 'sass-loader', loader: require.resolve('sass-loader'),
options: { options: {
sourceMap: isDev, sourceMap: isDev,
...sassLoader, ...sassLoader,

View File

@ -16,7 +16,7 @@ const getSvgrLoader = (options: WebpackOptions): webpack.RuleSetRule | null => {
test: /\.svg$/i, test: /\.svg$/i,
issuer: /\.[jt]sx?$/, issuer: /\.[jt]sx?$/,
use: [{ use: [{
loader: '@svgr/webpack', loader: require.resolve('@svgr/webpack'),
options: { options: {
icon: true, icon: true,
...svgrLoader, ...svgrLoader,