Skip to content

Commit

Permalink
Merge pull request #298 from hshoff/harry-build2
Browse files Browse the repository at this point in the history
[new build] use rollup, add es + umd builds. fixes #143
  • Loading branch information
hshoff authored Jun 5, 2018
2 parents 0a3fa63 + 5fec10b commit d7cd144
Show file tree
Hide file tree
Showing 143 changed files with 4,432 additions and 1,345 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.DS_Store
node_modules
build
dist
bundle.js
test/tmp
*.log
Expand Down
11 changes: 7 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"lerna": "2.1.2",
"packages": [
"packages/*"
],
"version": "0.0.164"
"packages": ["packages/*"],
"version": "0.0.164",
"command": {
"publish": {
"allowBranch": "master"
}
}
}
42 changes: 29 additions & 13 deletions packages/vx-annotation/.babelrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,34 @@
{
"presets": ["es2015", "react", "stage-0"],
"plugins": [],
"presets": [
"stage-0",
"react",
[
"env",
{
"modules": false,
"targets": {
"android": 30,
"chrome": 35,
"edge": 14,
"explorer": 9,
"firefox": 52,
"safari": 8,
"ucandroid": 1
}
}
]
],
"env": {
"development": {
"plugins": [
["react-transform", {
"transforms": [{
"transform": "react-transform-hmr",
"imports": ["react"],
"locals": ["module"]
}]
}],
"transform-runtime",
"transform-decorators-legacy"
"test": {
"presets": [
"stage-0",
"react",
[
"env",
{
"modules": "commonjs"
}
]
]
}
}
Expand Down
1 change: 0 additions & 1 deletion packages/vx-annotation/Makefile

This file was deleted.

26 changes: 20 additions & 6 deletions packages/vx-annotation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
"version": "0.0.164",
"description": "vx annotation",
"sideEffects": false,
"main": "build/index.js",
"main": "dist/vx-annotation.umd.js",
"module": "dist/vx-annotation.es.js",
"files": [
"dist",
"build"
],
"scripts": {
"build": "make build SRC=./src",
"prepublish": "make build SRC=./src",
"build": "npm run build:babel && npm run build:dist",
"build:dist": "rm -rf dist && mkdir dist && rollup -c",
"build:babel": "rm -rf build && mkdir build && babel src --out-dir build --ignore node_modules/ --presets stage-0,react,env --plugins external-helpers",
"prepublish": "npm run build",
"test": "jest"
},
"repository": {
Expand All @@ -30,17 +34,27 @@
},
"homepage": "https://github.com/hshoff/vx#readme",
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-jest": "^21.2.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.2",
"jest": "^21.2.1",
"jest-cli": "^21.2.1",
"raf": "^3.4.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-fatigue-dev": "github:tj/react-fatigue-dev",
"react-test-renderer": "^16.0.0",
"react-tools": "^0.10.0",
"regenerator-runtime": "^0.10.5"
"rollup": "^0.59.4",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-commonjs": "^9.1.3",
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-uglify": "^4.0.0"
},
"peerDependencies": {
"react": "^15.0.0-0 || ^16.0.0-0"
Expand Down
72 changes: 72 additions & 0 deletions packages/vx-annotation/rollup.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
const pkg = require('./package.json');
const resolve = require('rollup-plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const replace = require('rollup-plugin-replace');
const uglify = require('rollup-plugin-uglify').uglify;

const deps = Object.keys({
...pkg.dependencies,
...pkg.peerDependencies
});

const globals = deps.reduce((o, name) => {
if (name.includes('@vx/')) {
o[name] = 'vx';
}
if (name.includes('d3-')) {
o[name] = 'd3';
}
if (name === 'react') {
o[name] = 'React';
}
if (name === 'react-dom') {
o[name] = 'ReactDOM';
}
if (name === 'prop-types') {
o[name] = 'PropTypes';
}
if (name === 'classnames') {
o[name] = 'classNames';
}
return o;
}, {});

export default [
{
input: 'src/index',
external: deps,
plugins: [
resolve(),
babel({
exclude: 'node_modules/**',
plugins: ['external-helpers']
}),
replace({
ENV: JSON.stringify('production')
}),
uglify()
],
output: {
extend: true,
file: pkg.main,
format: 'umd',
globals,
name: 'vx'
}
},
{
input: 'src/index',
external: deps,
plugins: [
resolve(),
babel({
exclude: 'node_modules/**',
plugins: ['external-helpers']
}),
replace({
ENV: JSON.stringify('production')
})
],
output: [{ file: pkg.module, format: 'es' }]
}
];
42 changes: 29 additions & 13 deletions packages/vx-axis/.babelrc
Original file line number Diff line number Diff line change
@@ -1,18 +1,34 @@
{
"presets": ["es2015", "react", "stage-0"],
"plugins": [],
"presets": [
"stage-0",
"react",
[
"env",
{
"modules": false,
"targets": {
"android": 30,
"chrome": 35,
"edge": 14,
"explorer": 9,
"firefox": 52,
"safari": 8,
"ucandroid": 1
}
}
]
],
"env": {
"development": {
"plugins": [
["react-transform", {
"transforms": [{
"transform": "react-transform-hmr",
"imports": ["react"],
"locals": ["module"]
}]
}],
"transform-runtime",
"transform-decorators-legacy"
"test": {
"presets": [
"stage-0",
"react",
[
"env",
{
"modules": "commonjs"
}
]
]
}
}
Expand Down
1 change: 0 additions & 1 deletion packages/vx-axis/Makefile

This file was deleted.

26 changes: 20 additions & 6 deletions packages/vx-axis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
"version": "0.0.164",
"description": "vx axis",
"sideEffects": false,
"main": "build/index.js",
"main": "dist/vx-axis.umd.js",
"module": "dist/vx-axis.es.js",
"scripts": {
"build": "make build SRC=./src",
"prepublish": "make build SRC=./src",
"build": "npm run build:babel && npm run build:dist",
"build:dist": "rm -rf dist && mkdir dist && rollup -c",
"build:babel": "rm -rf build && mkdir build && babel src --out-dir build --ignore node_modules/ --presets stage-0,react,env --plugins external-helpers",
"prepublish": "npm run build",
"test": "jest"
},
"files": [
"dist",
"build"
],
"repository": {
Expand Down Expand Up @@ -38,17 +42,27 @@
"prop-types": "^15.6.0"
},
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-jest": "^21.2.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"enzyme": "^3.1.0",
"enzyme-adapter-react-16": "^1.0.2",
"jest": "^21.2.1",
"jest-cli": "^21.2.1",
"raf": "^3.4.0",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-fatigue-dev": "github:tj/react-fatigue-dev",
"react-test-renderer": "^16.0.0",
"react-tools": "^0.10.0",
"regenerator-runtime": "^0.10.5"
"rollup": "^0.59.4",
"rollup-plugin-babel": "^3.0.4",
"rollup-plugin-commonjs": "^9.1.3",
"rollup-plugin-node-resolve": "^3.3.0",
"rollup-plugin-replace": "^2.0.0",
"rollup-plugin-uglify": "^4.0.0"
},
"peerDependencies": {
"react": "^15.0.0-0 || ^16.0.0-0"
Expand Down
72 changes: 72 additions & 0 deletions packages/vx-axis/rollup.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
const pkg = require('./package.json');
const resolve = require('rollup-plugin-node-resolve');
const babel = require('rollup-plugin-babel');
const replace = require('rollup-plugin-replace');
const uglify = require('rollup-plugin-uglify').uglify;

const deps = Object.keys({
...pkg.dependencies,
...pkg.peerDependencies
});

const globals = deps.reduce((o, name) => {
if (name.includes('@vx/')) {
o[name] = 'vx';
}
if (name.includes('d3-')) {
o[name] = 'd3';
}
if (name === 'react') {
o[name] = 'React';
}
if (name === 'react-dom') {
o[name] = 'ReactDOM';
}
if (name === 'prop-types') {
o[name] = 'PropTypes';
}
if (name === 'classnames') {
o[name] = 'classNames';
}
return o;
}, {});

export default [
{
input: 'src/index',
external: deps,
plugins: [
resolve(),
babel({
exclude: 'node_modules/**',
plugins: ['external-helpers']
}),
replace({
ENV: JSON.stringify('production')
}),
uglify()
],
output: {
extend: true,
file: pkg.main,
format: 'umd',
globals,
name: 'vx'
}
},
{
input: 'src/index',
external: deps,
plugins: [
resolve(),
babel({
exclude: 'node_modules/**',
plugins: ['external-helpers']
}),
replace({
ENV: JSON.stringify('production')
})
],
output: [{ file: pkg.module, format: 'es' }]
}
];
Loading

0 comments on commit d7cd144

Please sign in to comment.