Merge pull request #116 from FormidableLabs/use-victory-archetype

Use victory archetype
FormidableLabs · Dec 18, 2015 · 049ee58 · 049ee58
2 parents 515cded + 88e6134
commit 049ee58
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 31 deletions.
diff --git a/.builderrc b/.builderrc
@@ -1,3 +1,3 @@
 ---
 archetypes:
-  - builder-react-component
+  - builder-victory-component
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ script:
   - node_modules/.bin/builder run check-ci
 
   # Ensure we can build static site
-  - npm run build-static-docs
+  - node_modules/.bin/builder run docs-build-static
 
   # Prune deps to just production and ensure we can still build
   - npm prune --production

diff --git a/docs/webpack.config.dev.js b/docs/webpack.config.dev.js
@@ -42,10 +42,6 @@ module.exports = {
       }, {
         test: /\.(png|jpg)$/,
         loader: "url-loader?limit=8192"
-      }, {
-        test: /\.json$/,
-        loader: "json-loader",
-        exclude: /node_modules/
       }
     ]
   },

diff --git a/package.json b/package.json
@@ -18,55 +18,39 @@
     "preversion": "builder run npm:preversion",
     "version": "builder run npm:version",
     "test": "builder run npm:test",
-    "dev-docs": "webpack-dev-server --port 3000 --config docs/webpack.config.dev.js --content-base docs",
-    "hot-docs": "webpack-dev-server --port 3000 --config docs/webpack.config.hot.js --hot --content-base docs",
+    "docs-dev": "webpack-dev-server --port 3000 --config docs/webpack.config.dev.js --content-base docs",
+    "docs-hot": "webpack-dev-server --port 3000 --config docs/webpack.config.hot.js --hot --content-base docs",
     "copy-static-assets": "cp -r docs/static/ docs/build/static",
     "copy-cname": "cp docs/CNAME docs/build/CNAME",
-    "build-static-docs": "webpack --config docs/webpack.config.static.js --progress && npm run copy-static-assets && npm run copy-cname",
-    "push-gh-pages": "git subtree push --prefix docs/build origin gh-pages"
+    "docs-build-static": "webpack --config docs/webpack.config.static.js --progress && npm run copy-static-assets && npm run copy-cname"
   },
   "dependencies": {
-    "builder": "~2.1.3",
-    "builder-react-component": "~0.1.1",
+    "builder": "~2.2.2",
+    "builder-victory-component": "~0.0.6",
     "history": "~1.13.1",
-    "lodash": "^3.9.3",
-    "radium": "^0.14.1",
     "style-loader": "~0.8.0",
     "url-loader": "~0.5.5",
     "victory-animation": "0.0.13",
-    "victory-axis": "1.5.5",
+    "victory-axis": "1.5.7",
     "victory-bar": "2.5.0",
-    "victory-chart": "2.1.0",
+    "victory-chart": "2.1.1",
     "victory-line": "0.6.0",
     "victory-label": "0.1.9",
     "victory-pie": "0.2.0",
     "victory-scatter": "0.6.0"
   },
   "devDependencies": {
-    "babel": "^5.5.8",
-    "babel-core": "^5.5.8",
-    "babel-loader": "^5.3.2",
-    "builder-react-component-dev": "~0.1.1",
+    "builder-victory-component-dev": "~0.0.6",
     "chai": "^3.2.0",
-    "clean-webpack-plugin": "^0.1.4",
-    "ecology": "~1.0.4",
     "file-loader": "^0.8.5",
     "formidable-landers": "latest",
-    "json-loader": "^0.5.3",
     "mocha": "^2.3.3",
-    "raw-loader": "^0.5.1",
     "react": "0.14.x",
     "react-addons-test-utils": "^0.14.0",
-    "react-docgen": "^2.4.0",
     "react-dom": "0.14.x",
     "react-ga": "^1.2.0",
-    "react-hot-loader": "^1.2.8",
     "react-router": "^1.0.0",
     "sinon": "^1.17.2",
-    "sinon-chai": "^2.8.0",
-    "static-site-generator-webpack-plugin": "^1.2.0",
-    "webpack": "1.10.0",
-    "webpack-dev-server": "^1.10.0",
-    "webpack-stats-plugin": "^0.1.1"
+    "sinon-chai": "^2.8.0"
   }
 }