Skip to content

Commit 47038be

Browse files
committed
Switch back to Rollup
1 parent a19e4b0 commit 47038be

File tree

4 files changed

+93
-75
lines changed

4 files changed

+93
-75
lines changed

package.json

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@
2222
"react-component"
2323
],
2424
"main": "./dist/FontPicker.js",
25+
"module": "./dist/FontPicker.es.js",
2526
"types": "./dist/FontPicker.d.ts",
2627
"files": [
2728
"./dist/"
2829
],
2930
"scripts": {
3031
"start": "npm-run-all build:clean build:ts --parallel start:*",
31-
"start:ts": "babel ./src/FontPicker.tsx --out-file ./dist/FontPicker.js --watch",
32+
"start:ts": "rollup --config --sourcemap --watch",
3233
"start:storybook": "start-storybook --port 3000",
3334
"build": "run-s build:*",
3435
"build:clean": "rm -rf ./dist/ && mkdir ./dist/",
35-
"build:ts": "babel ./src/FontPicker.tsx --out-file ./dist/FontPicker.js",
36-
"build:types": "tsc --emitDeclarationOnly",
36+
"build:ts": "rollup --config",
37+
"test": "tsc --noEmit",
3738
"format": "prettier --write",
3839
"lint:css": "stylelint --fix --max-warnings 0",
3940
"lint:scss": "stylelint --fix --max-warnings 0 --syntax scss",
4041
"lint:js": "eslint --ext .js,.jsx --fix --max-warnings 0",
4142
"lint:ts": "eslint --ext .ts,.tsx --fix --max-warnings 0",
42-
"typecheck": "tsc --noEmit",
4343
"version": "yarn build",
4444
"release": "np"
4545
},
@@ -51,12 +51,6 @@
5151
"react": "^16.0.0"
5252
},
5353
"devDependencies": {
54-
"@babel/cli": "^7.5.5",
55-
"@babel/core": "^7.5.5",
56-
"@babel/plugin-proposal-class-properties": "^7.5.5",
57-
"@babel/preset-env": "^7.5.5",
58-
"@babel/preset-react": "^7.0.0",
59-
"@babel/preset-typescript": "^7.3.3",
6054
"@samuelmeuli/eslint-config": "^3.0.1",
6155
"@samuelmeuli/stylelint-config": "^1.0.2",
6256
"@samuelmeuli/tsconfig": "^0.1.1",
@@ -80,24 +74,11 @@
8074
"prettier": "^1.16.4",
8175
"react": "^16.9.0",
8276
"react-dom": "^16.9.0",
77+
"rollup": "^1.19.4",
78+
"rollup-plugin-typescript2": "^0.22.1",
8379
"stylelint": "^10.1.0",
8480
"typescript": "^3.5.3"
8581
},
86-
"babel": {
87-
"presets": [
88-
"@babel/preset-typescript",
89-
"@babel/react",
90-
[
91-
"@babel/preset-env",
92-
{
93-
"modules": false
94-
}
95-
]
96-
],
97-
"plugins": [
98-
"@babel/plugin-proposal-class-properties"
99-
]
100-
},
10182
"eslintConfig": {
10283
"root": true,
10384
"extends": [
@@ -115,6 +96,7 @@
11596
{
11697
"devDependencies": [
11798
"./.storybook/**/*.js",
99+
"./rollup.config.js",
118100
"./stories/**/*.jsx"
119101
]
120102
}
@@ -157,7 +139,7 @@
157139
},
158140
"husky": {
159141
"hooks": {
160-
"pre-commit": "yarn typecheck && lint-staged"
142+
"pre-commit": "yarn test && lint-staged"
161143
}
162144
}
163145
}

rollup.config.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import typescript from "rollup-plugin-typescript2";
2+
3+
import pkg from "./package.json";
4+
5+
export default {
6+
input: "./src/FontPicker.tsx",
7+
output: [
8+
{
9+
file: pkg.main,
10+
format: "cjs",
11+
},
12+
{
13+
file: pkg.module,
14+
format: "es",
15+
},
16+
],
17+
external: ["@samuelmeuli/font-manager", "react"],
18+
plugins: [
19+
typescript({
20+
cacheRoot: "./node_modules/.cache/rollup-plugin-typescript2/",
21+
}),
22+
],
23+
};

stories/index.stories.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
import "./styles.css";
2+
13
import { storiesOf } from "@storybook/react";
24
import React, { useState } from "react";
35

4-
import FontPicker from "../dist/FontPicker";
5-
import "./styles.css";
6+
import FontPicker from "../dist/FontPicker.es";
67

78
const API_KEY = "AIzaSyAOkdDlx49HCSBdu86oe8AD1Q7piIxlR6k";
89

yarn.lock

Lines changed: 59 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,14 @@
22
# yarn lockfile v1
33

44

