From 514ed31ca402e88307e5c4e57f57a265dab6a18c Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 13 Jan 2023 11:53:43 +0100 Subject: [PATCH 1/4] remove svlete-loader as extra dependency --- code/lib/cli/src/generators/SVELTE/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/cli/src/generators/SVELTE/index.ts b/code/lib/cli/src/generators/SVELTE/index.ts index 554359d04ef9..9fcf813fef01 100644 --- a/code/lib/cli/src/generators/SVELTE/index.ts +++ b/code/lib/cli/src/generators/SVELTE/index.ts @@ -3,7 +3,7 @@ import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; const generator: Generator = async (packageManager, npmOptions, options) => { - const extraPackages = options.builder === CoreBuilder.Webpack5 ? ['svelte', 'svelte-loader'] : []; + const extraPackages = options.builder === CoreBuilder.Webpack5 ? ['svelte'] : []; await baseGenerator(packageManager, npmOptions, options, 'svelte', { extraPackages, From 3c0005e4a783e399d5e2d7fd4a07e022767d1fe8 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 13 Jan 2023 05:46:11 -0800 Subject: [PATCH 2/4] Update code/lib/cli/src/generators/SVELTE/index.ts --- code/lib/cli/src/generators/SVELTE/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/code/lib/cli/src/generators/SVELTE/index.ts b/code/lib/cli/src/generators/SVELTE/index.ts index 9fcf813fef01..3dc83367cc9c 100644 --- a/code/lib/cli/src/generators/SVELTE/index.ts +++ b/code/lib/cli/src/generators/SVELTE/index.ts @@ -6,7 +6,6 @@ const generator: Generator = async (packageManager, npmOptions, options) => { const extraPackages = options.builder === CoreBuilder.Webpack5 ? ['svelte'] : []; await baseGenerator(packageManager, npmOptions, options, 'svelte', { - extraPackages, extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'], commonJs: true, }); From 2e3a5757c0df439ae6b18275097efabb5ba8c412 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Fri, 13 Jan 2023 05:46:47 -0800 Subject: [PATCH 3/4] Update code/lib/cli/src/generators/SVELTE/index.ts --- code/lib/cli/src/generators/SVELTE/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/code/lib/cli/src/generators/SVELTE/index.ts b/code/lib/cli/src/generators/SVELTE/index.ts index 3dc83367cc9c..544c6ae68531 100644 --- a/code/lib/cli/src/generators/SVELTE/index.ts +++ b/code/lib/cli/src/generators/SVELTE/index.ts @@ -3,7 +3,6 @@ import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; const generator: Generator = async (packageManager, npmOptions, options) => { - const extraPackages = options.builder === CoreBuilder.Webpack5 ? ['svelte'] : []; await baseGenerator(packageManager, npmOptions, options, 'svelte', { extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'], From ef835267e739f25030909524f368037eae87dd25 Mon Sep 17 00:00:00 2001 From: Jeppe Reinhold Date: Fri, 13 Jan 2023 15:02:46 +0100 Subject: [PATCH 4/4] fix lint --- code/lib/cli/src/generators/SVELTE/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/lib/cli/src/generators/SVELTE/index.ts b/code/lib/cli/src/generators/SVELTE/index.ts index 544c6ae68531..9639d5b5053a 100644 --- a/code/lib/cli/src/generators/SVELTE/index.ts +++ b/code/lib/cli/src/generators/SVELTE/index.ts @@ -1,9 +1,7 @@ -import { CoreBuilder } from '../../project_types'; import { baseGenerator } from '../baseGenerator'; import type { Generator } from '../types'; const generator: Generator = async (packageManager, npmOptions, options) => { - await baseGenerator(packageManager, npmOptions, options, 'svelte', { extensions: ['js', 'jsx', 'ts', 'tsx', 'svelte'], commonJs: true,