From e93f812de92710bbe4f4730d9577c683e370ed06 Mon Sep 17 00:00:00 2001 From: EGOIST <0x142857@gmail.com> Date: Mon, 15 Jun 2020 13:25:49 +0800 Subject: [PATCH] fix(rollup): handle warning for deprecated api --- src/cli.ts | 24 ++++++++++++------------ src/index.ts | 4 +++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/cli.ts b/src/cli.ts index cbba14b0..6a13a725 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import 'v8-compile-cache' -import cac from 'cac' +import { cac } from 'cac' import { version } from '../package.json' if (process.env.BILI_LOCAL_PROFILE) { @@ -14,7 +14,7 @@ const cli = cac('bili') cli .command('[...input]', 'Bundle input files', { - ignoreOptionDefaultValue: true + ignoreOptionDefaultValue: true, }) .option('-w, --watch', 'Watch files') .option( @@ -36,7 +36,7 @@ cli .option('--bundle-node-modules', 'Include node modules in your bundle') .option('--minify', 'Minify output files') .option('--external ', 'Mark a module id as external', { - type: [] + type: [], }) .option('-t, --target ', 'Output target', { default: 'node' }) .option('-c, --config ', 'Use a custom config file') @@ -53,9 +53,9 @@ cli .option('--verbose', 'Show verbose logs') .option('--quiet', 'Show minimal logs') .option('--stack-trace', 'Show stack trace for bundle errors') - .example(bin => ` ${bin} --format cjs --format esm`) - .example(bin => ` ${bin} src/index.js,src/cli.ts`) - .example(bin => ` ${bin} --input.index src/foo.ts`) + .example((bin) => ` ${bin} --format cjs --format esm`) + .example((bin) => ` ${bin} src/index.js,src/cli.ts`) + .example((bin) => ` ${bin} --input.index src/foo.ts`) .action(async (input, options) => { const { Bundler } = await import('./') const rootDir = options.rootDir || '.' @@ -71,7 +71,7 @@ cli extractCSS: options.extractCss, sourceMap: options.map, sourceMapExcludeSources: options.mapExcludeSources, - target: options.target + target: options.target, }, bundleNodeModules: options.bundleNodeModules, env: options.env, @@ -82,8 +82,8 @@ cli babel: { asyncToPromises: options.asyncToPromises, minimal: options.minimal, - babelrc: options.babelrc - } + babelrc: options.babelrc, + }, }, { logLevel: options.verbose @@ -93,14 +93,14 @@ cli : undefined, stackTrace: options.stackTrace, configFile: options.config, - rootDir + rootDir, } ) await bundler .run({ write: true, watch: options.watch, - concurrent: options.concurrent + concurrent: options.concurrent, }) .catch((err: any) => { bundler.handleError(err) @@ -113,7 +113,7 @@ cli.help() cli.parse() -process.on('unhandledRejection', err => { +process.on('unhandledRejection', (err) => { console.error(err) process.exit(1) }) diff --git a/src/index.ts b/src/index.ts index 501d48fb..64c25dc8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -425,7 +425,9 @@ export class Bundler { assets.set(relative, { absolute, get source() { - return file.isAsset ? file.source.toString() : file.code + return file.type === 'asset' + ? file.source.toString() + : file.code }, }) }