Skip to content

Commit

Permalink
- fix for rollup 0.48.2 #30
Browse files Browse the repository at this point in the history
  • Loading branch information
@ezolenko
ezolenko committed Aug 26, 2017
1 parent 4c26ddc commit fe70d27
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 40 deletions.
2 changes: 1 addition & 1 deletion dist/index.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default function typescript(options?: Partial<IOptions>): {
load(id: string): string | undefined;
transform(this: IRollupContext, code: string, id: string): ICode | undefined;
ongenerate(bundleOptions: any): void;
onwrite({dest}: IRollupOptions): void;
onwrite({dest, file}: IRollupOptions): void;
};
49 changes: 25 additions & 24 deletions dist/rollup-plugin-typescript2.cjs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var fs = require('fs');
var graphlib = require('graphlib');
var objectHash = require('object-hash');
var fsExtra = require('fs-extra');
var colors_safe = require('colors/safe');
var safe = require('colors/safe');
var resolve = require('resolve');
var path = require('path');

Expand Down Expand Up @@ -309,13 +309,13 @@ var TsCache = (function () {
this.checkAmbientTypes();
}
TsCache.prototype.clean = function () {
this.context.info(colors_safe.blue("cleaning cache: " + this.cacheDir));
this.context.info(safe.blue("cleaning cache: " + this.cacheDir));
fsExtra.emptyDirSync(this.cacheDir);
this.init();
};
TsCache.prototype.setDependency = function (importee, importer) {
// importee -> importer
this.context.debug(colors_safe.blue("dependency") + " '" + importee + "'");
this.context.debug(safe.blue("dependency") + " '" + importee + "'");
this.context.debug(" imported by '" + importer + "'");
this.dependencyTree.setEdge(importer, importee);
};
Expand All @@ -325,28 +325,28 @@ var TsCache = (function () {
_.each(graphlib.alg.topsort(this.dependencyTree), function (id) { return cb(id); });
return;
}
this.context.info(colors_safe.yellow("import tree has cycles"));
this.context.info(safe.yellow("import tree has cycles"));
_.each(this.dependencyTree.nodes(), function (id) { return cb(id); });
};
TsCache.prototype.done = function () {
this.context.info(colors_safe.blue("rolling caches"));
this.context.info(safe.blue("rolling caches"));
this.codeCache.roll();
this.semanticDiagnosticsCache.roll();
this.syntacticDiagnosticsCache.roll();
this.typesCache.roll();
};
TsCache.prototype.getCompiled = function (id, snapshot, transform) {
var name = this.makeName(id, snapshot);
this.context.info(colors_safe.blue("transpiling") + " '" + id + "'");
this.context.info(safe.blue("transpiling") + " '" + id + "'");
this.context.debug(" cache: '" + this.codeCache.path(name) + "'");
if (!this.codeCache.exists(name) || this.isDirty(id, false)) {
this.context.debug(colors_safe.yellow(" cache miss"));
this.context.debug(safe.yellow(" cache miss"));
var transformedData = transform();
this.codeCache.write(name, transformedData);
this.markAsDirty(id);
return transformedData;
}
this.context.debug(colors_safe.green(" cache hit"));
this.context.debug(safe.green(" cache hit"));
var data = this.codeCache.read(name);
this.codeCache.write(name, data);
return data;
Expand All @@ -359,7 +359,7 @@ var TsCache = (function () {
};
TsCache.prototype.checkAmbientTypes = function () {
var _this = this;
this.context.debug(colors_safe.blue("Ambient types:"));
this.context.debug(safe.blue("Ambient types:"));
var typeNames = _.filter(this.ambientTypes, function (snapshot) { return snapshot.snapshot !== undefined; })
.map(function (snapshot) {
_this.context.debug(" " + snapshot.id);
Expand All @@ -368,20 +368,20 @@ var TsCache = (function () {
// types dirty if any d.ts changed, added or removed
this.ambientTypesDirty = !this.typesCache.match(typeNames);
if (this.ambientTypesDirty)
this.context.info(colors_safe.yellow("ambient types changed, redoing all semantic diagnostics"));
this.context.info(safe.yellow("ambient types changed, redoing all semantic diagnostics"));
_.each(typeNames, function (name) { return _this.typesCache.touch(name); });
};
TsCache.prototype.getDiagnostics = function (type, cache, id, snapshot, check) {
var name = this.makeName(id, snapshot);
this.context.debug(" cache: '" + cache.path(name) + "'");
if (!cache.exists(name) || this.isDirty(id, true)) {
this.context.debug(colors_safe.yellow(" cache miss"));
this.context.debug(safe.yellow(" cache miss"));
var convertedData = convertDiagnostic(type, check());
cache.write(name, convertedData);
this.markAsDirty(id);
return convertedData;
}
this.context.debug(colors_safe.green(" cache hit"));
this.context.debug(safe.green(" cache hit"));
var data = cache.read(name);
cache.write(name, data);
return data;
Expand Down Expand Up @@ -431,18 +431,18 @@ function printDiagnostics(context, diagnostics) {
switch (diagnostic.category) {
case tsModule.DiagnosticCategory.Message:
print = context.info;
color = colors_safe.white;
color = safe.white;
category = "";
break;
case tsModule.DiagnosticCategory.Error:
print = context.error;
color = colors_safe.red;
color = safe.red;
category = "error";
break;
case tsModule.DiagnosticCategory.Warning:
default:
print = context.warn;
color = colors_safe.yellow;
color = safe.yellow;
category = "warning";
break;
}
Expand Down Expand Up @@ -555,7 +555,7 @@ function typescript(options) {
var resolved = pluginOptions.rollupCommonJSResolveHack
? resolve.sync(result.resolvedModule.resolvedFileName)
: result.resolvedModule.resolvedFileName;
context.debug(colors_safe.blue("resolving") + " '" + importee + "'");
context.debug(safe.blue("resolving") + " '" + importee + "'");
context.debug(" to '" + resolved + "'");
return resolved;
}
Expand Down Expand Up @@ -587,7 +587,7 @@ function typescript(options) {
// since no output was generated, aborting compilation
cache().done();
if (_.isFunction(_this.error))
_this.error(colors_safe.red("failed to transpile '" + id + "'"));
_this.error(safe.red("failed to transpile '" + id + "'"));
}
var transpiled = _.find(output.outputFiles, function (entry) { return _.endsWith(entry.name, ".js") || _.endsWith(entry.name, ".jsx"); });
var map$$1 = _.find(output.outputFiles, function (entry) { return _.endsWith(entry.name, ".map"); });
Expand All @@ -611,7 +611,7 @@ function typescript(options) {
if (result && result.dts) {
var key = normalize(id);
declarations[key] = result.dts;
context.debug(colors_safe.blue("generated declarations") + " for '" + key + "'");
context.debug(safe.blue("generated declarations") + " for '" + key + "'");
result.dts = undefined;
}
return result;
Expand All @@ -631,12 +631,12 @@ function typescript(options) {
});
}
if (!watchMode && !noErrors)
context.info(colors_safe.yellow("there were errors or warnings above."));
context.info(safe.yellow("there were errors or warnings above."));
cache().done();
round++;
},
onwrite: function (_a) {
var dest = _a.dest;
var dest = _a.dest, file = _a.file;
if (parsedConfig.options.declaration) {
_.each(parsedConfig.fileNames, function (name) {
var key = normalize(name);
Expand All @@ -648,21 +648,22 @@ function typescript(options) {
if (dts)
declarations[key] = dts;
});
var bundleFile_1 = file ? file : dest; // rollup 0.48+ has 'file' https://github.com/rollup/rollup/issues/1479
var baseDeclarationDir_1 = parsedConfig.options.outDir;
_.each(declarations, function (_a, key) {
var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
var 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 (!dest || pluginOptions.useTsconfigDeclarationDir)
if (!bundleFile_1 || pluginOptions.useTsconfigDeclarationDir)
writeToPath = name;
else {
// Otherwise, take the directory name from the path and make sure it is absolute.
var destDirname = path.dirname(dest);
var destDirectory = path.isAbsolute(dest) ? destDirname : path.join(process.cwd(), destDirname);
var destDirname = path.dirname(bundleFile_1);
var destDirectory = path.isAbsolute(bundleFile_1) ? destDirname : path.join(process.cwd(), destDirname);
writeToPath = path.join(destDirectory, path.relative(baseDeclarationDir_1, name));
}
context.debug(colors_safe.blue("writing declarations") + " for '" + key + "' to '" + writeToPath + "'");
context.debug(safe.blue("writing declarations") + " for '" + key + "' to '" + writeToPath + "'");
// Write the declaration file to disk.
tsModule.sys.writeFile(writeToPath, text, writeByteOrderMark);
});
Expand Down
11 changes: 5 additions & 6 deletions dist/rollup-plugin-typescript2.es.js
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
/* eslint-disable */
import { concat, defaults, each, endsWith, filter, find, get, has, isEqual, isFunction, map, some } from 'lodash';
import * as _ from 'lodash';
import { existsSync, readFileSync, readdirSync, renameSync } from 'fs';
import { Graph, alg } from 'graphlib';
import { sha1 } from 'object-hash';
import { emptyDirSync, ensureFileSync, readJsonSync, removeSync, writeJsonSync } from 'fs-extra';
import { blue, green, red, white, yellow } from 'colors/safe';
import { sync } from 'resolve';
import * as resolve from 'resolve';
import { dirname, isAbsolute, join, relative } from 'path';

/*! *****************************************************************************
Expand Down Expand Up @@ -636,7 +634,7 @@ function typescript(options) {
round++;
},
onwrite: function (_a) {
var dest = _a.dest;
var dest = _a.dest, file = _a.file;
if (parsedConfig.options.declaration) {
each(parsedConfig.fileNames, function (name) {
var key = normalize(name);
Expand All @@ -648,18 +646,19 @@ function typescript(options) {
if (dts)
declarations[key] = dts;
});
var bundleFile_1 = file ? file : dest; // rollup 0.48+ has 'file' https://github.com/rollup/rollup/issues/1479
var baseDeclarationDir_1 = parsedConfig.options.outDir;
each(declarations, function (_a, key) {
var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
var 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 (!dest || pluginOptions.useTsconfigDeclarationDir)
if (!bundleFile_1 || pluginOptions.useTsconfigDeclarationDir)
writeToPath = name;
else {
// Otherwise, take the directory name from the path and make sure it is absolute.
var destDirname = dirname(dest);
var destDirectory = isAbsolute(dest) ? destDirname : join(process.cwd(), destDirname);
var destDirname = dirname(bundleFile_1);
var destDirectory = isAbsolute(bundleFile_1) ? destDirname : join(process.cwd(), destDirname);
writeToPath = join(destDirectory, relative(baseDeclarationDir_1, name));
}
context.debug(blue("writing declarations") + " for '" + key + "' to '" + writeToPath + "'");
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@
"@types/object-hash": "^0.5.28",
"@types/resolve": "^0.0.4",
"rimraf": "^2.6.1",
"rollup": "^0.43.0",
"rollup": "^0.48.2",
"rollup-plugin-typescript2": "github:ezolenko/rollup-plugin-typescript2#master",
"rollup-watch": "^4.0.0",
"tslint": "^5.4.3"
"rollup-watch": "^4.3.1",
"tslint": "^5.7.0"
},
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ export default {
targets: [
{
format: 'cjs',
dest: pkg.main
file: pkg.main
},
{
format: 'es',
dest: pkg.module
file: pkg.module
}
]
};
10 changes: 6 additions & 4 deletions src/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export default function typescript(options?: Partial<IOptions>)
round++;
},

onwrite({ dest }: IRollupOptions)
onwrite({ dest, file }: IRollupOptions)
{
if (parsedConfig.options.declaration)
{
Expand All @@ -258,19 +258,21 @@ export default function typescript(options?: Partial<IOptions>)
declarations[key] = dts;
});

const bundleFile = file ? file : dest; // rollup 0.48+ has 'file' https://github.com/rollup/rollup/issues/1479

const baseDeclarationDir = parsedConfig.options.outDir;
_.each(declarations, ({ name, text, writeByteOrderMark }, key) =>
{
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 (!dest || pluginOptions.useTsconfigDeclarationDir)
if (!bundleFile || pluginOptions.useTsconfigDeclarationDir)
writeToPath = name;
else
{
// Otherwise, take the directory name from the path and make sure it is absolute.
const destDirname = dirname(dest);
const destDirectory = isAbsolute(dest) ? destDirname : join(process.cwd(), destDirname);
const destDirname = dirname(bundleFile);
const destDirectory = isAbsolute(bundleFile) ? destDirname : join(process.cwd(), destDirname);
writeToPath = join(destDirectory, relative(baseDeclarationDir!, name));
}

Expand Down
1 change: 1 addition & 0 deletions src/irollup-options.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export interface IRollupOptions
{
dest?: string;
file?: string;
}

0 comments on commit fe70d27

Please sign in to comment.