From 58432854114e04fa912ca7e6cae9d73cbcdddb62 Mon Sep 17 00:00:00 2001 From: wessberg Date: Mon, 31 Jul 2017 15:15:05 +0200 Subject: [PATCH] Built dist --- dist/get-options-overrides.d.ts | 3 ++- dist/parse-ts-config.d.ts | 3 ++- dist/rollup-plugin-typescript2.cjs.js | 21 ++++++++------------- dist/rollup-plugin-typescript2.es.js | 21 ++++++++------------- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dist/get-options-overrides.d.ts b/dist/get-options-overrides.d.ts index 0e71789..794156e 100644 --- a/dist/get-options-overrides.d.ts +++ b/dist/get-options-overrides.d.ts @@ -1,2 +1,3 @@ import { CompilerOptions } from "typescript"; -export declare function getOptionsOverrides(): CompilerOptions; +import { IOptions } from "./ioptions"; +export declare function getOptionsOverrides({useTsconfigDeclarationDir}: IOptions): CompilerOptions; diff --git a/dist/parse-ts-config.d.ts b/dist/parse-ts-config.d.ts index eaecf8b..0058346 100644 --- a/dist/parse-ts-config.d.ts +++ b/dist/parse-ts-config.d.ts @@ -1,3 +1,4 @@ import { ParsedCommandLine } from "typescript"; import { IContext } from "./context"; -export declare function parseTsConfig(tsconfig: string, context: IContext): ParsedCommandLine; +import { IOptions } from "./ioptions"; +export declare function parseTsConfig(tsconfig: string, context: IContext, pluginOptions: IOptions): ParsedCommandLine; diff --git a/dist/rollup-plugin-typescript2.cjs.js b/dist/rollup-plugin-typescript2.cjs.js index 5d59cce..936d008 100644 --- a/dist/rollup-plugin-typescript2.cjs.js +++ b/dist/rollup-plugin-typescript2.cjs.js @@ -449,17 +449,12 @@ function printDiagnostics(context, diagnostics) { }); } -function getOptionsOverrides() { - return { - module: typescript.ModuleKind.ES2015, - noEmitHelpers: true, - importHelpers: true, - noResolve: false, - outDir: process.cwd(), - }; +function getOptionsOverrides(_a) { + var useTsconfigDeclarationDir = _a.useTsconfigDeclarationDir; + return __assign({ module: typescript.ModuleKind.ES2015, noEmitHelpers: true, importHelpers: true, noResolve: false, outDir: process.cwd() }, (useTsconfigDeclarationDir ? {} : { declarationDir: process.cwd() })); } -function parseTsConfig(tsconfig, context) { +function parseTsConfig(tsconfig, context, pluginOptions) { var fileName = typescript.findConfigFile(process.cwd(), typescript.sys.fileExists, tsconfig); if (!fileName) throw new Error("couldn't find '" + tsconfig + "' in " + process.cwd()); @@ -469,7 +464,7 @@ function parseTsConfig(tsconfig, context) { printDiagnostics(context, convertDiagnostic("config", [result.error])); throw new Error("failed to parse " + fileName); } - return typescript.parseJsonConfigFileContent(result.config, typescript.sys, path.dirname(fileName), getOptionsOverrides(), fileName); + return typescript.parseJsonConfigFileContent(result.config, typescript.sys, path.dirname(fileName), getOptionsOverrides(pluginOptions), fileName); } // The injected id for helpers. @@ -487,6 +482,7 @@ catch (e) { // tslint:disable-next-line:no-var-requires var createFilter = require("rollup-pluginutils").createFilter; +// tslint:enable-next-line:no-var-requires var watchMode = false; var round = 0; var targetCount = 0; @@ -525,7 +521,7 @@ function typescript$1(options) { context.info("Typescript version: " + typescript.version); context.debug("Plugin Options: " + JSON.stringify(pluginOptions, undefined, 4)); filter$1 = createFilter(pluginOptions.include, pluginOptions.exclude); - parsedConfig = parseTsConfig(pluginOptions.tsconfig, context); + parsedConfig = parseTsConfig(pluginOptions.tsconfig, context, pluginOptions); servicesHost = new LanguageServiceHost(parsedConfig); service = typescript.createLanguageService(servicesHost, typescript.createDocumentRegistry()); // printing compiler option errors @@ -635,8 +631,7 @@ function typescript$1(options) { var baseDeclarationDir = parsedConfig.options.outDir; lodash.each(declarations, function (_a) { var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark; - var relativeFromBaseDeclarationDir = path.relative(baseDeclarationDir, name); - var writeToPath = path.join(destDirectory, relativeFromBaseDeclarationDir); + var writeToPath = pluginOptions.useTsconfigDeclarationDir ? name : path.join(destDirectory, path.relative(baseDeclarationDir, name)); typescript.sys.writeFile(writeToPath, text, writeByteOrderMark); }); }, diff --git a/dist/rollup-plugin-typescript2.es.js b/dist/rollup-plugin-typescript2.es.js index 7c631f8..7d0eb47 100644 --- a/dist/rollup-plugin-typescript2.es.js +++ b/dist/rollup-plugin-typescript2.es.js @@ -448,17 +448,12 @@ function printDiagnostics(context, diagnostics) { }); } -function getOptionsOverrides() { - return { - module: ModuleKind.ES2015, - noEmitHelpers: true, - importHelpers: true, - noResolve: false, - outDir: process.cwd(), - }; +function getOptionsOverrides(_a) { + var useTsconfigDeclarationDir = _a.useTsconfigDeclarationDir; + return __assign({ module: ModuleKind.ES2015, noEmitHelpers: true, importHelpers: true, noResolve: false, outDir: process.cwd() }, (useTsconfigDeclarationDir ? {} : { declarationDir: process.cwd() })); } -function parseTsConfig(tsconfig, context) { +function parseTsConfig(tsconfig, context, pluginOptions) { var fileName = findConfigFile(process.cwd(), sys.fileExists, tsconfig); if (!fileName) throw new Error("couldn't find '" + tsconfig + "' in " + process.cwd()); @@ -468,7 +463,7 @@ function parseTsConfig(tsconfig, context) { printDiagnostics(context, convertDiagnostic("config", [result.error])); throw new Error("failed to parse " + fileName); } - return parseJsonConfigFileContent(result.config, sys, dirname(fileName), getOptionsOverrides(), fileName); + return parseJsonConfigFileContent(result.config, sys, dirname(fileName), getOptionsOverrides(pluginOptions), fileName); } // The injected id for helpers. @@ -486,6 +481,7 @@ catch (e) { // tslint:disable-next-line:no-var-requires var createFilter = require("rollup-pluginutils").createFilter; +// tslint:enable-next-line:no-var-requires var watchMode = false; var round = 0; var targetCount = 0; @@ -524,7 +520,7 @@ function typescript$1(options) { context.info("Typescript version: " + version); context.debug("Plugin Options: " + JSON.stringify(pluginOptions, undefined, 4)); filter$1 = createFilter(pluginOptions.include, pluginOptions.exclude); - parsedConfig = parseTsConfig(pluginOptions.tsconfig, context); + parsedConfig = parseTsConfig(pluginOptions.tsconfig, context, pluginOptions); servicesHost = new LanguageServiceHost(parsedConfig); service = createLanguageService(servicesHost, createDocumentRegistry()); // printing compiler option errors @@ -634,8 +630,7 @@ function typescript$1(options) { var baseDeclarationDir = parsedConfig.options.outDir; each(declarations, function (_a) { var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark; - var relativeFromBaseDeclarationDir = relative(baseDeclarationDir, name); - var writeToPath = join(destDirectory, relativeFromBaseDeclarationDir); + var writeToPath = pluginOptions.useTsconfigDeclarationDir ? name : join(destDirectory, relative(baseDeclarationDir, name)); sys.writeFile(writeToPath, text, writeByteOrderMark); }); },