This commit is contained in:
Eugene Zolenko 2018-01-29 12:04:31 -07:00
parent 34fff367e8
commit e6e72fb2b0
7 changed files with 12 additions and 6 deletions

View File

@ -19719,6 +19719,8 @@ function getOptionsOverrides(_a, tsConfigJson) {
moduleResolution: tsModule.ModuleResolutionKind.NodeJs,
};
var declaration = lodash_1(tsConfigJson, "compilerOptions.declaration", false);
if (!declaration)
overrides.declarationDir = null;
if (declaration && !useTsconfigDeclarationDir)
overrides.declarationDir = process.cwd();
return overrides;
@ -19797,7 +19799,7 @@ function typescript(options) {
rollupOptions = __assign({}, config);
context = new ConsoleContext(pluginOptions.verbosity, "rpt2: ");
context.info("typescript version: " + tsModule.version);
context.info("rollup-plugin-typescript2 version: 0.10.0");
context.info("rollup-plugin-typescript2 version: 0.10.1");
context.debug(function () { return "plugin options:\n" + JSON.stringify(pluginOptions, function (key, value) { return key === "typescript" ? "version " + value.version : value; }, 4); });
context.debug(function () { return "rollup config:\n" + JSON.stringify(rollupOptions, undefined, 4); });
watchMode = process.env.ROLLUP_WATCH === "true";

File diff suppressed because one or more lines are too long

View File

@ -19715,6 +19715,8 @@ function getOptionsOverrides(_a, tsConfigJson) {
moduleResolution: tsModule.ModuleResolutionKind.NodeJs,
};
var declaration = lodash_1(tsConfigJson, "compilerOptions.declaration", false);
if (!declaration)
overrides.declarationDir = null;
if (declaration && !useTsconfigDeclarationDir)
overrides.declarationDir = process.cwd();
return overrides;
@ -19793,7 +19795,7 @@ function typescript(options) {
rollupOptions = __assign({}, config);
context = new ConsoleContext(pluginOptions.verbosity, "rpt2: ");
context.info("typescript version: " + tsModule.version);
context.info("rollup-plugin-typescript2 version: 0.10.0");
context.info("rollup-plugin-typescript2 version: 0.10.1");
context.debug(function () { return "plugin options:\n" + JSON.stringify(pluginOptions, function (key, value) { return key === "typescript" ? "version " + value.version : value; }, 4); });
context.debug(function () { return "rollup config:\n" + JSON.stringify(rollupOptions, undefined, 4); });
watchMode = process.env.ROLLUP_WATCH === "true";

File diff suppressed because one or more lines are too long

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "rollup-plugin-typescript2",
"version": "0.10.0",
"version": "0.10.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "rollup-plugin-typescript2",
"version": "0.10.0",
"version": "0.10.1",
"description": "Seamless integration between Rollup and TypeScript. Now with errors.",
"main": "dist/rollup-plugin-typescript2.cjs.js",
"module": "dist/rollup-plugin-typescript2.es.js",

View File

@ -17,6 +17,8 @@ export function getOptionsOverrides({ useTsconfigDeclarationDir }: IOptions, tsC
const declaration = _.get(tsConfigJson, "compilerOptions.declaration", false);
if (!declaration)
(overrides as any).declarationDir = null;
if (declaration && !useTsconfigDeclarationDir)
(overrides as any).declarationDir = process.cwd();