5-
"@babel/cli@^7.5.5":
6-
version "7.5.5"
7-
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.5.5.tgz#bdb6d9169e93e241a08f5f7b0265195bf38ef5ec"
8-
integrity sha512-UHI+7pHv/tk9g6WXQKYz+kmXTI77YtuY3vqC59KIqcoWEjsJJSG6rAxKaLsgj3LDyadsPrCB929gVOKM6Hui0w==
9-
dependencies:
10-
commander "^2.8.1"
11-
convert-source-map "^1.1.0"
12-
fs-readdir-recursive "^1.1.0"
13-
glob "^7.0.0"
14-
lodash "^4.17.13"
15-
mkdirp "^0.5.1"
16-
output-file-sync "^2.0.0"
17-
slash "^2.0.0"
18-
source-map "^0.5.0"
19-
optionalDependencies:
20-
chokidar "^2.0.4"
21-
225
"@babel/[email protected]", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5":
236
version "7.5.5"
247
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d"
258
integrity sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==
269
dependencies:
2710
"@babel/highlight" "^7.0.0"
2811

29-
"@babel/[email protected]", "@babel/core@>=7.2.2", "@babel/core@^7.0.0", "@babel/core@^7.4.5", "@babel/core@^7.5.5":
12+
"@babel/[email protected]", "@babel/core@>=7.2.2", "@babel/core@^7.0.0", "@babel/core@^7.4.5":
3013
version "7.5.5"
3114
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz#17b2686ef0d6bc58f963dddd68ab669755582c30"
3215
integrity sha512-i4qoSr2KTtce0DmkuuQBV4AuQgGPUcPXMr9L5MyYAtk06z068lQ10a4O009fe5OB/DfNV+h+qqT7ddNV8UnRjg==
@@ -264,7 +247,7 @@
264247
"@babel/helper-remap-async-to-generator" "^7.1.0"
265248
"@babel/plugin-syntax-async-generators" "^7.2.0"
266249

267-
"@babel/[email protected]", "@babel/plugin-proposal-class-properties@^7.3.3", "@babel/plugin-proposal-class-properties@^7.5.5":
250+
"@babel/[email protected]", "@babel/plugin-proposal-class-properties@^7.3.3":
268251
version "7.5.5"
269252
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz#a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"
270253
integrity sha512-AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A==
@@ -698,7 +681,7 @@
698681
"@babel/helper-regex" "^7.4.4"
699682
regexpu-core "^4.5.4"
700683

701-
"@babel/[email protected]", "@babel/preset-env@^7.4.5", "@babel/preset-env@^7.5.5":
684+
"@babel/[email protected]", "@babel/preset-env@^7.4.5":
702685
version "7.5.5"
703686
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz#bc470b53acaa48df4b8db24a570d6da1fef53c9a"
704687
integrity sha512-GMZQka/+INwsMz1A5UEql8tG015h5j/qjptpKY2gJ7giy8ohzU710YciJB5rcKsWGWHiW3RUnHib0E5/m3Tp3A==
@@ -773,7 +756,7 @@
773756
"@babel/plugin-transform-react-jsx-self" "^7.0.0"
774757
"@babel/plugin-transform-react-jsx-source" "^7.0.0"
775758

776-
"@babel/[email protected]", "@babel/preset-typescript@^7.3.3":
759+
777760
version "7.3.3"
778761
resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz#88669911053fa16b2b276ea2ede2ca603b3f307a"
779762
integrity sha512-mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg==
@@ -1415,6 +1398,11 @@
14151398
resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
14161399
integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
14171400

1401+
1402+
version "0.0.39"
1403+
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
1404+
integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
1405+
14181406
"@types/events@*":
14191407
version "3.0.0"
14201408
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -1439,7 +1427,7 @@
14391427
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
14401428
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
14411429

1442-
"@types/node@*":
1430+
"@types/node@*", "@types/node@^12.6.9":
14431431
version "12.7.2"
14441432
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.2.tgz#c4e63af5e8823ce9cc3f0b34f7b998c2171f0c44"
14451433
integrity sha512-dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==
@@ -2987,7 +2975,7 @@ comma-separated-tokens@^1.0.0:
29872975
resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz#419cd7fb3258b1ed838dc0953167a25e152f5b59"
29882976
integrity sha512-Jrx3xsP4pPv4AwJUDWY9wOXGtwPXARej6Xd99h4TUGotmf8APuquKMpK+dnD3UgyxK7OEWaisjZz+3b5jtL6xQ==
29892977

2990-
commander@^2.11.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1, commander@~2.20.0:
2978+
commander@^2.11.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.0:
29912979
version "2.20.0"
29922980
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
29932981
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -4067,6 +4055,11 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
40674055
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
40684056
integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
40694057

4058+
estree-walker@^0.6.1:
4059+
version "0.6.1"
4060+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
4061+
integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
4062+
40704063
esutils@^2.0.0, esutils@^2.0.2:
40714064
version "2.0.3"
40724065
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -4557,6 +4550,15 @@ from2@^2.1.0:
45574550
inherits "^2.0.1"
45584551
readable-stream "^2.0.0"
45594552

