Skip to content

Commit 8012542

Browse files
committed
combine rollup configs
1 parent 9b4550d commit 8012542

6 files changed

+80
-80
lines changed

package.json

+3-7
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@
1616
"codecov": "codecov",
1717
"precodecov": "npm run coverage",
1818
"lint": "eslint src test/*.js",
19-
"build": "npm run build:main && npm run build:shared && npm run build:ssr",
20-
"build:main": "node src/shared/_build.js && rollup -c rollup/rollup.config.main.js",
21-
"build:shared": "rollup -c rollup/rollup.config.shared.js",
22-
"build:ssr": "rollup -c rollup/rollup.config.ssr.js",
23-
"dev": "node src/shared/_build.js && rollup -c rollup/rollup.config.main.js -w",
24-
"dev:shared": "rollup -c rollup/rollup.config.shared.js -w",
19+
"build": "node src/shared/_build.js && rollup -c",
20+
"dev": "node src/shared/_build.js && rollup -c -w",
2521
"pretest": "npm run build",
2622
"prepublish": "npm run build && npm run lint",
2723
"prettier": "prettier --use-tabs --single-quote --trailing-comma es5 --write \"src/**/*.ts\""
@@ -75,7 +71,7 @@
7571
"nyc": "^10.0.0",
7672
"prettier": "^1.4.1",
7773
"reify": "^0.4.4",
78-
"rollup": "^0.39.0",
74+
"rollup": "^0.43.0",
7975
"rollup-plugin-buble": "^0.15.0",
8076
"rollup-plugin-commonjs": "^7.0.0",
8177
"rollup-plugin-json": "^2.1.0",

rollup.config.js

+74
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
import path from 'path';
2+
import nodeResolve from 'rollup-plugin-node-resolve';
3+
import commonjs from 'rollup-plugin-commonjs';
4+
import json from 'rollup-plugin-json';
5+
import typescript from 'rollup-plugin-typescript';
6+
import buble from 'rollup-plugin-buble';
7+
8+
const src = path.resolve('src');
9+
10+
export default [
11+
/* compiler/svelte.js */
12+
{
13+
entry: 'src/index.ts',
14+
dest: 'compiler/svelte.js',
15+
format: 'umd',
16+
moduleName: 'svelte',
17+
plugins: [
18+
{
19+
resolveId(importee, importer) {
20+
// bit of a hack — TypeScript only really works if it can resolve imports,
21+
// but they misguidedly chose to reject imports with file extensions. This
22+
// means we need to resolve them here
23+
if (
24+
importer &&
25+
importer.startsWith(src) &&
26+
importee[0] === '.' &&
27+
path.extname(importee) === ''
28+
) {
29+
return path.resolve(path.dirname(importer), `${importee}.ts`);
30+
}
31+
}
32+
},
33+
nodeResolve({ jsnext: true, module: true }),
34+
commonjs(),
35+
json(),
36+
typescript({
37+
include: 'src/**',
38+
exclude: 'src/shared/**',
39+
typescript: require('typescript')
40+
})
41+
],
42+
sourceMap: true
43+
},
44+
45+
/* ssr/register.js */
46+
{
47+
entry: 'src/server-side-rendering/register.js',
48+
dest: 'ssr/register.js',
49+
format: 'cjs',
50+
plugins: [
51+
nodeResolve({ jsnext: true, module: true }),
52+
commonjs(),
53+
buble({
54+
include: 'src/**',
55+
exclude: 'src/shared/**',
56+
target: {
57+
node: 4
58+
}
59+
})
60+
],
61+
external: [path.resolve('src/index.ts'), 'fs', 'path'],
62+
paths: {
63+
[path.resolve('src/index.ts')]: '../compiler/svelte.js'
64+
},
65+
sourceMap: true
66+
},
67+
68+
/* shared.js */
69+
{
70+
entry: 'src/shared/index.js',
71+
dest: 'shared.js',
72+
format: 'es'
73+
}
74+
];

rollup/rollup.config.main.js

-39
This file was deleted.

rollup/rollup.config.shared.js

-5
This file was deleted.

rollup/rollup.config.ssr.js

-26
This file was deleted.

yarn.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -2578,9 +2578,9 @@ rollup-watch@^3.2.2:
25782578
dependencies:
25792579
require-relative "0.8.7"
25802580

2581-
rollup@^0.39.0:
2582-
version "0.39.2"
2583-
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.39.2.tgz#858cf3020027cf74e0c5d7faa1c18275faf00df4"
2581+
rollup@^0.43.0:
2582+
version "0.43.0"
2583+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.43.0.tgz#b36bdb75fa5e0823b6de8aee18ff7b5655520543"
25842584
dependencies:
25852585
source-map-support "^0.4.0"
25862586

0 commit comments

Comments
 (0)