mirror of
https://github.com/kevin-DL/sapper.git
synced 2026-03-11 20:04:43 +00:00
Improve internal API
This commit is contained in:
@@ -135,10 +135,10 @@ export default class RollupCompiler {
|
||||
});
|
||||
}
|
||||
|
||||
static async load_config() {
|
||||
if (!rollup) rollup = relative('rollup', process.cwd());
|
||||
static async load_config(cwd: string) {
|
||||
if (!rollup) rollup = relative('rollup', cwd);
|
||||
|
||||
const input = path.resolve('rollup.config.js');
|
||||
const input = path.resolve(cwd, 'rollup.config.js');
|
||||
|
||||
const bundle = await rollup.rollup({
|
||||
input,
|
||||
|
||||
@@ -5,7 +5,7 @@ import RollupCompiler from './RollupCompiler';
|
||||
import extract_css from './extract_css';
|
||||
import { left_pad } from '../../utils';
|
||||
import { CompileResult, BuildInfo, CompileError, Chunk, CssFile } from './interfaces';
|
||||
import { ManifestData, Dirs, PageComponent } from '../../interfaces';
|
||||
import { ManifestData, Dirs } from '../../interfaces';
|
||||
|
||||
export default class RollupResult implements CompileResult {
|
||||
duration: number;
|
||||
|
||||
@@ -4,7 +4,7 @@ import hash from 'string-hash';
|
||||
import * as codec from 'sourcemap-codec';
|
||||
import { PageComponent, Dirs } from '../../interfaces';
|
||||
import { CompileResult } from './interfaces';
|
||||
import { posixify } from '../utils'
|
||||
import { posixify } from '../../utils'
|
||||
|
||||
const inline_sourcemap_header = 'data:application/json;charset=utf-8;base64,';
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import * as path from 'path';
|
||||
import RollupCompiler from './RollupCompiler';
|
||||
import { WebpackCompiler } from './WebpackCompiler';
|
||||
import { set_dev, set_src, set_dest } from '../../config/env';
|
||||
|
||||
export type Compiler = RollupCompiler | WebpackCompiler;
|
||||
|
||||
@@ -10,9 +11,19 @@ export type Compilers = {
|
||||
serviceworker?: Compiler;
|
||||
}
|
||||
|
||||
export default async function create_compilers(bundler: 'rollup' | 'webpack'): Promise<Compilers> {
|
||||
export default async function create_compilers(
|
||||
bundler: 'rollup' | 'webpack',
|
||||
cwd: string,
|
||||
src: string,
|
||||
dest: string,
|
||||
dev: boolean
|
||||
): Promise<Compilers> {
|
||||
set_dev(dev);
|
||||
set_src(src);
|
||||
set_dest(dest);
|
||||
|
||||
if (bundler === 'rollup') {
|
||||
const config = await RollupCompiler.load_config();
|
||||
const config = await RollupCompiler.load_config(cwd);
|
||||
validate_config(config, 'rollup');
|
||||
|
||||
normalize_rollup_config(config.client);
|
||||
@@ -30,7 +41,7 @@ export default async function create_compilers(bundler: 'rollup' | 'webpack'): P
|
||||
}
|
||||
|
||||
if (bundler === 'webpack') {
|
||||
const config = require(path.resolve('webpack.config.js'));
|
||||
const config = require(path.resolve(cwd, 'webpack.config.js'));
|
||||
validate_config(config, 'webpack');
|
||||
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user