Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update pluginutils for new micormatch #2884

Merged
merged 3 commits into from May 30, 2019
Merged

Update pluginutils for new micormatch #2884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ddf6ed
Update micromatch
lukastaegert May 30, 2019
a82eb49
Update rollup-pluginutils to update micromatch
lukastaegert May 30, 2019
8fb40e2
Fix TypeScript issues
lukastaegert May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions bin/src/run/index.ts
View file
Open in desktop
@@ -1,7 +1,7 @@
import { realpathSync } from 'fs';
import relative from 'require-relative';
import { InputOptions, WarningHandler } from '../../../src/rollup/types';
import mergeOptions from '../../../src/utils/mergeOptions';
import { WarningHandler } from '../../../src/rollup/types';
import mergeOptions, { GenericConfigObject } from '../../../src/utils/mergeOptions';
import { getAliasName } from '../../../src/utils/relativeId';
import { handleError } from '../logging';
import batchWarnings from './batchWarnings';
Expand Down Expand Up @@ -93,7 +93,7 @@ export default function runRollup(command: any) {
}
}

function execute(configFile: string, configs: InputOptions[], command: any) {
function execute(configFile: string, configs: GenericConfigObject[], command: any) {
if (command.watch) {
watch(configFile, configs, command, command.silent);
} else {
Expand Down
5 changes: 3 additions & 2 deletions bin/src/run/loadConfigFile.ts
View file
Open in desktop
@@ -1,7 +1,8 @@
import path from 'path';
import rollup from 'rollup';
import tc from 'turbocolor';
import { InputOptions, RollupBuild, RollupOutput } from '../../../src/rollup/types';
import { RollupBuild, RollupOutput } from '../../../src/rollup/types';
import { GenericConfigObject } from '../../../src/utils/mergeOptions';
import relativeId from '../../../src/utils/relativeId';
import { handleError, stderr } from '../logging';
import batchWarnings from './batchWarnings';
Expand All @@ -13,7 +14,7 @@ interface NodeModuleWithCompile extends NodeModule {
export default function loadConfigFile(
configFile: string,
commandOptions: any = {}
): Promise<InputOptions[]> {
): Promise<GenericConfigObject[]> {
const silent = commandOptions.silent || false;
const warnings = batchWarnings();

Expand Down
6 changes: 3 additions & 3 deletions bin/src/run/watch.ts
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ import {
WarningHandler,
WatcherOptions
} from '../../../src/rollup/types';
import mergeOptions from '../../../src/utils/mergeOptions';
import mergeOptions, { GenericConfigObject } from '../../../src/utils/mergeOptions';
import relativeId from '../../../src/utils/relativeId';
import { handleError, stderr } from '../logging';
import alternateScreen from './alternateScreen';
Expand All @@ -36,7 +36,7 @@ interface Watcher {

export default function watch(
configFile: string,
configs: RollupWatchOptions[],
configs: GenericConfigObject[],
command: any,
silent = false
) {
Expand All @@ -57,7 +57,7 @@ export default function watch(
let watcher: Watcher;
let configWatcher: Watcher;

function processConfigs(configs: RollupWatchOptions[]): RollupWatchOptions[] {
function processConfigs(configs: GenericConfigObject[]): RollupWatchOptions[] {
return configs.map(options => {
const merged = mergeOptions({
command,
Expand Down