Skip to content

Commit b5edd29

Browse files
Fix embedding (#91)
* export handsontable from ipysheet, and make embedded renderer work from that
1 parent 6de86e2 commit b5edd29

File tree

9 files changed

+12
-25
lines changed

9 files changed

+12
-25
lines changed

js/karma.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ module.exports = function (config) {
2929
mode: 'development',
3030
resolve: {
3131
extensions: ['.js'],
32+
alias: {ipysheet$: path.resolve(__dirname, './lib/index')}
3233
},
3334
},
3435
reporters: ['progress', 'mocha'],

js/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.3.2",
44
"description": "Spreadsheet in the Jupyter notebook",
55
"author": "Maarten A. Breddels",
6-
"main": "lib/src/index.js",
6+
"main": "lib/index.js",
77
"repository": {
88
"type": "git",
99
"url": "https://github.com/QuantStack/ipysheet.git"

js/src/embed.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
// Export widget models and views, and the npm package version number.
88
export * from './sheet';
99
export {version} from './version';
10+
import * as Handsontable from 'handsontable';
11+
export { Handsontable };

js/src/extension.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ if (window['require'] !== undefined) {
88
map: {
99
"*" : {
1010
"ipysheet": "nbextensions/ipysheet/index",
11-
"handsontable": "nbextensions/ipysheet/handsontable",
1211
"jupyter-js-widgets": "nbextensions/jupyter-js-widgets/extension"
1312
}
1413
}

js/src/handsontable_mod.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

js/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@
1010
// Export widget models and views, and the npm package version number.
1111
export * from './sheet';
1212
export { version } from './version';
13+
import * as Handsontable from 'handsontable';
14+
export { Handsontable };

js/src/renderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as widgets from '@jupyter-widgets/base';
22
import {extend} from 'lodash';
33
import {version, semver_range} from './version';
44
// @ts-ignore
5-
import * as Handsontable from 'handsontable';
5+
import {Handsontable} from 'ipysheet';
66

77

88
let RendererModel = widgets.WidgetModel.extend({

js/webpack.config.js

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ module.exports = [
6666
module: {
6767
rules: rules
6868
},
69-
externals: ['@jupyter-widgets/base', 'handsontable']
69+
externals: ['@jupyter-widgets/base']
7070
},
7171
{
7272
// same for render
@@ -81,7 +81,7 @@ module.exports = [
8181
module: {
8282
rules: rules
8383
},
84-
externals: ['@jupyter-widgets/base', 'handsontable']
84+
externals: ['@jupyter-widgets/base', 'ipysheet']
8585
},
8686
{
8787
// Embeddable ipysheet bundle
@@ -109,7 +109,7 @@ module.exports = [
109109
module: {
110110
rules: rules
111111
},
112-
externals: ['@jupyter-widgets/base', 'handsontable']
112+
externals: ['@jupyter-widgets/base']
113113
},
114114
{
115115
// same for renderer
@@ -124,17 +124,6 @@ module.exports = [
124124
module: {
125125
rules: rules
126126
},
127-
externals: ['@jupyter-widgets/base', 'handsontable']
127+
externals: ['@jupyter-widgets/base', 'ipysheet']
128128
},
129-
{
130-
entry: './node_modules/handsontable/dist/handsontable.min.js',
131-
output: {
132-
filename: 'handsontable.js',
133-
path: path.resolve(__dirname, '../ipysheet/static'),
134-
libraryTarget: 'amd'
135-
},
136-
module: {
137-
rules: rules
138-
},
139-
}
140129
];

setup.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ class NPM(Command):
7070
os.path.join(here, 'ipysheet', 'static', 'extension.js'),
7171
os.path.join(here, 'ipysheet', 'static', 'index.js'),
7272
os.path.join(here, 'ipysheet', 'static', 'extension-renderer.js'),
73-
os.path.join(here, 'ipysheet', 'static', 'renderer.js'),
74-
os.path.join(here, 'ipysheet', 'static', 'handsontable.js')
73+
os.path.join(here, 'ipysheet', 'static', 'renderer.js')
7574
]
7675

7776
def initialize_options(self):
@@ -128,7 +127,6 @@ def run(self):
128127
'include_package_data': True,
129128
'data_files': [
130129
('share/jupyter/nbextensions/ipysheet', [
131-
'ipysheet/static/handsontable.js',
132130
'ipysheet/static/extension.js',
133131
'ipysheet/static/index.js',
134132
'ipysheet/static/index.js.map',

0 commit comments

Comments
 (0)