From b44142670367b49ccfdf8899add114622f43fcc1 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 23 Oct 2017 16:27:42 +0100 Subject: [PATCH 1/3] Include ART shapes into npm package --- .../npm/{lib/Circle.art.js => Circle.js} | 23 ++++--------------- .../{lib/Rectangle.art.js => Rectangle.js} | 23 ++++--------------- .../npm/{lib/Wedge.art.js => Wedge.js} | 23 ++++--------------- packages/react-art/package.json | 5 +++- 4 files changed, 19 insertions(+), 55 deletions(-) rename packages/react-art/npm/{lib/Circle.art.js => Circle.js} (70%) rename packages/react-art/npm/{lib/Rectangle.art.js => Rectangle.js} (87%) rename packages/react-art/npm/{lib/Wedge.art.js => Wedge.js} (91%) diff --git a/packages/react-art/npm/lib/Circle.art.js b/packages/react-art/npm/Circle.js similarity index 70% rename from packages/react-art/npm/lib/Circle.art.js rename to packages/react-art/npm/Circle.js index 7b5c3a8461d..bad709488d7 100644 --- a/packages/react-art/npm/lib/Circle.art.js +++ b/packages/react-art/npm/Circle.js @@ -1,19 +1,3 @@ -'use strict'; - -var _extends = - Object.assign || - function(target) { - for (var i = 1; i < arguments.length; i++) { - var source = arguments[i]; - for (var key in source) { - if (Object.prototype.hasOwnProperty.call(source, key)) { - target[key] = source[key]; - } - } - } - return target; - }; - /** * Copyright (c) 2013-present, Facebook, Inc. * @@ -33,9 +17,12 @@ var _extends = * */ +'use strict'; + +var assign = require('object-assign'); var PropTypes = require('prop-types'); var React = require('react'); -var ReactART = require('..'); +var ReactART = require('react-art'); var createReactClass = require('create-react-class'); @@ -61,7 +48,7 @@ var Circle = createReactClass({ .arc(0, radius * 2, radius) .arc(0, radius * -2, radius) .close(); - return React.createElement(Shape, _extends({}, this.props, {d: path})); + return React.createElement(Shape, assign({}, this.props, {d: path})); }, }); diff --git a/packages/react-art/npm/lib/Rectangle.art.js b/packages/react-art/npm/Rectangle.js similarity index 87% rename from packages/react-art/npm/lib/Rectangle.art.js rename to packages/react-art/npm/Rectangle.js index 4b2ac578d7c..2284c517122 100644 --- a/packages/react-art/npm/lib/Rectangle.art.js +++ b/packages/react-art/npm/Rectangle.js @@ -1,19 +1,3 @@ -'use strict'; - -var _extends = - Object.assign || - function(target) { - for (var i = 1; i < arguments.length; i++) { - var source = arguments[i]; - for (var key in source) { - if (Object.prototype.hasOwnProperty.call(source, key)) { - target[key] = source[key]; - } - } - } - return target; - }; - /** * Copyright (c) 2013-present, Facebook, Inc. * @@ -40,9 +24,12 @@ var _extends = * */ +'use strict'; + +var assign = require('object-assign'); var PropTypes = require('prop-types'); var React = require('react'); -var ReactART = require('..'); +var ReactART = require('react-art'); var createReactClass = require('create-react-class'); @@ -146,7 +133,7 @@ var Rectangle = createReactClass({ } path.line(0, -height + (bl + tl)); - return React.createElement(Shape, _extends({}, this.props, {d: path})); + return React.createElement(Shape, assign({}, this.props, {d: path})); }, }); diff --git a/packages/react-art/npm/lib/Wedge.art.js b/packages/react-art/npm/Wedge.js similarity index 91% rename from packages/react-art/npm/lib/Wedge.art.js rename to packages/react-art/npm/Wedge.js index c217a66f4c7..90f1995d9c8 100644 --- a/packages/react-art/npm/lib/Wedge.art.js +++ b/packages/react-art/npm/Wedge.js @@ -1,19 +1,3 @@ -'use strict'; - -var _extends = - Object.assign || - function(target) { - for (var i = 1; i < arguments.length; i++) { - var source = arguments[i]; - for (var key in source) { - if (Object.prototype.hasOwnProperty.call(source, key)) { - target[key] = source[key]; - } - } - } - return target; - }; - /** * Copyright (c) 2013-present, Facebook, Inc. * @@ -36,9 +20,12 @@ var _extends = * */ + 'use strict'; + +var assign = require('object-assign'); var PropTypes = require('prop-types'); var React = require('react'); -var ReactART = require('..'); +var ReactART = require('react-art'); var createReactClass = require('create-react-class'); @@ -193,7 +180,7 @@ var Wedge = createReactClass({ path = this._createArcPath(startAngle, endAngle, or, ir); } - return React.createElement(Shape, _extends({}, this.props, {d: path})); + return React.createElement(Shape, assign({}, this.props, {d: path})); }, }); diff --git a/packages/react-art/package.json b/packages/react-art/package.json index 2401d764d22..a3d8e6d923d 100644 --- a/packages/react-art/package.json +++ b/packages/react-art/package.json @@ -32,7 +32,10 @@ "README.md", "index.js", "cjs/", - "umd/" + "umd/", + "Circle.js", + "Rectangle.js", + "Wedge.js" ], "browserify": { "transform": [ From 909a76215d35971f6d9e3650ff336b9225fad855 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 23 Oct 2017 17:08:56 +0100 Subject: [PATCH 2/3] Fix the fixture --- fixtures/art/VectorWidget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/art/VectorWidget.js b/fixtures/art/VectorWidget.js index c6d041f5884..8d4343c6184 100644 --- a/fixtures/art/VectorWidget.js +++ b/fixtures/art/VectorWidget.js @@ -6,7 +6,7 @@ */ 'use strict'; -var Circle = require('react-art/lib/Circle.art'); +var Circle = require('react-art/Circle'); var React = require('react'); var ReactART = require('react-art'); var Group = ReactART.Group; From c535328e79bc781183f73d87e348f0b6251881af Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 23 Oct 2017 17:21:08 +0100 Subject: [PATCH 3/3] Prettier oops --- packages/react-art/npm/Wedge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-art/npm/Wedge.js b/packages/react-art/npm/Wedge.js index 90f1995d9c8..bcb671db0b8 100644 --- a/packages/react-art/npm/Wedge.js +++ b/packages/react-art/npm/Wedge.js @@ -20,7 +20,7 @@ * */ - 'use strict'; +'use strict'; var assign = require('object-assign'); var PropTypes = require('prop-types');