Merge branch 'cuyl-fix-missing-file'

ezolenko · Mar 11, 2019 · 4806613 · 4806613
2 parents 29b13a0 + 578536a
commit 4806613
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/dist/index.d.ts.map b/dist/index.d.ts.map
diff --git a/dist/rollup-plugin-typescript2.cjs.js b/dist/rollup-plugin-typescript2.cjs.js
@@ -26625,7 +26625,7 @@ const typescript = (options) => {
             cache().done();
             generateRound++;
         },
-        _onwrite({ file }) {
+        _onwrite({ file, dir }) {
             if (parsedConfig.options.declaration) {
                 lodash_2(parsedConfig.fileNames, (name) => {
                     const key = normalize(name);
@@ -26638,6 +26638,7 @@ const typescript = (options) => {
                         declarations[key] = { type: out.dts, map: out.dtsmap };
                 });
                 const bundleFile = file;
+                const outputDir = dir;
                 const writeDeclaration = (key, extension, entry) => {
                     if (!entry)
                         return;
@@ -26647,11 +26648,11 @@ const typescript = (options) => {
                     let writeToPath;
                     // If for some reason no 'dest' property exists or if 'useTsconfigDeclarationDir' is given in the plugin options,
                     // use the path provided by Typescript's LanguageService.
-                    if (!bundleFile || pluginOptions.useTsconfigDeclarationDir)
+                    if ((!bundleFile && !outputDir) || pluginOptions.useTsconfigDeclarationDir)
                         writeToPath = fileName;
                     else {
                         // Otherwise, take the directory name from the path and make sure it is absolute.
-                        const destDirname = path.dirname(bundleFile);
+                        const destDirname = bundleFile ? path.dirname(bundleFile) : outputDir;
                         const destDirectory = path.isAbsolute(destDirname) ? destDirname : path.join(process.cwd(), destDirname);
                         writeToPath = path.join(destDirectory, path.relative(process.cwd(), fileName));
                     }

diff --git a/dist/rollup-plugin-typescript2.cjs.js.map b/dist/rollup-plugin-typescript2.cjs.js.map
diff --git a/dist/rollup-plugin-typescript2.es.js b/dist/rollup-plugin-typescript2.es.js
@@ -26621,7 +26621,7 @@ const typescript = (options) => {
             cache().done();
             generateRound++;
         },
-        _onwrite({ file }) {
+        _onwrite({ file, dir }) {
             if (parsedConfig.options.declaration) {
                 lodash_2(parsedConfig.fileNames, (name) => {
                     const key = normalize(name);
@@ -26634,6 +26634,7 @@ const typescript = (options) => {
                         declarations[key] = { type: out.dts, map: out.dtsmap };
                 });
                 const bundleFile = file;
+                const outputDir = dir;
                 const writeDeclaration = (key, extension, entry) => {
                     if (!entry)
                         return;
@@ -26643,11 +26644,11 @@ const typescript = (options) => {
                     let writeToPath;
                     // If for some reason no 'dest' property exists or if 'useTsconfigDeclarationDir' is given in the plugin options,
                     // use the path provided by Typescript's LanguageService.
-                    if (!bundleFile || pluginOptions.useTsconfigDeclarationDir)
+                    if ((!bundleFile && !outputDir) || pluginOptions.useTsconfigDeclarationDir)
                         writeToPath = fileName;
                     else {
                         // Otherwise, take the directory name from the path and make sure it is absolute.
-                        const destDirname = dirname(bundleFile);
+                        const destDirname = bundleFile ? dirname(bundleFile) : outputDir;
                         const destDirectory = isAbsolute(destDirname) ? destDirname : join(process.cwd(), destDirname);
                         writeToPath = join(destDirectory, relative(process.cwd(), fileName));
                     }

diff --git a/dist/rollup-plugin-typescript2.es.js.map b/dist/rollup-plugin-typescript2.es.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -283,7 +283,7 @@ const typescript: PluginImpl<Partial<IOptions>> = (options) =>
 			generateRound++;
 		},
 
-		_onwrite({ file }: OutputOptions): void
+		_onwrite({ file, dir }: OutputOptions): void
 		{
 			if (parsedConfig.options.declaration)
 			{
@@ -300,6 +300,7 @@ const typescript: PluginImpl<Partial<IOptions>> = (options) =>
 				});
 
 				const bundleFile = file;
+				const outputDir = dir;
 
 				const writeDeclaration = (key: string, extension: string, entry?: tsTypes.OutputFile) =>
 				{
@@ -313,12 +314,12 @@ const typescript: PluginImpl<Partial<IOptions>> = (options) =>
 					let writeToPath: string;
 					// If for some reason no 'dest' property exists or if 'useTsconfigDeclarationDir' is given in the plugin options,
 					// use the path provided by Typescript's LanguageService.
-					if (!bundleFile || pluginOptions.useTsconfigDeclarationDir)
+					if ((!bundleFile && !outputDir) || pluginOptions.useTsconfigDeclarationDir)
 						writeToPath = fileName;
 					else
 					{
 						// Otherwise, take the directory name from the path and make sure it is absolute.
-						const destDirname = dirname(bundleFile);
+						const destDirname = bundleFile ? dirname(bundleFile) : <string>outputDir;
 						const destDirectory = isAbsolute(destDirname) ? destDirname : join(process.cwd(), destDirname);
 						writeToPath = join(destDirectory, relative(process.cwd(), fileName));
 					}