WhitestormJS · sasha240100 · Mar 14, 2017 · Mar 14, 2017 · Mar 14, 2017 · Mar 14, 2017
diff --git a/build/whitestorm.compact.js b/build/whitestorm.compact.js
diff --git a/build/whitestorm.js b/build/whitestorm.js
diff --git a/examples/assets/vendor/three.min.js b/examples/assets/vendor/three.min.js
diff --git a/examples/layout.pug b/examples/layout.pug
@@ -19,6 +19,7 @@ html
     block body
 
     block dependencies
+      script(src='/assets/vendor/three.min.js')
       script(src='../../../build/whitestorm.js')
       block additional
         script(src='../../../modules/whs-module-statsjs/build/StatsModule.js')

diff --git a/package.json b/package.json
@@ -75,7 +75,6 @@
     "semantic-ui-less": "^2.2.9",
     "snyk": "^1.25.1",
     "surge": "^0.18.0",
-    "three": "^0.84.0",
     "uglify-loader": "^1.4.0",
     "webpack": "^2.2.1",
     "webpack-dashboard": "^0.3.0",

diff --git a/src/components/meshes/Parametric.js b/src/components/meshes/Parametric.js
@@ -1,7 +1,8 @@
 import {
   Mesh,
   ParametricBufferGeometry,
-  ParametricGeometry
+  ParametricGeometry,
+  Vector3
 } from 'three';
 
 import {MeshComponent} from '../../core/MeshComponent';
@@ -10,7 +11,7 @@ class Parametric extends MeshComponent {
   static defaults = {
     ...MeshComponent.defaults,
     geometry: {
-      func: (u, v) => new THREE.Vector3(u, v, 0),
+      func: (u, v) => new Vector3(u, v, 0),
       slices: 10,
       stacks: 10
     }

diff --git a/src/core/ModuleSystem.js b/src/core/ModuleSystem.js
@@ -1,7 +1,18 @@
+import {REVISION} from 'three';
 import Events from 'minivents';
-
 import {ManagerError} from './errors';
 
+// Check for Three.js
+const warnDeps = () => {
+  throw new Error('WhitestormJS Framework requires Three.js r74. https://threejs.org/');
+};
+
+try {
+  if (!REVISION) warnDeps();
+} catch (err) {
+  warnDeps();
+}
+
 export class ModuleSystem extends Events {
   // INTEGRATING
 

diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,3 @@
-import * as THREE from 'three';
-
 export * from './core/index';
 export * from './components/lights/index';
 export * from './components/cameras/index';
@@ -13,6 +11,3 @@ export * from './modules/presets/index';
 
 // DEPRECATION
 export * from './deprecation';
-
-if (typeof window !== 'undefined') window.THREE = THREE;
-else if (typeof global !== 'undefined') global.THREE = THREE;
diff --git a/src/modules/app/PostProcessorModule.js b/src/modules/app/PostProcessorModule.js
@@ -1,4 +1,6 @@
 import {
+  LinearFilter,
+  RGBAFormat,
   WebGLRenderTarget
 } from 'three';
 
@@ -45,9 +47,9 @@ export class PostProcessorModule {
       size.width,
       size.height,
       {
-        minFilter: THREE.LinearFilter,
-        magFilter: THREE.LinearFilter,
-        format: THREE.RGBAFormat,
+        minFilter: LinearFilter,
+        magFilter: LinearFilter,
+        format: RGBAFormat,
         stencilBuffer: false
       }
     );

diff --git a/src/three.js b/src/three.js
diff --git a/test/components.spec.js b/test/components.spec.js
@@ -1,4 +1,5 @@
 import * as WHS from '../src/index';
+import {Mesh} from 'three';
 
 const meshes = [
   'Box',
@@ -61,6 +62,6 @@ test('Group', () => {
   const sphere = new WHS.Sphere();
   const box = new WHS.Box();
 
-  const group = new WHS.Group(sphere, box, new THREE.Mesh());
+  const group = new WHS.Group(sphere, box, new Mesh());
   group.addTo(app);
 });
diff --git a/webpack.config.babel.js b/webpack.config.babel.js
@@ -4,15 +4,15 @@ import HappyPack from 'happypack';
 import DashboardPlugin from 'webpack-dashboard/plugin';
 
 export function config(
-    {
-      isProduction,
-      src,
-      dest,
-      filename = 'whitestorm.js',
-      plugins = [],
-      compact = false,
-      version = require('./package.json').version
-    }
+  {
+    isProduction,
+    src,
+    dest,
+    filename = 'whitestorm.js',
+    plugins = [],
+    compact = false,
+    version = require('./package.json').version
+  }
 ) {
   if (process.env.CI) isProduction = true;
   console.log(`Mode: ${isProduction ? 'production' : 'development'}`);
@@ -47,6 +47,14 @@ export function config(
         }
       ]
     },
+    externals: {
+      three: {
+        commonjs: 'three',
+        commonjs2: 'three',
+        amd: 'three',
+        root: 'THREE'
+      }
+    },
     plugins: [
       new webpack.LoaderOptionsPlugin({
         minimize: isProduction,
@@ -81,10 +89,7 @@ export function config(
       modules: [
         path.resolve(__dirname, 'node_modules'),
         src
-      ],
-      alias: {
-        three$: path.join(__dirname, './node_modules/three/build/three.module.js')
-      }
+      ]
     }
   };
 }