Merge pull request #398 from vidartf/publicpath

Update public path logic

Author: vidartf

js/amd-public-path.js

@@ -0,0 +1,8 @@
+// In an AMD module, we set the public path using the magic requirejs 'module' dependency
+// See https://github.com/requirejs/requirejs/wiki/Differences-between-the-simplified-CommonJS-wrapper-and-standard-AMD-define#module
+// Since 'module' is a requirejs magic module, we must include 'module' in the webpack externals configuration.
+var module = require('module');
+var url = new URL(module.uri, document.location);
+// Using lastIndexOf('/')+1 gives us the empty string if there is no '/', so pathname becomes '/'
+url.pathname = url.pathname.slice(0,url.pathname.lastIndexOf('/')+1);
+__webpack_public_path__ = `${url.origin}${url.pathname}`;

js/src/extension.js

@@ -1,12 +1,4 @@
 // Entry point for the notebook bundle containing custom model definitions.
-//
-// Setup notebook base URL
-//
-// Some static assets may be required by the custom widget javascript. The base
-// url for the notebook is not known at build time and is therefore computed
-// dynamically.
-__webpack_public_path__ = document.querySelector('body').getAttribute('data-base-url') + 'nbextensions/jupyter-threejs/';
-
 
 // Configure requirejs
 if (window.requirejs) {

js/webpack.config.js

@@ -1,6 +1,6 @@
 const path = require('path');
 
-const externals = ['@jupyter-widgets/base', 'three'];
+const externals = ['@jupyter-widgets/base', 'three', 'module'];
 
 module.exports = [
     {
@@ -17,11 +17,12 @@ module.exports = [
     },
     {
         // jupyter-threejs bundle for the notebook
-        entry: './src/index.js',
+        entry: ['./amd-public-path.js', './src/index.js'],
         output: {
             filename: 'index.js',
             path: path.resolve(__dirname, '..', 'pythreejs', 'static'),
-            libraryTarget: 'amd'
+            libraryTarget: 'amd',
+            publicPath: '', // Set in amd-public-path.js
         },
         devtool: 'source-map',
         externals: externals,
@@ -32,14 +33,15 @@ module.exports = [
     },
     {
         // embeddable jupyter-threejs bundle (e.g. for docs)
-        entry: './src/index.js',
+        entry: ['./amd-public-path.js', './src/index.js'],
         output: {
             filename: 'index.js',
             path: path.resolve(__dirname, 'dist'),
             library: 'jupyter-threejs',
-            libraryTarget: 'amd'
+            libraryTarget: 'amd',
+            publicPath: '', // Set in amd-public-path.js
         },
-        externals: ['@jupyter-widgets/base'],
+        externals: ['@jupyter-widgets/base', 'module'],
         resolve: {
             extensions: [ '.autogen.js', '.js' ]
         },