honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: update rollup lint rule from bad merge (#20047) 

PR Close #20047
This commit is contained in:
Hans Larsen 2017-10-30 20:42:20 -07:00 committed by Matias Niemelä
parent 13f8648a00
commit 3bdbb18c8b
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/tslint/rollupConfigRule.ts
View File

@ -34,6 +34,10 @@ const sourceFilePathBlacklist = [
// exceptions but we simply ignore those files from this rule. // exceptions but we simply ignore those files from this rule.
/[/\\]packages[/\\]language-service[/\\]/, /[/\\]packages[/\\]language-service[/\\]/,
// Compiler CLI is never part of a browser (there's a browser-rollup but it's managed
// separately.
/[/\\]packages[/\\]compiler-cli[/\\]/,
// service-worker is a special package that has more than one rollup config. It confuses // service-worker is a special package that has more than one rollup config. It confuses
// this lint rule and we simply ignore those files. // this lint rule and we simply ignore those files.
/[/\\]packages[/\\]service-worker[/\\]/, /[/\\]packages[/\\]service-worker[/\\]/,
@ -61,11 +65,26 @@ function _pathShouldBeLinted(path: string) {
} }
/**
* .--. _________________
* {\ / q {\ / globalGlobalMap /
* { `\ \ (-(~` <__________________/
* { '.{`\ \ \ )
* {'-{ ' \ .-""'-. \ \
* {._{'.' \/ '.) \
* {_.{. {` |
* {._{ ' { ;'-=-. |
* {-.{.' { ';-=-.` /
* {._.{.; '-=- .'
* {_.-' `'.__ _,-'
* |||`
* .='==,
*/
interface RollupMatchInfo { interface RollupMatchInfo {
filePath: string; filePath: string;
globals: {[packageName: string]: string}; globals: {[packageName: string]: string};
} }
const rollupConfigMap = new Map<string, RollupMatchInfo>(); const globalGlobalRollupMap = new Map<string, RollupMatchInfo>();
export class Rule extends AbstractRule { export class Rule extends AbstractRule {
@ -85,9 +104,9 @@ export class Rule extends AbstractRule {
let match: RollupMatchInfo; let match: RollupMatchInfo;
while (p.startsWith(process.cwd())) { while (p.startsWith(process.cwd())) {
if (rollupConfigMap.has(p)) { if (globalGlobalRollupMap.has(p)) {
// We already resolved for this directory, just return it. // We already resolved for this directory, just return it.
match = rollupConfigMap.get(p); match = globalGlobalRollupMap.get(p);
break; break;
} }
@ -95,12 +114,12 @@ export class Rule extends AbstractRule {
const maybeRollupPath = allFiles.find(x => _isRollupPath(path.join(p, x))); const maybeRollupPath = allFiles.find(x => _isRollupPath(path.join(p, x)));
if (maybeRollupPath) { if (maybeRollupPath) {
const rollupFilePath = path.join(p, maybeRollupPath); const rollupFilePath = path.join(p, maybeRollupPath);
const rollupConfig = require(rollupFilePath).default; const rollupConfig = require(rollupFilePath);
match = {filePath: rollupFilePath, globals: rollupConfig && rollupConfig.globals}; match = {filePath: rollupFilePath, globals: rollupConfig && rollupConfig.globals};
// Update all paths that we checked along the way. // Update all paths that we checked along the way.
checkedPaths.forEach(path => rollupConfigMap.set(path, match)); checkedPaths.forEach(path => globalGlobalRollupMap.set(path, match));
rollupConfigMap.set(rollupFilePath, match); globalGlobalRollupMap.set(rollupFilePath, match);
break; break;
} }