From 6f72000aabb088bbae359a865ae5bb91fd677246 Mon Sep 17 00:00:00 2001 From: jberg Date: Fri, 8 Jun 2018 17:58:53 -0700 Subject: [PATCH] only load preset not in minimal pack --- js/components/MilkdropWindow/index.js | 9 +++------ package.json | 2 +- yarn.lock | 6 +++--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/js/components/MilkdropWindow/index.js b/js/components/MilkdropWindow/index.js index 333372b5..ed95f7a1 100644 --- a/js/components/MilkdropWindow/index.js +++ b/js/components/MilkdropWindow/index.js @@ -164,13 +164,10 @@ class MilkdropWindow extends React.Component { } async _loadMainPresetPack() { return require.ensure( - ["butterchurn-presets"], + ["butterchurn-presets/lib/butterchurnPresetsNonMinimal.min"], require => { - const butterchurnPresets = require("butterchurn-presets"); - this.presets = Object.assign( - this.presets, - butterchurnPresets.getPresets() - ); + const butterchurnNonMinimalPresets = require("butterchurn-presets/lib/butterchurnPresetsNonMinimal.min"); + Object.assign(this.presets, butterchurnNonMinimalPresets.getPresets()); }, e => { console.error("Error loading Butterchurn Presets", e); diff --git a/package.json b/package.json index 42ecf132..048bb26f 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "babel-preset-react": "^6.24.1", "babel-runtime": "^6.26.0", "butterchurn": "^2.4.3", - "butterchurn-presets": "^2.4.5", + "butterchurn-presets": "^2.4.7", "canvas-mock": "0.0.0", "cardinal-spline-js": "^2.3.6", "classnames": "^2.2.5", diff --git a/yarn.lock b/yarn.lock index 40e2c41b..bebc0434 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1269,9 +1269,9 @@ builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" -butterchurn-presets@^2.4.5: - version "2.4.5" - resolved "https://registry.yarnpkg.com/butterchurn-presets/-/butterchurn-presets-2.4.5.tgz#5e05f2c57e941ff2d24f655b0ea842ca1ff4787a" +butterchurn-presets@^2.4.7: + version "2.4.7" + resolved "https://registry.yarnpkg.com/butterchurn-presets/-/butterchurn-presets-2.4.7.tgz#41e4e37cd3af2aec124fa8062352816100956c29" dependencies: babel-runtime "^6.26.0" ecma-proposal-math-extensions "0.0.2"