svelte-preprocess
Advanced tools
Comparing version 4.9.0 to 4.9.1
import type { AutoPreprocessGroup, AutoPreprocessOptions, Processed, TransformerArgs, TransformerOptions } from './types'; | ||
export declare const transform: (name: string, options: TransformerOptions, { content, markup, map, filename, attributes }: TransformerArgs<any>) => Promise<Processed>; | ||
export declare const transform: (name: string | null | undefined, options: TransformerOptions, { content, markup, map, filename, attributes }: TransformerArgs<any>) => Promise<Processed>; | ||
export declare function sveltePreprocess({ aliases, markupTagName, preserve, defaults, sourceMap, ...rest }?: AutoPreprocessOptions): AutoPreprocessGroup; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -29,4 +29,4 @@ return result; | ||
const markup_1 = require("./modules/markup"); | ||
exports.transform = async (name, options, { content, markup, map, filename, attributes }) => { | ||
if (options === false) { | ||
const transform = async (name, options, { content, markup, map, filename, attributes }) => { | ||
if (name == null || options === false) { | ||
return { code: content }; | ||
@@ -48,2 +48,3 @@ } | ||
}; | ||
exports.transform = transform; | ||
function sveltePreprocess(_a) { | ||
@@ -64,17 +65,18 @@ var _b, _c; | ||
if (aliases === null || aliases === void 0 ? void 0 : aliases.length) { | ||
language_1.addLanguageAlias(aliases); | ||
(0, language_1.addLanguageAlias)(aliases); | ||
} | ||
function resolveLanguageArgs(name, alias) { | ||
const { [name]: nameOpts, [alias]: aliasOpts } = transformers; | ||
function resolveLanguageArgs(lang, alias) { | ||
const langOpts = transformers[lang]; | ||
const aliasOpts = alias ? transformers[alias] : undefined; | ||
const opts = {}; | ||
if (typeof nameOpts === 'object') { | ||
Object.assign(opts, nameOpts); | ||
if (typeof langOpts === 'object') { | ||
Object.assign(opts, langOpts); | ||
} | ||
Object.assign(opts, language_1.getLanguageDefaults(name), language_1.getLanguageDefaults(alias)); | ||
if (name !== alias && typeof aliasOpts === 'object') { | ||
Object.assign(opts, (0, language_1.getLanguageDefaults)(lang), (0, language_1.getLanguageDefaults)(alias)); | ||
if (lang !== alias && typeof aliasOpts === 'object') { | ||
Object.assign(opts, aliasOpts); | ||
} | ||
if (sourceMap && name in language_1.SOURCE_MAP_PROP_MAP) { | ||
const [path, value] = language_1.SOURCE_MAP_PROP_MAP[name]; | ||
utils_1.setProp(opts, path, value); | ||
if (sourceMap && lang in language_1.SOURCE_MAP_PROP_MAP) { | ||
const [path, value] = language_1.SOURCE_MAP_PROP_MAP[lang]; | ||
(0, utils_1.setProp)(opts, path, value); | ||
} | ||
@@ -84,3 +86,6 @@ return opts; | ||
function getTransformerOptions(lang, alias, { ignoreAliasOverride } = {}) { | ||
const { [lang]: langOpts, [alias]: aliasOpts } = transformers; | ||
if (lang == null) | ||
return null; | ||
const langOpts = transformers[lang]; | ||
const aliasOpts = alias ? transformers[alias] : undefined; | ||
if (!ignoreAliasOverride && typeof aliasOpts === 'function') { | ||
@@ -96,12 +101,12 @@ return aliasOpts; | ||
const getTransformerTo = (type, targetLanguage) => async (svelteFile) => { | ||
let { content, markup, filename, lang, alias, dependencies, attributes, } = await tagInfo_1.getTagInfo(svelteFile); | ||
let { content, markup, filename, lang, alias, dependencies, attributes, } = await (0, tagInfo_1.getTagInfo)(svelteFile); | ||
if (lang == null || alias == null) { | ||
alias = defaultLanguages[type]; | ||
lang = language_1.getLanguageFromAlias(alias); | ||
lang = (0, language_1.getLanguageFromAlias)(alias); | ||
} | ||
if (preserve.includes(lang) || preserve.includes(alias)) { | ||
if ((lang && preserve.includes(lang)) || preserve.includes(alias)) { | ||
return { code: content }; | ||
} | ||
const transformerOptions = getTransformerOptions(lang, alias); | ||
content = prepareContent_1.prepareContent({ | ||
content = (0, prepareContent_1.prepareContent)({ | ||
options: transformerOptions, | ||
@@ -119,3 +124,3 @@ content, | ||
} | ||
const transformed = await exports.transform(lang, transformerOptions, { | ||
const transformed = await (0, exports.transform)(lang, transformerOptions, { | ||
content, | ||
@@ -128,3 +133,3 @@ markup, | ||
...transformed, | ||
dependencies: utils_1.concat(dependencies, transformed.dependencies), | ||
dependencies: (0, utils_1.concat)(dependencies, transformed.dependencies), | ||
}; | ||
@@ -137,3 +142,3 @@ }; | ||
if (transformers.replace) { | ||
const transformed = await exports.transform('replace', transformers.replace, { | ||
const transformed = await (0, exports.transform)('replace', transformers.replace, { | ||
content, | ||
@@ -145,3 +150,3 @@ markup: content, | ||
} | ||
return markup_1.transformMarkup({ content, filename }, markupTransformer, { | ||
return (0, markup_1.transformMarkup)({ content, filename }, markupTransformer, { | ||
// we only pass the markupTagName because the rest of options | ||
@@ -161,7 +166,7 @@ // is fetched internally by the `markupTransformer` | ||
if (transformers.babel) { | ||
const transformed = await exports.transform('babel', getTransformerOptions('babel'), { content: code, markup: fullMarkup, map, filename, attributes }); | ||
const transformed = await (0, exports.transform)('babel', getTransformerOptions('babel'), { content: code, markup: fullMarkup, map, filename, attributes }); | ||
code = transformed.code; | ||
map = transformed.map; | ||
dependencies = utils_1.concat(dependencies, transformed.dependencies); | ||
diagnostics = utils_1.concat(diagnostics, transformed.diagnostics); | ||
dependencies = (0, utils_1.concat)(dependencies, transformed.dependencies); | ||
diagnostics = (0, utils_1.concat)(diagnostics, transformed.diagnostics); | ||
} | ||
@@ -178,11 +183,11 @@ return { code, map, dependencies, diagnostics }; | ||
let { code, map, dependencies } = transformResult; | ||
const hasPostcss = await utils_1.hasDepInstalled('postcss'); | ||
const hasPostcss = await (0, utils_1.hasDepInstalled)('postcss'); | ||
// istanbul ignore else | ||
if (hasPostcss) { | ||
if (transformers.postcss) { | ||
const { alias, lang } = language_1.getLanguage(attributes); | ||
const postcssOptions = getTransformerOptions('postcss', language_1.isAliasOf(alias, lang) ? alias : null, | ||
const { alias, lang } = (0, language_1.getLanguage)(attributes); | ||
const postcssOptions = getTransformerOptions('postcss', (0, language_1.isAliasOf)(alias, lang) ? alias : null, | ||
// todo: this seems wrong and ugly | ||
{ ignoreAliasOverride: true }); | ||
const transformed = await exports.transform('postcss', postcssOptions, { | ||
const transformed = await (0, exports.transform)('postcss', postcssOptions, { | ||
content: code, | ||
@@ -196,5 +201,5 @@ markup: fullMarkup, | ||
map = transformed.map; | ||
dependencies = utils_1.concat(dependencies, transformed.dependencies); | ||
dependencies = (0, utils_1.concat)(dependencies, transformed.dependencies); | ||
} | ||
const transformed = await exports.transform('globalStyle', getTransformerOptions('globalStyle'), { content: code, markup: fullMarkup, map, filename, attributes }); | ||
const transformed = await (0, exports.transform)('globalStyle', getTransformerOptions('globalStyle'), { content: code, markup: fullMarkup, map, filename, attributes }); | ||
code = transformed.code; | ||
@@ -201,0 +206,0 @@ map = transformed.map; |
"use strict"; | ||
var __importDefault = (this && this.__importDefault) || function (mod) { | ||
return (mod && mod.__esModule) ? mod : { "default": mod }; | ||
}; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.replace = exports.babel = exports.globalStyle = exports.postcss = exports.stylus = exports.sass = exports.scss = exports.less = exports.typescript = exports.coffeescript = exports.pug = void 0; | ||
const autoProcess_1 = require("./autoProcess"); | ||
@@ -10,21 +14,21 @@ // default auto processor | ||
var pug_1 = require("./processors/pug"); | ||
Object.defineProperty(exports, "pug", { enumerable: true, get: function () { return pug_1.default; } }); | ||
Object.defineProperty(exports, "pug", { enumerable: true, get: function () { return __importDefault(pug_1).default; } }); | ||
var coffeescript_1 = require("./processors/coffeescript"); | ||
Object.defineProperty(exports, "coffeescript", { enumerable: true, get: function () { return coffeescript_1.default; } }); | ||
Object.defineProperty(exports, "coffeescript", { enumerable: true, get: function () { return __importDefault(coffeescript_1).default; } }); | ||
var typescript_1 = require("./processors/typescript"); | ||
Object.defineProperty(exports, "typescript", { enumerable: true, get: function () { return typescript_1.default; } }); | ||
Object.defineProperty(exports, "typescript", { enumerable: true, get: function () { return __importDefault(typescript_1).default; } }); | ||
var less_1 = require("./processors/less"); | ||
Object.defineProperty(exports, "less", { enumerable: true, get: function () { return less_1.default; } }); | ||
Object.defineProperty(exports, "less", { enumerable: true, get: function () { return __importDefault(less_1).default; } }); | ||
var scss_1 = require("./processors/scss"); | ||
Object.defineProperty(exports, "scss", { enumerable: true, get: function () { return scss_1.default; } }); | ||
Object.defineProperty(exports, "sass", { enumerable: true, get: function () { return scss_1.default; } }); | ||
Object.defineProperty(exports, "scss", { enumerable: true, get: function () { return __importDefault(scss_1).default; } }); | ||
Object.defineProperty(exports, "sass", { enumerable: true, get: function () { return __importDefault(scss_1).default; } }); | ||
var stylus_1 = require("./processors/stylus"); | ||
Object.defineProperty(exports, "stylus", { enumerable: true, get: function () { return stylus_1.default; } }); | ||
Object.defineProperty(exports, "stylus", { enumerable: true, get: function () { return __importDefault(stylus_1).default; } }); | ||
var postcss_1 = require("./processors/postcss"); | ||
Object.defineProperty(exports, "postcss", { enumerable: true, get: function () { return postcss_1.default; } }); | ||
Object.defineProperty(exports, "postcss", { enumerable: true, get: function () { return __importDefault(postcss_1).default; } }); | ||
var globalStyle_1 = require("./processors/globalStyle"); | ||
Object.defineProperty(exports, "globalStyle", { enumerable: true, get: function () { return globalStyle_1.default; } }); | ||
Object.defineProperty(exports, "globalStyle", { enumerable: true, get: function () { return __importDefault(globalStyle_1).default; } }); | ||
var babel_1 = require("./processors/babel"); | ||
Object.defineProperty(exports, "babel", { enumerable: true, get: function () { return babel_1.default; } }); | ||
Object.defineProperty(exports, "babel", { enumerable: true, get: function () { return __importDefault(babel_1).default; } }); | ||
var replace_1 = require("./processors/replace"); | ||
Object.defineProperty(exports, "replace", { enumerable: true, get: function () { return replace_1.default; } }); | ||
Object.defineProperty(exports, "replace", { enumerable: true, get: function () { return __importDefault(replace_1).default; } }); |
"use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.throwTypescriptError = exports.throwError = void 0; | ||
exports.throwError = (msg) => { | ||
const throwError = (msg) => { | ||
throw new Error(`[svelte-preprocess] ${msg}`); | ||
}; | ||
exports.throwTypescriptError = () => { | ||
exports.throwError(`Encountered type error`); | ||
exports.throwError = throwError; | ||
const throwTypescriptError = () => { | ||
(0, exports.throwError)(`Encountered type error`); | ||
}; | ||
exports.throwTypescriptError = throwTypescriptError; |
import type { PreprocessorArgs } from '../types'; | ||
export declare const ALIAS_MAP: Map<string, string>; | ||
export declare const SOURCE_MAP_PROP_MAP: Record<string, [string[], any]>; | ||
export declare function getLanguageDefaults(lang: string): null | Record<string, any>; | ||
export declare function getLanguageDefaults(lang?: string | null): null | Record<string, any>; | ||
export declare function addLanguageAlias(entries: Array<[string, string]>): void; | ||
export declare function getLanguageFromAlias(alias: string | null): string; | ||
export declare function isAliasOf(alias: string, lang: string): boolean; | ||
export declare function getLanguageFromAlias(alias?: string | null): string | null | undefined; | ||
export declare function isAliasOf(alias?: string | null, lang?: string | null): boolean; | ||
export declare const getLanguage: (attributes: PreprocessorArgs['attributes']) => { | ||
lang: string; | ||
alias: any; | ||
lang: string | null | undefined; | ||
alias: string | null; | ||
}; |
@@ -48,2 +48,4 @@ "use strict"; | ||
function getLanguageDefaults(lang) { | ||
if (lang == null) | ||
return null; | ||
const defaults = LANGUAGE_DEFAULTS[lang]; | ||
@@ -63,3 +65,4 @@ if (!defaults) | ||
function getLanguageFromAlias(alias) { | ||
return exports.ALIAS_MAP.get(alias) || alias; | ||
var _a; | ||
return alias == null ? alias : (_a = exports.ALIAS_MAP.get(alias)) !== null && _a !== void 0 ? _a : alias; | ||
} | ||
@@ -71,3 +74,3 @@ exports.getLanguageFromAlias = getLanguageFromAlias; | ||
exports.isAliasOf = isAliasOf; | ||
exports.getLanguage = (attributes) => { | ||
const getLanguage = (attributes) => { | ||
let alias = null; | ||
@@ -89,4 +92,4 @@ if (attributes.lang) { | ||
else if (typeof attributes.src === 'string' && | ||
utils_1.isValidLocalPath(attributes.src)) { | ||
const parts = path_1.basename(attributes.src).split('.'); | ||
(0, utils_1.isValidLocalPath)(attributes.src)) { | ||
const parts = (0, path_1.basename)(attributes.src).split('.'); | ||
if (parts.length > 1) { | ||
@@ -101,1 +104,2 @@ alias = parts.pop(); | ||
}; | ||
exports.getLanguage = getLanguage; |
@@ -35,3 +35,3 @@ "use strict"; | ||
/** If no <template> was found, run the transformer over the whole thing */ | ||
if (!templateMatch) { | ||
if (!templateMatch || templateMatch.index == null) { | ||
return transformer({ | ||
@@ -38,0 +38,0 @@ content, |
@@ -14,3 +14,3 @@ "use strict"; | ||
if (options.stripIndent) { | ||
content = strip_indent_1.default(content); | ||
content = (0, strip_indent_1.default)(content); | ||
} | ||
@@ -17,0 +17,0 @@ if (options.prependData) { |
import type { PreprocessorArgs } from '../types'; | ||
export declare const getTagInfo: ({ attributes, filename, content, markup, }: PreprocessorArgs) => Promise<{ | ||
filename: string; | ||
filename: string | undefined; | ||
attributes: Record<string, string | boolean>; | ||
content: string; | ||
lang: string; | ||
alias: any; | ||
dependencies: any[]; | ||
lang: string | null | undefined; | ||
alias: string | null; | ||
dependencies: string[]; | ||
markup: string; | ||
}>; |
@@ -9,6 +9,6 @@ "use strict"; | ||
const utils_1 = require("./utils"); | ||
const resolveSrc = (importerFile, srcPath) => path_1.resolve(path_1.dirname(importerFile), srcPath); | ||
const resolveSrc = (importerFile, srcPath) => (0, path_1.resolve)((0, path_1.dirname)(importerFile), srcPath); | ||
const getSrcContent = (file) => { | ||
return new Promise((resolve, reject) => { | ||
fs_1.readFile(file, (error, data) => { | ||
(0, fs_1.readFile)(file, (error, data) => { | ||
// istanbul ignore if | ||
@@ -23,5 +23,5 @@ if (error) | ||
async function doesFileExist(file) { | ||
return new Promise((resolve) => fs_1.access(file, 0, (err) => resolve(!err))); | ||
return new Promise((resolve) => (0, fs_1.access)(file, 0, (err) => resolve(!err))); | ||
} | ||
exports.getTagInfo = async ({ attributes, filename, content, markup, }) => { | ||
const getTagInfo = async ({ attributes, filename, content, markup, }) => { | ||
const dependencies = []; | ||
@@ -38,3 +38,3 @@ // catches empty content and self-closing tags | ||
/** Only try to get local files (path starts with ./ or ../) */ | ||
if (utils_1.isValidLocalPath(path)) { | ||
if ((0, utils_1.isValidLocalPath)(path) && filename) { | ||
path = resolveSrc(filename, path); | ||
@@ -50,3 +50,3 @@ if (await doesFileExist(path)) { | ||
} | ||
const { lang, alias } = language_1.getLanguage(attributes); | ||
const { lang, alias } = (0, language_1.getLanguage)(attributes); | ||
return { | ||
@@ -62,1 +62,2 @@ filename, | ||
}; | ||
exports.getTagInfo = getTagInfo; |
export declare function importAny(...modules: string[]): Promise<any>; | ||
export declare function concat(...arrs: any[]): any[]; | ||
/** Paths used by preprocessors to resolve @imports */ | ||
export declare function getIncludePaths(fromFilename: string, base?: string[]): string[]; | ||
export declare function getIncludePaths(fromFilename?: string, base?: string[]): string[]; | ||
/** | ||
@@ -15,6 +15,6 @@ * Checks if a package is installed. | ||
export declare function findUp({ what, from }: { | ||
what: any; | ||
from: any; | ||
}): string; | ||
export declare function setProp(obj: any, keyList: any, val: any): void; | ||
what: string; | ||
from: string; | ||
}): string | null; | ||
export declare function setProp(obj: any, keyList: string[], value: any): void; | ||
export declare const JAVASCRIPT_RESERVED_KEYWORD_SET: Set<string>; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -47,4 +47,6 @@ return result; | ||
function getIncludePaths(fromFilename, base = []) { | ||
if (fromFilename == null) | ||
return []; | ||
return [ | ||
...new Set([...base, 'node_modules', process.cwd(), path_1.dirname(fromFilename)]), | ||
...new Set([...base, 'node_modules', process.cwd(), (0, path_1.dirname)(fromFilename)]), | ||
]; | ||
@@ -86,11 +88,11 @@ } | ||
function findUp({ what, from }) { | ||
const { root, dir } = path_1.parse(from); | ||
const { root, dir } = (0, path_1.parse)(from); | ||
let cur = dir; | ||
try { | ||
while (cur !== root) { | ||
const possiblePath = path_1.join(cur, what); | ||
if (fs_1.existsSync(possiblePath)) { | ||
const possiblePath = (0, path_1.join)(cur, what); | ||
if ((0, fs_1.existsSync)(possiblePath)) { | ||
return possiblePath; | ||
} | ||
cur = path_1.dirname(cur); | ||
cur = (0, path_1.dirname)(cur); | ||
} | ||
@@ -105,3 +107,3 @@ } | ||
// set deep property in object | ||
function setProp(obj, keyList, val) { | ||
function setProp(obj, keyList, value) { | ||
let i = 0; | ||
@@ -115,3 +117,3 @@ for (; i < keyList.length - 1; i++) { | ||
} | ||
obj[keyList[i]] = val; | ||
obj[keyList[i]] = value; | ||
} | ||
@@ -118,0 +120,0 @@ exports.setProp = setProp; |
import type { PreprocessorGroup, Options } from '../types'; | ||
declare const _default: (options?: Options.Babel) => PreprocessorGroup; | ||
declare const _default: (options?: Options.Babel | undefined) => PreprocessorGroup; | ||
export default _default; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -29,4 +29,4 @@ return result; | ||
const { transformer } = await Promise.resolve().then(() => __importStar(require('../transformers/babel'))); | ||
let { content, filename, dependencies, attributes } = await tagInfo_1.getTagInfo(svelteFile); | ||
content = prepareContent_1.prepareContent({ options, content }); | ||
let { content, filename, dependencies, attributes } = await (0, tagInfo_1.getTagInfo)(svelteFile); | ||
content = (0, prepareContent_1.prepareContent)({ options, content }); | ||
const transformed = await transformer({ | ||
@@ -40,5 +40,5 @@ content, | ||
...transformed, | ||
dependencies: utils_1.concat(dependencies, transformed.dependencies), | ||
dependencies: (0, utils_1.concat)(dependencies, transformed.dependencies), | ||
}; | ||
}, | ||
}); |
import type { PreprocessorGroup, Options } from '../types'; | ||
declare const _default: (options?: Options.Coffeescript) => PreprocessorGroup; | ||
declare const _default: (options?: Options.Coffeescript | undefined) => PreprocessorGroup; | ||
export default _default; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -29,7 +29,7 @@ return result; | ||
const { transformer } = await Promise.resolve().then(() => __importStar(require('../transformers/coffeescript'))); | ||
let { content, filename, attributes, lang, dependencies, } = await tagInfo_1.getTagInfo(svelteFile); | ||
let { content, filename, attributes, lang, dependencies, } = await (0, tagInfo_1.getTagInfo)(svelteFile); | ||
if (lang !== 'coffeescript') { | ||
return { code: content }; | ||
} | ||
content = prepareContent_1.prepareContent({ | ||
content = (0, prepareContent_1.prepareContent)({ | ||
options: { | ||
@@ -49,5 +49,5 @@ ...options, | ||
...transformed, | ||
dependencies: utils_1.concat(dependencies, transformed.dependencies), | ||
dependencies: (0, utils_1.concat)(dependencies, transformed.dependencies), | ||
}; | ||
}, | ||
}); |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -20,0 +20,0 @@ return result; |
import type { PreprocessorGroup, Options } from '../types'; | ||
declare const _default: (options?: Options.Less) => PreprocessorGroup; | ||
declare const _default: (options?: Options.Less | undefined) => PreprocessorGroup; | ||
export default _default; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -29,7 +29,7 @@ return result; | ||
const { transformer } = await Promise.resolve().then(() => __importStar(require('../transformers/less'))); | ||
let { content, filename, attributes, lang, dependencies, } = await tagInfo_1.getTagInfo(svelteFile); | ||
let { content, filename, attributes, lang, dependencies, } = await (0, tagInfo_1.getTagInfo)(svelteFile); | ||
if (lang !== 'less') { | ||
return { code: content }; | ||
} | ||
content = prepareContent_1.prepareContent({ options, content }); | ||
content = (0, prepareContent_1.prepareContent)({ options, content }); | ||
const transformed = await transformer({ | ||
@@ -43,5 +43,5 @@ content, | ||
...transformed, | ||
dependencies: utils_1.concat(dependencies, transformed.dependencies), | ||
dependencies: (0, utils_1.concat)(dependencies, transformed.dependencies), | ||
}; | ||
}, | ||
}); |
import type { PreprocessorGroup, Options } from '../types'; | ||
declare const _default: (options?: Options.Postcss) => PreprocessorGroup; | ||
declare const _default: (options?: Options.Postcss | undefined) => PreprocessorGroup; | ||
/** Adapted from https://github.com/TehShrike/svelte-preprocess-postcss */ | ||
export default _default; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -30,4 +30,4 @@ return result; | ||
const { transformer } = await Promise.resolve().then(() => __importStar(require('../transformers/postcss'))); | ||
let { content, filename, attributes, dependencies } = await tagInfo_1.getTagInfo(svelteFile); | ||
content = prepareContent_1.prepareContent({ options, content }); | ||
let { content, filename, attributes, dependencies } = await (0, tagInfo_1.getTagInfo)(svelteFile); | ||
content = (0, prepareContent_1.prepareContent)({ options, content }); | ||
/** If manually passed a plugins array, use it as the postcss config */ | ||
@@ -42,5 +42,5 @@ const transformed = await transformer({ | ||
...transformed, | ||
dependencies: utils_1.concat(dependencies, transformed.dependencies), | ||
dependencies: (0, utils_1.concat)(dependencies, transformed.dependencies), | ||
}; | ||
}, | ||
}); |
import type { Options, PreprocessorGroup } from '../types/index'; | ||
declare const _default: (options?: Options.Pug) => PreprocessorGroup; | ||
declare const _default: (options?: Options.Pug | undefined) => PreprocessorGroup; | ||
export default _default; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -28,3 +28,3 @@ return result; | ||
const { transformer } = await Promise.resolve().then(() => __importStar(require('../transformers/pug'))); | ||
content = prepareContent_1.prepareContent({ | ||
content = (0, prepareContent_1.prepareContent)({ | ||
options: { | ||
@@ -36,4 +36,4 @@ ...options, | ||
}); | ||
return markup_1.transformMarkup({ content, filename }, transformer, options); | ||
return (0, markup_1.transformMarkup)({ content, filename }, transformer, options); | ||
}, | ||
}); |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -20,0 +20,0 @@ return result; |
import type { PreprocessorGroup, Options } from '../types'; | ||
declare const _default: (options?: Options.Sass) => PreprocessorGroup; | ||
declare const _default: (options?: Options.Sass | undefined) => PreprocessorGroup; | ||
export default _default; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -29,3 +29,3 @@ return result; | ||
const { transformer } = await Promise.resolve().then(() => __importStar(require('../transformers/scss'))); | ||
let { content, filename, attributes, lang, alias, dependencies, } = await tagInfo_1.getTagInfo(svelteFile); | ||
let { content, filename, attributes, lang, alias, dependencies, } = await (0, tagInfo_1.getTagInfo)(svelteFile); | ||
if (alias === 'sass') { | ||
@@ -41,3 +41,3 @@ options = { | ||
} | ||
content = prepareContent_1.prepareContent({ options, content }); | ||
content = (0, prepareContent_1.prepareContent)({ options, content }); | ||
const transformed = await transformer({ | ||
@@ -51,5 +51,5 @@ content, | ||
...transformed, | ||
dependencies: utils_1.concat(dependencies, transformed.dependencies), | ||
dependencies: (0, utils_1.concat)(dependencies, transformed.dependencies), | ||
}; | ||
}, | ||
}); |
import type { Options, PreprocessorGroup } from '../types'; | ||
declare const _default: (options?: Options.Stylus) => PreprocessorGroup; | ||
declare const _default: (options?: Options.Stylus | undefined) => PreprocessorGroup; | ||
export default _default; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -29,7 +29,7 @@ return result; | ||
const { transformer } = await Promise.resolve().then(() => __importStar(require('../transformers/stylus'))); | ||
let { content, filename, attributes, lang, dependencies, } = await tagInfo_1.getTagInfo(svelteFile); | ||
let { content, filename, attributes, lang, dependencies, } = await (0, tagInfo_1.getTagInfo)(svelteFile); | ||
if (lang !== 'stylus') { | ||
return { code: content }; | ||
} | ||
content = prepareContent_1.prepareContent({ | ||
content = (0, prepareContent_1.prepareContent)({ | ||
options: { | ||
@@ -49,5 +49,5 @@ ...options, | ||
...transformed, | ||
dependencies: utils_1.concat(dependencies, transformed.dependencies), | ||
dependencies: (0, utils_1.concat)(dependencies, transformed.dependencies), | ||
}; | ||
}, | ||
}); |
import type { Options, PreprocessorGroup } from '../types'; | ||
declare const _default: (options?: Options.Typescript) => PreprocessorGroup; | ||
declare const _default: (options?: Options.Typescript | undefined) => PreprocessorGroup; | ||
export default _default; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -29,7 +29,7 @@ return result; | ||
const { transformer } = await Promise.resolve().then(() => __importStar(require('../transformers/typescript'))); | ||
let { content, markup, filename, attributes, lang, dependencies, } = await tagInfo_1.getTagInfo(svelteFile); | ||
let { content, markup, filename, attributes, lang, dependencies, } = await (0, tagInfo_1.getTagInfo)(svelteFile); | ||
if (lang !== 'typescript') { | ||
return { code: content }; | ||
} | ||
content = prepareContent_1.prepareContent({ options, content }); | ||
content = (0, prepareContent_1.prepareContent)({ options, content }); | ||
const transformed = await transformer({ | ||
@@ -44,5 +44,5 @@ content, | ||
...transformed, | ||
dependencies: utils_1.concat(dependencies, transformed.dependencies), | ||
dependencies: (0, utils_1.concat)(dependencies, transformed.dependencies), | ||
}; | ||
}, | ||
}); |
@@ -11,3 +11,3 @@ "use strict"; | ||
// istanbul ignore next | ||
sourceMaps: !!options.sourceMaps, | ||
sourceMaps: !!(options === null || options === void 0 ? void 0 : options.sourceMaps), | ||
filename, | ||
@@ -18,8 +18,12 @@ minified: false, | ||
}; | ||
const { code, map: sourcemap } = await core_1.transformAsync(content, babelOptions); | ||
const result = await (0, core_1.transformAsync)(content, babelOptions); | ||
if (result == null) { | ||
return { code: content }; | ||
} | ||
const { code, map: sourcemap } = result; | ||
return { | ||
code, | ||
map: sourcemap, | ||
code: code, | ||
map: sourcemap !== null && sourcemap !== void 0 ? sourcemap : undefined, | ||
}; | ||
}; | ||
exports.transformer = transformer; |
@@ -56,3 +56,3 @@ "use strict"; | ||
].filter(Boolean); | ||
const { css, map: newMap } = await postcss_1.default(plugins).process(content, { | ||
const { css, map: newMap } = await (0, postcss_1.default)(plugins).process(content, { | ||
from: filename, | ||
@@ -59,0 +59,0 @@ map: (options === null || options === void 0 ? void 0 : options.sourceMap) ? { prev: map } : false, |
@@ -11,3 +11,3 @@ "use strict"; | ||
options = { | ||
paths: utils_1.getIncludePaths(filename, options.paths), | ||
paths: (0, utils_1.getIncludePaths)(filename, options.paths), | ||
...options, | ||
@@ -14,0 +14,0 @@ }; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -29,3 +29,3 @@ return result; | ||
async function process({ options: { plugins = [], parser, syntax } = {}, content, filename, sourceMap, }) { | ||
const { css, map, messages } = await postcss_1.default(plugins).process(content, { | ||
const { css, map, messages } = await (0, postcss_1.default)(plugins).process(content, { | ||
from: filename, | ||
@@ -68,3 +68,3 @@ map: { prev: sourceMap, inline: false }, | ||
const transformer = async ({ content, filename, options = {}, map, }) => { | ||
let fileConfig; | ||
let fileConfig = null; | ||
if (!options.plugins) { | ||
@@ -77,3 +77,3 @@ fileConfig = await getConfigFromFile(options); | ||
} | ||
if (fileConfig.error !== null) { | ||
if ((fileConfig === null || fileConfig === void 0 ? void 0 : fileConfig.error) != null) { | ||
console.error(`[svelte-preprocess] PostCSS configuration was not passed or is invalid. If you expect to load it from a file make sure to install "postcss-load-config" and try again.\n\n${fileConfig.error}`); | ||
@@ -80,0 +80,0 @@ } |
@@ -61,10 +61,10 @@ "use strict"; | ||
}; | ||
const { type: identationType } = detect_indent_1.default(content); | ||
const code = `${GET_MIXINS(identationType)}\n${content}`; | ||
const { type: identationType } = (0, detect_indent_1.default)(content); | ||
const code = `${GET_MIXINS(identationType !== null && identationType !== void 0 ? identationType : 'space')}\n${content}`; | ||
const compiled = pug_1.default.compile(code, pugOptions); | ||
return { | ||
code: compiled(), | ||
dependencies: (_a = compiled.dependencies) !== null && _a !== void 0 ? _a : null, | ||
dependencies: (_a = compiled.dependencies) !== null && _a !== void 0 ? _a : [], | ||
}; | ||
}; | ||
exports.transformer = transformer; |
@@ -6,2 +6,5 @@ "use strict"; | ||
let newContent = content; | ||
if (options == null) { | ||
return { code: content }; | ||
} | ||
for (const [regex, replacer] of options) { | ||
@@ -8,0 +11,0 @@ newContent = newContent.replace(regex, replacer); |
@@ -13,5 +13,5 @@ "use strict"; | ||
// More info: https://github.com/sveltejs/svelte-preprocess/issues/346 | ||
const absoluteEntryPath = path_1.isAbsolute(result.stats.entry) | ||
const absoluteEntryPath = (0, path_1.isAbsolute)(result.stats.entry) | ||
? result.stats.entry | ||
: path_1.join(process.cwd(), result.stats.entry); | ||
: (0, path_1.join)(process.cwd(), result.stats.entry); | ||
const processed = { | ||
@@ -34,4 +34,4 @@ code: result.css.toString(), | ||
} | ||
const modulePath = path_1.join('node_modules', ...url.slice(1).split(/[\\/]/g)); | ||
const foundPath = utils_1.findUp({ what: modulePath, from: prev }); | ||
const modulePath = (0, path_1.join)('node_modules', ...url.slice(1).split(/[\\/]/g)); | ||
const foundPath = (0, utils_1.findUp)({ what: modulePath, from: prev }); | ||
// istanbul ignore if | ||
@@ -41,3 +41,3 @@ if (foundPath == null) { | ||
} | ||
const contents = fs_1.readFileSync(foundPath).toString(); | ||
const contents = (0, fs_1.readFileSync)(foundPath).toString(); | ||
return { contents }; | ||
@@ -49,3 +49,3 @@ }; | ||
if (implementation == null) { | ||
const mod = await utils_1.importAny('sass', 'node-sass'); | ||
const mod = (await (0, utils_1.importAny)('sass', 'node-sass')); | ||
// eslint-disable-next-line no-multi-assign | ||
@@ -56,5 +56,5 @@ implementation = sass = mod.default; | ||
...options, | ||
includePaths: utils_1.getIncludePaths(filename, options.includePaths), | ||
includePaths: (0, utils_1.getIncludePaths)(filename, options.includePaths), | ||
outFile: `${filename}.css`, | ||
omitSourceMapUrl: true, | ||
omitSourceMapUrl: true, // return sourcemap only in result.map | ||
}; | ||
@@ -61,0 +61,0 @@ const sassOptions = { |
@@ -12,7 +12,7 @@ "use strict"; | ||
options = { | ||
paths: utils_1.getIncludePaths(filename, options.paths), | ||
paths: (0, utils_1.getIncludePaths)(filename, options.paths), | ||
...options, | ||
}; | ||
return new Promise((resolve, reject) => { | ||
const style = stylus_1.default(content, { | ||
const style = (0, stylus_1.default)(content, { | ||
filename, | ||
@@ -19,0 +19,0 @@ ...options, |
import ts from 'typescript'; | ||
import type { Transformer, Options } from '../types'; | ||
export declare function loadTsconfig(compilerOptionsJSON: any, filename: string, tsOptions: Options.Typescript): { | ||
errors: any[]; | ||
errors: never[]; | ||
options: any; | ||
@@ -6,0 +6,0 @@ } | { |
@@ -44,6 +44,6 @@ "use strict"; | ||
function getScriptContent(markup, module) { | ||
const regex = markup_1.createTagRegex('script', 'gi'); | ||
const regex = (0, markup_1.createTagRegex)('script', 'gi'); | ||
let match; | ||
while ((match = regex.exec(markup)) !== null) { | ||
const { context } = markup_1.parseAttributes(match[1]); | ||
const { context } = (0, markup_1.parseAttributes)(match[1] || ''); | ||
if ((context !== 'module' && !module) || (context === 'module' && module)) { | ||
@@ -68,3 +68,3 @@ return match[2]; | ||
return content; | ||
const { vars } = compiler_1.compile(markup_1.stripTags(markup), { | ||
const { vars } = (0, compiler_1.compile)((0, markup_1.stripTags)(markup), { | ||
generate: false, | ||
@@ -162,3 +162,3 @@ varsReport: 'full', | ||
}); | ||
if (diagnostics.length > 0) { | ||
if (diagnostics && diagnostics.length > 0) { | ||
// could this be handled elsewhere? | ||
@@ -169,3 +169,3 @@ const hasError = diagnostics.some((d) => d.category === typescript_1.default.DiagnosticCategory.Error); | ||
if (hasError) { | ||
errors_1.throwTypescriptError(); | ||
(0, errors_1.throwTypescriptError)(); | ||
} | ||
@@ -181,3 +181,3 @@ } | ||
const fileDirectory = (tsOptions.tsconfigDirectory || | ||
path_1.dirname(filename)); | ||
(0, path_1.dirname)(filename)); | ||
let tsconfigFile = tsOptions.tsconfigFile || | ||
@@ -188,6 +188,6 @@ typescript_1.default.findConfigFile(fileDirectory, typescript_1.default.sys.fileExists); | ||
} | ||
tsconfigFile = path_1.isAbsolute(tsconfigFile) | ||
tsconfigFile = (0, path_1.isAbsolute)(tsconfigFile) | ||
? tsconfigFile | ||
: path_1.join(basePath, tsconfigFile); | ||
basePath = path_1.dirname(tsconfigFile); | ||
: (0, path_1.join)(basePath, tsconfigFile); | ||
basePath = (0, path_1.dirname)(tsconfigFile); | ||
const { error, config } = typescript_1.default.readConfigFile(tsconfigFile, typescript_1.default.sys.readFile); | ||
@@ -225,3 +225,3 @@ if (error) { | ||
}); | ||
if (sourceMapChain) { | ||
if (sourceMapChain && sourceMapText) { | ||
const fname = `${filename}.transpiled.js`; | ||
@@ -271,3 +271,5 @@ sourceMapChain.content[fname] = transpiledCode; | ||
const basePath = process.cwd(); | ||
filename = path_1.isAbsolute(filename) ? filename : path_1.resolve(basePath, filename); | ||
if (filename == null) | ||
return { code: content }; | ||
filename = (0, path_1.isAbsolute)(filename) ? filename : (0, path_1.resolve)(basePath, filename); | ||
const compilerOptions = getCompilerOptions({ filename, options, basePath }); | ||
@@ -274,0 +276,0 @@ const versionParts = package_json_1.default.version.split('.'); |
@@ -8,3 +8,3 @@ import type { Processed as SvelteProcessed, Preprocessor, PreprocessorGroup } from 'svelte/types/compiler/preprocess'; | ||
content: string; | ||
filename: string; | ||
filename?: string; | ||
attributes?: Record<string, any>; | ||
@@ -11,0 +11,0 @@ map?: string | object; |
@@ -17,3 +17,3 @@ "use strict"; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||
__setModuleDefault(result, mod); | ||
@@ -20,0 +20,0 @@ return result; |
@@ -31,4 +31,4 @@ import type * as postcss from 'postcss'; | ||
implementation?: { | ||
render?: typeof render; | ||
renderSync?: typeof renderSync; | ||
render: typeof render; | ||
renderSync: typeof renderSync; | ||
}; | ||
@@ -35,0 +35,0 @@ renderSync?: boolean; |
{ | ||
"name": "svelte-preprocess", | ||
"version": "4.9.0", | ||
"version": "4.9.1", | ||
"license": "MIT", | ||
@@ -64,4 +64,4 @@ "main": "dist/index.js", | ||
"@babel/preset-env": "^7.10.2", | ||
"@kiwi/eslint-config": "^1.4.3", | ||
"@kiwi/prettier-config": "^1.4.3", | ||
"@kiwi/eslint-config": "^1.16.5", | ||
"@kiwi/prettier-config": "^1.16.5", | ||
"@types/jest": "^25.2.3", | ||
@@ -91,3 +91,3 @@ "@types/node": "^14.0.11", | ||
"ts-jest": "^25.1.0", | ||
"typescript": "^3.9.5" | ||
"typescript": "^4.4.2" | ||
}, | ||
@@ -113,3 +113,3 @@ "dependencies": { | ||
"svelte": "^3.23.0", | ||
"typescript": "^3.9.5 || ^4.0.0" | ||
"typescript": "^4.4.2" | ||
}, | ||
@@ -116,0 +116,0 @@ "peerDependenciesMeta": { |
95313
2125