4553+
[email protected], fs-extra@^8.0.1:
4554+
version "8.1.0"
4555+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
4556+
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
4557+
dependencies:
4558+
graceful-fs "^4.2.0"
4559+
jsonfile "^4.0.0"
4560+
universalify "^0.1.0"
4561+
45604562
fs-extra@^0.30.0:
45614563
version "0.30.0"
45624564
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
@@ -4568,27 +4570,13 @@ fs-extra@^0.30.0:
45684570
path-is-absolute "^1.0.0"
45694571
rimraf "^2.2.8"
45704572

4571-
fs-extra@^8.0.1:
4572-
version "8.1.0"
4573-
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
4574-
integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
4575-
dependencies:
4576-
graceful-fs "^4.2.0"
4577-
jsonfile "^4.0.0"
4578-
universalify "^0.1.0"
4579-
45804573
fs-minipass@^1.2.5:
45814574
version "1.2.6"
45824575
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
45834576
integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
45844577
dependencies:
45854578
minipass "^2.2.1"
45864579

4587-
fs-readdir-recursive@^1.1.0:
4588-
version "1.1.0"
4589-
resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27"
4590-
integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==
4591-
45924580
fs-write-stream-atomic@^1.0.8:
45934581
version "1.0.10"
45944582
resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -7110,15 +7098,6 @@ osenv@^0.1.4:
71107098
os-homedir "^1.0.0"
71117099
os-tmpdir "^1.0.0"
71127100

7113-
output-file-sync@^2.0.0:
7114-
version "2.0.1"
7115-
resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-2.0.1.tgz#f53118282f5f553c2799541792b723a4c71430c0"
7116-
integrity sha512-mDho4qm7WgIXIGf4eYU1RHN2UU5tPfVYVSRwDJw0uTmj35DQUt/eNp19N7v6T3SrR0ESTEf2up2CGO73qI35zQ==
7117-
dependencies:
7118-
graceful-fs "^4.1.11"
7119-
is-plain-obj "^1.1.0"
7120-
mkdirp "^0.5.1"
7121-
71227101
ow@^0.12.0:
71237102
version "0.12.0"
71247103
resolved "https://registry.yarnpkg.com/ow/-/ow-0.12.0.tgz#ce3b53a81af78171a21478bd684bd9862b152b35"
@@ -8501,6 +8480,13 @@ resolve-url@^0.2.1:
85018480
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
85028481
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
85038482

8483+
8484+
version "1.11.1"
8485+
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
8486+
integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
8487+
dependencies:
8488+
path-parse "^1.0.6"
8489+
85048490
resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
85058491
version "1.12.0"
85068492
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
@@ -8563,6 +8549,32 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
85638549
hash-base "^3.0.0"
85648550
inherits "^2.0.1"
85658551

8552+
rollup-plugin-typescript2@^0.22.1:
8553+
version "0.22.1"
8554+
resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.22.1.tgz#7678b7decc6808e600ff36c32febd31081b55405"
8555+
integrity sha512-SQEHr1s0kDWrNV3UKySZtYKFIcWCJh2PQ4ZtLNj18pf50SrxeRDlUksOOeLPyodJ7bVLaKwWDbiobF2a6gfKyg==
8556+
dependencies:
8557+
fs-extra "8.1.0"
8558+
resolve "1.11.1"
8559+
rollup-pluginutils "2.8.1"
8560+
tslib "1.10.0"
8561+
8562+
8563+
version "2.8.1"
8564+
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.1.tgz#8fa6dd0697344938ef26c2c09d2488ce9e33ce97"
8565+
integrity sha512-J5oAoysWar6GuZo0s+3bZ6sVZAC0pfqKz68De7ZgDi5z63jOVZn1uJL/+z1jeKHNbGII8kAyHF5q8LnxSX5lQg==
8566+
dependencies:
8567+
estree-walker "^0.6.1"
8568+
8569+
rollup@^1.19.4:
8570+
version "1.19.4"
8571+
resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.19.4.tgz#0cb4e4d6fa127adab59b11d0be50e8dd1c78123a"
8572+
integrity sha512-G24w409GNj7i/Yam2cQla6qV2k6Nug8bD2DZg9v63QX/cH/dEdbNJg8H4lUm5M1bRpPKRUC465Rm9H51JTKOfQ==
8573+
dependencies:
8574+
"@types/estree" "0.0.39"
8575+
"@types/node" "^12.6.9"
8576+
acorn "^6.2.1"
8577+
85668578
run-async@^2.2.0:
85678579
version "2.3.0"
85688580
resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -9709,7 +9721,7 @@ ts-pnp@^1.1.2:
97099721
resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.2.tgz#be8e4bfce5d00f0f58e0666a82260c34a57af552"
97109722
integrity sha512-f5Knjh7XCyRIzoC/z1Su1yLLRrPrFCgtUAh/9fCSP6NKbATwpOL1+idQVXQokK9GRFURn/jYPGPfegIctwunoA==
97119723

9712-
tslib@^1.8.1, tslib@^1.9.0:
9724+
tslib@1.10.0, tslib@^1.8.1, tslib@^1.9.0:
97139725
version "1.10.0"
97149726
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
97159727
integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==

0 commit comments

Comments
 (0)