Removing inline webpack requires

K3D-tools · Aug 31, 2021 · 95a2f2a · 95a2f2a
1 parent 539c53c
commit 95a2f2a
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 52 deletions.
diff --git a/js/src/core/Core.js b/js/src/core/Core.js
@@ -66,7 +66,10 @@ function K3D(provider, targetDOMNode, parameters) {
     };
     let guiContainer;
 
-    require('style-loader?{attributes:{id: "k3d-style"}}!css-loader!./../k3d.css');
+
+    require('./../k3d.css');
+    //TODO
+    // require('style-loader?{attributes:{id: "k3d-style"}}!css-loader!./../k3d.css');
 
     function dispatch(eventName, data) {
         if (!listeners[eventName]) {
@@ -258,44 +261,44 @@ function K3D(provider, targetDOMNode, parameters) {
 
     this.GUI = GUI;
     this.parameters = _.assignWith({
-            viewMode: viewModes.view,
-            cameraMode: cameraModes.trackball,
-            manipulateMode: manipulate.manipulateModes.translate,
-            voxelPaintColor: 0,
-            snapshotIncludeJs: true,
-            menuVisibility: true,
-            cameraAutoFit: true,
-            gridAutoFit: true,
-            gridVisible: true,
-            grid: [-1, -1, -1, 1, 1, 1],
-            gridColor: 0xe6e6e6,
-            labelColor: 0x444444,
-            antialias: 1,
-            screenshotScale: 5.0,
-            renderingSteps: 1,
-            clearColor: 0xffffff,
-            clippingPlanes: [],
-            fpsMeter: false,
-            lighting: 1.5,
-            time: 0.0,
-            colorbarObjectId: -1,
-            colorbarScientific: false,
-            fps: 25.0,
-            axes: ['x', 'y', 'z'],
-            cameraNoRotate: false,
-            cameraNoZoom: false,
-            cameraNoPan: false,
-            cameraRotateSpeed: 1.0,
-            cameraZoomSpeed: 1.2,
-            cameraPanSpeed: 0.3,
-            cameraDampingFactor: 0.0,
-            name: null,
-            camera_fov: 60.0,
-            cameraAnimation: {},
-            autoRendering: true,
-            axesHelper: 1.0,
-            guiVersion: require('../../package.json').version,
-        },
+        viewMode: viewModes.view,
+        cameraMode: cameraModes.trackball,
+        manipulateMode: manipulate.manipulateModes.translate,
+        voxelPaintColor: 0,
+        snapshotIncludeJs: true,
+        menuVisibility: true,
+        cameraAutoFit: true,
+        gridAutoFit: true,
+        gridVisible: true,
+        grid: [-1, -1, -1, 1, 1, 1],
+        gridColor: 0xe6e6e6,
+        labelColor: 0x444444,
+        antialias: 1,
+        screenshotScale: 5.0,
+        renderingSteps: 1,
+        clearColor: 0xffffff,
+        clippingPlanes: [],
+        fpsMeter: false,
+        lighting: 1.5,
+        time: 0.0,
+        colorbarObjectId: -1,
+        colorbarScientific: false,
+        fps: 25.0,
+        axes: ['x', 'y', 'z'],
+        cameraNoRotate: false,
+        cameraNoZoom: false,
+        cameraNoPan: false,
+        cameraRotateSpeed: 1.0,
+        cameraZoomSpeed: 1.2,
+        cameraPanSpeed: 0.3,
+        cameraDampingFactor: 0.0,
+        name: null,
+        camera_fov: 60.0,
+        cameraAnimation: {},
+        autoRendering: true,
+        axesHelper: 1.0,
+        guiVersion: require('../../package.json').version,
+    },
         parameters || {},
         (objValue, srcValue) => (typeof (srcValue) === 'undefined' ? objValue : srcValue));
 

diff --git a/js/src/core/lib/snapshot.js b/js/src/core/lib/snapshot.js
@@ -4,8 +4,8 @@ const fileLoader = require('./helpers/fileLoader');
 const templateStandalone = require('./snapshot_standalone.txt');
 const templateOnline = require('./snapshot_online.txt');
 const templateInline = require('./snapshot_inline.txt');
-const requireJsSource = require('../../../node_modules/requirejs/require?raw');
-const pakoJsSource = require('../../../node_modules/pako/dist/pako_inflate.min?raw');
+const requireJsSource = require('requirejs/require?raw');
+const pakoJsSource = require('pako/dist/pako_inflate.min?raw');
 const semverRange = require('../../version').version;
 const buffer = require('./helpers/buffer');
 

diff --git a/js/src/development.js b/js/src/development.js
@@ -1,7 +1,12 @@
 require('es6-promise');
 
-require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!../node_modules/katex/dist/katex.min.css');
-require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!../node_modules/dat.gui/build/dat.gui.css');
+//TODO
+// require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!katex/dist/katex.min.css');
+// require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!dat.gui/build/dat.gui.css');
+
+require('katex/dist/katex.min.css');
+require('dat.gui/build/dat.gui.css');
+
 
 module.exports = {
     K3D: require('./core/Core'),

diff --git a/js/src/embed.js b/js/src/embed.js
@@ -1,7 +1,10 @@
 const _ = require('./lodash');
 
-require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!../node_modules/katex/dist/katex.min.css');
-require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!../node_modules/dat.gui/build/dat.gui.css');
+// require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!katex/dist/katex.min.css');
+// require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!dat.gui/build/dat.gui.css');
+
+require('katex/dist/katex.min.css');
+require('dat.gui/build/dat.gui.css');
 
 module.exports = _.extend({}, require('./k3d'));
 module.exports.version = require('./version').version;
diff --git a/js/src/extension.js b/js/src/extension.js
@@ -16,8 +16,11 @@ if (window.require) {
 
 window.__webpack_public_path__ = `${document.querySelector('body').getAttribute('data-base-url')}nbextensions/k3d/`;
 
-require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!../node_modules/katex/dist/katex.min.css');
-require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!../node_modules/dat.gui/build/dat.gui.css');
+// require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!katex/dist/katex.min.css');
+// require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!dat.gui/build/dat.gui.css');
+
+require('katex/dist/katex.min.css');
+require('dat.gui/build/dat.gui.css');
 
 // Export the required load_ipython_extention
 module.exports = {

diff --git a/js/src/labplugin.js b/js/src/labplugin.js
@@ -8,8 +8,12 @@ module.exports = {
     id: 'jupyter.extensions.k3d',
     requires: [base.IJupyterWidgetRegistry],
     activate(app, widgets) {
-        require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!../node_modules/katex/dist/katex.min.css');
-        require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!../node_modules/dat.gui/build/dat.gui.css');
+        // require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!katex/dist/katex.min.css');
+        // require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!dat.gui/build/dat.gui.css');
+
+
+        require('katex/dist/katex.min.css');
+require('dat.gui/build/dat.gui.css');
 
         widgets.registerWidget({
             name: 'k3d',

diff --git a/js/src/standalone.js b/js/src/standalone.js
@@ -5,8 +5,11 @@ const msgpack = require('msgpack-lite');
 const pako = require('pako');
 const MsgpackCodec = msgpack.createCodec({ preset: true });
 
-require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!../node_modules/katex/dist/katex.min.css');
-require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!../node_modules/dat.gui/build/dat.gui.css');
+// require('style-loader?{attributes:{id: "k3d-katex"}}!css-loader!katex/dist/katex.min.css');
+// require('style-loader?{attributes:{id: "k3d-dat.gui"}}!css-loader!dat.gui/build/dat.gui.css');
+
+require('katex/dist/katex.min.css');
+require('dat.gui/build/dat.gui.css');
 
 function CreateK3DAndLoadBinarySnapshot(data, targetDOMNode) {
     let K3DInstance;

diff --git a/js/src/transferFunctionEditor.js b/js/src/transferFunctionEditor.js
@@ -19,7 +19,9 @@ function K3DTransferFunctionEditor(targetDOMNode, parameters, onChange) {
     let opacityCircles = [];
     let colormapCircles = [];
 
-    require('style-loader?{attributes:{id: "k3d-style"}}!css-loader!./k3d.css');
+    require('./k3d.css');
+    //TODO
+    // require('style-loader?{attributes:{id: "k3d-style"}}!css-loader!./k3d.css');
 
     function removeOpacityCircle(evt) {
         const el = evt.target.parentNode;