Skip to content

Commit 84508e3

Browse files
martinRenoumaartenbreddels
authored andcommitted
Fix tsc build (#87)
1 parent 11be463 commit 84508e3

File tree

11 files changed

+49
-24
lines changed

11 files changed

+49
-24
lines changed

js/karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ module.exports = function (config) {
1313
frameworks: ['mocha', 'chai', 'sinon'],
1414
files: [
1515
// we use 1 bundle for testing
16-
{ pattern: 'lib/src/test/index.js' },
16+
{ pattern: 'lib/test/index.js' },
1717
],
1818
exclude: ['**/embed.js'],
1919
preprocessors: {
2020
// the bundle goes through webpack, and will emit (inline) source maps, which karma needs to read again
21-
'lib/src/test/index.js': ['webpack', 'sourcemap'],
21+
'lib/test/index.js': ['webpack', 'sourcemap'],
2222
},
2323
webpack: {
2424
module: {

js/package-lock.json

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
],
1717
"scripts": {
1818
"prepare": "npm run build",
19-
"build": "tsc --project . && webpack --mode=development",
19+
"build": "tsc --project . && webpack --mode=production",
2020
"watch": "npm-run-all -p watch:*",
2121
"watch:lib": "tsc -w --project .",
2222
"watch:nbextension": "webpack --watch --mode=development",
2323
"test": "karma start --single-run"
2424
},
2525
"jupyterlab": {
26-
"extension": "lib/src/labplugin"
26+
"extension": "lib/labplugin"
2727
},
2828
"devDependencies": {
2929
"@types/expect.js": "^0.3.29",

js/src/embed.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
// Export widget models and views, and the npm package version number.
88
export * from './sheet';
9-
export { version } from '../package.json';
9+
export {version} from './version';

js/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99

1010
// Export widget models and views, and the npm package version number.
1111
export * from './sheet';
12-
export { version } from '../package.json';
12+
export { version } from './version';

js/src/labplugin.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import * as sheet from './sheet';
22
import * as renderer from './renderer';
33
import * as base from '@jupyter-widgets/base';
4-
import * as pkg from '../package.json';
4+
import {version} from './version';
55

66
const ipysheetPlugin = {
77
id: 'ipysheet',
88
requires: [base.IJupyterWidgetRegistry],
99
activate: function(app, widgets) {
1010
widgets.registerWidget({
1111
name: 'ipysheet',
12-
version: pkg.version,
12+
version: version,
1313
exports: sheet
1414
});
1515
},
@@ -22,7 +22,7 @@ const rendererPlugin = {
2222
activate: function(app, widgets) {
2323
widgets.registerWidget({
2424
name: 'ipysheet/renderer',
25-
version: pkg.version,
25+
version: version,
2626
exports: renderer
2727
});
2828
},

js/src/renderer.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import * as widgets from '@jupyter-widgets/base';
22
import {extend} from 'lodash';
3-
import * as pkg from '../package.json';
3+
import {version, semver_range} from './version';
44
// @ts-ignore
55
import * as Handsontable from 'handsontable';
66

7-
let version = pkg.version;
8-
let semver_range = '~' + version;
9-
107

118
let RendererModel = widgets.WidgetModel.extend({
129
defaults: function() {

js/src/sheet.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as widgets from '@jupyter-widgets/base';
22
import {cloneDeep, extend, includes as contains, each, debounce, times, map, unzip as transpose} from 'lodash';
3-
import * as pkg from '../package.json';
3+
import {semver_range} from './version';
44
import './widget_cell_type';
55
// @ts-ignore
66
import * as Handsontable from 'handsontable';
@@ -9,9 +9,7 @@ import 'pikaday/css/pikaday.css';
99
import 'handsontable/dist/handsontable.min.css';
1010
import '@jupyter-widgets/controls/css/materialcolors.css'
1111
import '@jupyter-widgets/controls/css/labvariables.css'
12-
import '../../css/custom.css';
13-
14-
let semver_range = '~' + pkg.version;
12+
import '../css/custom.css';
1513

1614

1715
let CellRangeModel = widgets.WidgetModel.extend({

js/src/version.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
declare let require: any;
2+
3+
export let version = require('../package.json').version;
4+
export let semver_range = '~' + version;

js/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"compilerOptions": {
3-
"resolveJsonModule": true,
43
"noImplicitAny": false,
54
"lib": ["dom", "es5", "es2015.promise", "es2015.iterable"],
65
"strictNullChecks": true,

0 commit comments

Comments
 (0)