From a342ac8a51ab4e85c28c0011f17e8c90baed552d Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Mon, 10 Jul 2017 15:59:49 -0700 Subject: [PATCH 1/7] WIP: get victory-core on es/ build --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 87212e4..594da34 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ bower_components coverage dist lib +es node_modules npm-debug.log* yarn.lock From c322d33f726ce028223ddb1b5aa25db2dff99f37 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Tue, 11 Jul 2017 14:03:31 -0700 Subject: [PATCH 2/7] WIP: build and tests work now. --- .babelrc | 2 +- .gitignore | 1 + package.json | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.babelrc b/.babelrc index a63de98..f5e5aab 100644 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,3 @@ { - "extends": "builder-victory-component/config/babel/.babelrc" + "extends": "builder-victory-component/config/babel/.babelrc-react" } diff --git a/.gitignore b/.gitignore index 594da34..23b91da 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ $RECYCLE.BIN/ # App specific .tmp +.vscode bower_components coverage dist diff --git a/package.json b/package.json index 7eecfe3..1696634 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,8 @@ "version": "11.1.2", "description": "D3 pie & donut chart component for React", "main": "lib/index.js", + "module": "es/index.js", + "jsnext:main": "es/index.js", "repository": { "type": "git", "url": "https://github.com/FormidableLabs/victory-pie.git" From 68009e6064da0dfac7c9ef54f9fd3b6bf2c81a9d Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Wed, 12 Jul 2017 12:25:27 -0700 Subject: [PATCH 3/7] Finish build. Everything works, hacks and all --- stories/{victory-pie.jsx => victory-pie.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename stories/{victory-pie.jsx => victory-pie.js} (100%) diff --git a/stories/victory-pie.jsx b/stories/victory-pie.js similarity index 100% rename from stories/victory-pie.jsx rename to stories/victory-pie.js From 35c49a895847856a4857a5eea56351792daab803 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Wed, 12 Jul 2017 12:28:59 -0700 Subject: [PATCH 4/7] Harmonize postinstall --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1696634..72c77cb 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "npm": ">=2.0.0" }, "scripts": { - "postinstall": "cd lib || builder run npm:postinstall", + "postinstall": "builder run npm:postinstall", "preversion": "builder run npm:preversion", "postversion": "builder run npm:postversion", "postpublish": "builder run npm:postpublish", From 92e6a5b68021166249e8fc98d09bb4c6fcb59b96 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Thu, 13 Jul 2017 08:47:23 -0700 Subject: [PATCH 5/7] Publish es directory to npm --- .npmignore.publishr | 1 + 1 file changed, 1 insertion(+) diff --git a/.npmignore.publishr b/.npmignore.publishr index a0bbcb4..0144c29 100644 --- a/.npmignore.publishr +++ b/.npmignore.publishr @@ -1,6 +1,7 @@ /* !/dist dist/*.map +!/es !/lib !/src !LICENSE.txt From 2cf122331ad525292943c8747d38790f23264514 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Thu, 13 Jul 2017 12:21:54 -0700 Subject: [PATCH 6/7] Upgrade archetype deps. --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 72c77cb..4ca70bf 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,14 @@ }, "dependencies": { "builder": "^3.2.1", - "builder-victory-component": "^4.0.2", + "builder-victory-component": "^5.0.0", "d3-shape": "^1.0.0", "lodash": "^4.17.4", - "victory-core": "^16.0.0" + "victory-core": "^16.1.0" }, "devDependencies": { "@kadira/storybook": "^1.25.0", - "builder-victory-component-dev": "^4.0.2", + "builder-victory-component-dev": "^5.0.0", "chai": "^3.5.0", "chai-enzyme": "0.4.1", "enzyme": "^2.4.1", From dd68d05aa9ff6874378ad594f937175b93871552 Mon Sep 17 00:00:00 2001 From: Ryan Roemer Date: Thu, 13 Jul 2017 14:08:25 -0700 Subject: [PATCH 7/7] Bump archetype versions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4ca70bf..a9196d0 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,14 @@ }, "dependencies": { "builder": "^3.2.1", - "builder-victory-component": "^5.0.0", + "builder-victory-component": "^5.0.1", "d3-shape": "^1.0.0", "lodash": "^4.17.4", "victory-core": "^16.1.0" }, "devDependencies": { "@kadira/storybook": "^1.25.0", - "builder-victory-component-dev": "^5.0.0", + "builder-victory-component-dev": "^5.0.1", "chai": "^3.5.0", "chai-enzyme": "0.4.1", "enzyme": "^2.4.1",