From cc633b5d3840baf4cd1c92c23cf67c14d9e3cc35 Mon Sep 17 00:00:00 2001 From: milahu Date: Mon, 18 Jan 2021 18:54:55 +0100 Subject: [PATCH 1/8] fix typescript: make sourcemaps default on (#286) --- src/transformers/typescript.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/transformers/typescript.ts b/src/transformers/typescript.ts index 74bcc9b9..34a978b9 100644 --- a/src/transformers/typescript.ts +++ b/src/transformers/typescript.ts @@ -62,6 +62,7 @@ const transformer: Transformer = ({ const compilerOptionsJSON = { moduleResolution: 'node', target: 'es6', + sourceMap: true, // generate sourcemap + attach '\n//# source'+'MappingURL=Component.svelte.js.map' to result.code }; let basePath = process.cwd(); From c50de393a2c340fe10162125dad042420e8504fc Mon Sep 17 00:00:00 2001 From: milahu Date: Wed, 20 Jan 2021 10:11:34 +0100 Subject: [PATCH 2/8] move option --- src/transformers/typescript.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transformers/typescript.ts b/src/transformers/typescript.ts index 34a978b9..1bbfcedf 100644 --- a/src/transformers/typescript.ts +++ b/src/transformers/typescript.ts @@ -62,7 +62,6 @@ const transformer: Transformer = ({ const compilerOptionsJSON = { moduleResolution: 'node', target: 'es6', - sourceMap: true, // generate sourcemap + attach '\n//# source'+'MappingURL=Component.svelte.js.map' to result.code }; let basePath = process.cwd(); @@ -106,6 +105,7 @@ const transformer: Transformer = ({ ...(convertedCompilerOptions as CompilerOptions), importsNotUsedAsValues: ts.ImportsNotUsedAsValues.Error, allowNonTsExtensions: true, + sourceMap: !!options.sourceMap, }; if ( From b0478f94d19c309f971e456450126d989cfc5baf Mon Sep 17 00:00:00 2001 From: milahu Date: Wed, 20 Jan 2021 11:49:07 +0100 Subject: [PATCH 3/8] getTransformerOptions: accept propPath --- src/autoProcess.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/autoProcess.ts b/src/autoProcess.ts index ef2e5ae4..d543d45c 100644 --- a/src/autoProcess.ts +++ b/src/autoProcess.ts @@ -127,9 +127,17 @@ export function sveltePreprocess( } if (sourceMap && name in SOURCE_MAP_PROP_MAP) { - const [propName, value] = SOURCE_MAP_PROP_MAP[name]; - - opts[propName] = value; + const [propPath, value] = SOURCE_MAP_PROP_MAP[name]; + const pathParts = propPath.split('.'); + let parentObj = opts; + let i; + for (i = 0; i < (pathParts.length - 1); i++) { + const propName = pathParts[i]; + if (typeof parentObj[propName] != 'object') parentObj[propName] = {}; + parentObj = parentObj[propName]; + } + const propName = pathParts[i]; + parentObj[propName] = value; } return opts; From 3268499205a5007321a009024a36bacedf2e0bcc Mon Sep 17 00:00:00 2001 From: milahu Date: Wed, 20 Jan 2021 11:50:24 +0100 Subject: [PATCH 4/8] typescript: fix propPath to compilerOptions.sourceMap --- src/modules/language.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/language.ts b/src/modules/language.ts index ae1fbe35..e53ef05f 100644 --- a/src/modules/language.ts +++ b/src/modules/language.ts @@ -38,7 +38,7 @@ export function getLanguageDefaults(lang: string): null | Record { export const SOURCE_MAP_PROP_MAP: Record = { babel: ['sourceMaps', true], - typescript: ['sourceMap', true], + typescript: ['compilerOptions.sourceMap', true], scss: ['sourceMap', true], less: ['sourceMap', {}], stylus: ['sourcemap', true], From 7f4c598b3dc44f6e9d41080828ca044169ddc0f4 Mon Sep 17 00:00:00 2001 From: milahu Date: Wed, 20 Jan 2021 11:51:50 +0100 Subject: [PATCH 5/8] typescript: remove old patch --- src/transformers/typescript.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/transformers/typescript.ts b/src/transformers/typescript.ts index 1bbfcedf..74bcc9b9 100644 --- a/src/transformers/typescript.ts +++ b/src/transformers/typescript.ts @@ -105,7 +105,6 @@ const transformer: Transformer = ({ ...(convertedCompilerOptions as CompilerOptions), importsNotUsedAsValues: ts.ImportsNotUsedAsValues.Error, allowNonTsExtensions: true, - sourceMap: !!options.sourceMap, }; if ( From b1fe9d4428e47767636347be1651661c8bbaf84e Mon Sep 17 00:00:00 2001 From: milahu Date: Wed, 20 Jan 2021 11:59:40 +0100 Subject: [PATCH 6/8] lint --- src/autoProcess.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/autoProcess.ts b/src/autoProcess.ts index d543d45c..c6607e22 100644 --- a/src/autoProcess.ts +++ b/src/autoProcess.ts @@ -131,9 +131,9 @@ export function sveltePreprocess( const pathParts = propPath.split('.'); let parentObj = opts; let i; - for (i = 0; i < (pathParts.length - 1); i++) { + for (i = 0; i < pathParts.length - 1; i++) { const propName = pathParts[i]; - if (typeof parentObj[propName] != 'object') parentObj[propName] = {}; + if (typeof parentObj[propName] !== 'object') parentObj[propName] = {}; parentObj = parentObj[propName]; } const propName = pathParts[i]; From 0816b2c29c865d683f91bb0e6840e441a700df97 Mon Sep 17 00:00:00 2001 From: milahu Date: Wed, 20 Jan 2021 12:11:15 +0100 Subject: [PATCH 7/8] fix test to use propPath --- test/autoProcess/sourceMaps.test.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/test/autoProcess/sourceMaps.test.ts b/test/autoProcess/sourceMaps.test.ts index e24b1ba1..6a3702f3 100644 --- a/test/autoProcess/sourceMaps.test.ts +++ b/test/autoProcess/sourceMaps.test.ts @@ -84,13 +84,24 @@ describe(`sourcemap generation`, () => { [transformerName]: true, }); - const [key, val] = SOURCE_MAP_PROP_MAP[transformerName]; + const [propPath, value] = SOURCE_MAP_PROP_MAP[transformerName]; + const expectedOptions = {}; + const pathParts = propPath.split('.'); + let parentObj = expectedOptions; + let i; + for (i = 0; i < pathParts.length - 1; i++) { + const propName = pathParts[i]; + parentObj[propName] = {}; + parentObj = parentObj[propName]; + } + const propName = pathParts[i]; + parentObj[propName] = value; await preprocess(template, opts); expect(transformer).toHaveBeenCalledWith( expect.objectContaining({ - options: expect.objectContaining({ [key]: val }), + options: expect.objectContaining(expectedOptions), }), ); }); From c32e75466246206eea231ac23afc2b796ae3fc41 Mon Sep 17 00:00:00 2001 From: Christian Kaisermann Date: Wed, 20 Jan 2021 17:53:11 -0300 Subject: [PATCH 8/8] =?UTF-8?q?chore:=20=F0=9F=A4=96=20lint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/autoProcess.ts | 14 ++++++++++---- test/autoProcess/sourceMaps.test.ts | 9 ++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/autoProcess.ts b/src/autoProcess.ts index c6607e22..d8d4d678 100644 --- a/src/autoProcess.ts +++ b/src/autoProcess.ts @@ -130,13 +130,19 @@ export function sveltePreprocess( const [propPath, value] = SOURCE_MAP_PROP_MAP[name]; const pathParts = propPath.split('.'); let parentObj = opts; - let i; - for (i = 0; i < pathParts.length - 1; i++) { + + for (let i = 0; i < pathParts.length - 1; i++) { const propName = pathParts[i]; - if (typeof parentObj[propName] !== 'object') parentObj[propName] = {}; + + if (typeof parentObj[propName] !== 'object') { + parentObj[propName] = {}; + } + parentObj = parentObj[propName]; } - const propName = pathParts[i]; + + const propName = pathParts[pathParts.length - 1]; + parentObj[propName] = value; } diff --git a/test/autoProcess/sourceMaps.test.ts b/test/autoProcess/sourceMaps.test.ts index 6a3702f3..3efcc243 100644 --- a/test/autoProcess/sourceMaps.test.ts +++ b/test/autoProcess/sourceMaps.test.ts @@ -88,13 +88,16 @@ describe(`sourcemap generation`, () => { const expectedOptions = {}; const pathParts = propPath.split('.'); let parentObj = expectedOptions; - let i; - for (i = 0; i < pathParts.length - 1; i++) { + + for (let i = 0; i < pathParts.length - 1; i++) { const propName = pathParts[i]; + parentObj[propName] = {}; parentObj = parentObj[propName]; } - const propName = pathParts[i]; + + const propName = pathParts[pathParts.length - 1]; + parentObj[propName] = value; await preprocess(template, opts); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy