Skip to content

Commit 129221f

Browse files
afshinafshin
authored
Merge pull request #330 from afshin/lumino-2
Update more `devDependencies`, fix `eslint`, use `ES6`
2 parents 45f2b27 + 824c5a3 commit 129221f

File tree

95 files changed

+2261
-3932
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2261
-3932
lines changed

‎.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ coverage
1212
*.map.js
1313
*.bundle.js
1414
*.config.js
15+
.eslintrc.js
1516

1617
# jetbrains IDE stuff
1718
.idea/

‎.eslintrc.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ module.exports = {
1919
root: true,
2020
extends: [
2121
'eslint:recommended',
22-
'plugin:@typescript-eslint/eslint-recommended',
2322
'plugin:@typescript-eslint/recommended',
24-
'prettier/@typescript-eslint'
23+
'prettier'
2524
],
2625
parser: '@typescript-eslint/parser',
26+
parserOptions: {
27+
ecmaVersion: 'ES6',
28+
project: ['./tsconfigbase.json']
29+
},
2730
plugins: ['@typescript-eslint'],
2831
rules: {
2932
'@typescript-eslint/no-unused-vars': ['warn', { args: 'none' }],
@@ -44,7 +47,7 @@ module.exports = {
4447
'no-inner-declarations': 'off',
4548
'no-prototype-builtins': 'off',
4649
'no-control-regex': 'warn',
47-
'no-undef': 'warn',
50+
'no-undef': 'off',
4851
'no-case-declarations': 'warn',
4952
'no-useless-escape': 'off',
5053
'prefer-const': 'off',

‎examples/example-accordionpanel/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"source-map-loader": "0.2.4",
1919
"style-loader": "^1.0.2",
2020
"typescript": "~4.7.3",
21-
"webpack": "^4.41.3",
22-
"webpack-cli": "^3.3.10"
21+
"webpack": "^5.74.0",
22+
"webpack-cli": "^4.10.0"
2323
}
2424
}

‎examples/example-accordionpanel/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"sourceMap": true,
99
"module": "commonjs",
1010
"moduleResolution": "node",
11-
"target": "ES5",
11+
"target": "ES6",
1212
"outDir": "./build",
13-
"lib": ["ES5", "ES2015.Promise", "ES2015.Iterable", "DOM"],
13+
"lib": ["DOM", "ES6"],
1414
"types": []
1515
},
1616
"include": ["src/*"]

‎examples/example-datagrid/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"rimraf": "^3.0.2",
1919
"style-loader": "^1.0.2",
2020
"typescript": "~4.7.3",
21-
"webpack": "^4.41.3",
22-
"webpack-cli": "^3.3.10"
21+
"webpack": "^5.74.0",
22+
"webpack-cli": "^4.10.0"
2323
}
2424
}

‎examples/example-datagrid/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"strictNullChecks": true,
88
"module": "commonjs",
99
"moduleResolution": "node",
10-
"target": "ES5",
10+
"target": "ES6",
1111
"outDir": "./build",
12-
"lib": ["ES5", "ES2015.Promise", "ES2015.Iterable", "DOM"],
12+
"lib": ["DOM", "ES6"],
1313
"types": []
1414
},
1515
"include": ["src/*"]

‎examples/example-dockpanel-iife/index.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88

99
<script src="https://cdn.jsdelivr.net/npm/es6-promise@4/dist/es6-promise.auto.js"></script>
1010

11-
<script src="../../packages/algorithm/dist/index.min.js"></script>
12-
<script src="../../packages/collections/dist/index.min.js"></script>
13-
<script src="../../packages/properties/dist/index.min.js"></script>
14-
<script src="../../packages/messaging/dist/index.min.js"></script>
15-
<script src="../../packages/signaling/dist/index.min.js"></script>
16-
<script src="../../packages/disposable/dist/index.min.js"></script>
17-
<script src="../../packages/domutils/dist/index.min.js"></script>
18-
<script src="../../packages/coreutils/dist/index.min.js"></script>
19-
<script src="../../packages/keyboard/dist/index.min.js"></script>
20-
<script src="../../packages/commands/dist/index.min.js"></script>
21-
<script src="../../packages/dragdrop/dist/index.min.js"></script>
22-
<script src="../../packages/virtualdom/dist/index.min.js"></script>
23-
<script src="../../packages/widgets/dist/index.min.js"></script>
11+
<script src="../../packages/algorithm/dist/index.js"></script>
12+
<script src="../../packages/collections/dist/index.js"></script>
13+
<script src="../../packages/properties/dist/index.js"></script>
14+
<script src="../../packages/messaging/dist/index.js"></script>
15+
<script src="../../packages/signaling/dist/index.js"></script>
16+
<script src="../../packages/disposable/dist/index.js"></script>
17+
<script src="../../packages/domutils/dist/index.js"></script>
18+
<script src="../../packages/coreutils/dist/index.js"></script>
19+
<script src="../../packages/keyboard/dist/index.js"></script>
20+
<script src="../../packages/commands/dist/index.js"></script>
21+
<script src="../../packages/dragdrop/dist/index.js"></script>
22+
<script src="../../packages/virtualdom/dist/index.js"></script>
23+
<script src="../../packages/widgets/dist/index.js"></script>
2424

2525
<link href="./style/index.css" rel="stylesheet">
2626
<script src="./src/index.js"></script>

‎examples/example-dockpanel-iife/src/index.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,18 @@ function createMenu() {
4949
return root;
5050
}
5151

52-
function ContentWidget(name) {
53-
Widget.call(this, { node: ContentWidget.prototype.createNode() });
54-
this.setFlag(Widget.Flag.DisallowLayout);
55-
this.addClass('content');
56-
this.addClass(name.toLowerCase());
57-
this.title.label = name;
58-
this.title.closable = true;
59-
this.title.caption = 'Long description for: ' + name;
52+
class ContentWidget extends Widget {
53+
constructor(name) {
54+
super({ node: ContentWidget.prototype.createNode() });
55+
this.setFlag(Widget.Flag.DisallowLayout);
56+
this.addClass('content');
57+
this.addClass(name.toLowerCase());
58+
this.title.label = name;
59+
this.title.closable = true;
60+
this.title.caption = 'Long description for: ' + name;
61+
}
6062
}
63+
6164
ContentWidget.prototype = Object.create(Widget.prototype);
6265

6366
ContentWidget.prototype.createNode = function () {

‎examples/example-dockpanel/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"source-map-loader": "0.2.4",
2121
"style-loader": "^1.0.2",
2222
"typescript": "~4.7.3",
23-
"webpack": "^4.41.3",
24-
"webpack-cli": "^3.3.10"
23+
"webpack": "^5.74.0",
24+
"webpack-cli": "^4.10.0"
2525
}
2626
}

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"lerna": "3.14.1",
2+
"lerna": "5.3.0",
33
"version": "independent",
44
"npmClient": "yarn",
55
"useWorkspaces": true

‎package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@
4040
"update:dependency": "update-dependency --lerna",
4141
"update:versions": "lerna version --no-push --no-git-tag-version"
4242
},
43-
"dependencies": {},
4443
"devDependencies": {
4544
"@jupyterlab/buildutils": "^3.0.0",
46-
"@typescript-eslint/eslint-plugin": "~4.8.1",
47-
"@typescript-eslint/parser": "~4.8.1",
48-
"eslint": "~7.14.0",
49-
"eslint-config-prettier": "~6.15.0",
50-
"eslint-plugin-prettier": "~3.1.4",
45+
"@typescript-eslint/eslint-plugin": "^5.32.0",
46+
"@typescript-eslint/parser": "^5.32.0",
47+
"eslint": "^8.21.0",
48+
"eslint-config-prettier": "^8.5.0",
49+
"eslint-plugin-prettier": "^4.2.0",
5150
"husky": "^4.2.5",
52-
"lerna": "^4.0.0",
51+
"lerna": "^5.3.0",
5352
"lint-staged": "^10.2.13",
54-
"prettier": "~2.1.1",
53+
"prettier": "^2.7.1",
5554
"shell-quote": "^1.7.2",
56-
"typedoc": "~0.23.9"
55+
"typedoc": "~0.23.9",
56+
"typescript": "~4.7.3"
5757
},
5858
"jupyter-releaser": {
5959
"skip": [

‎packages/algorithm/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
},
4848
"devDependencies": {
4949
"@microsoft/api-extractor": "^7.6.0",
50+
"@rollup/plugin-node-resolve": "^13.3.0",
5051
"@types/mocha": "^2.2.39",
5152
"chai": "^4.3.4",
5253
"karma": "^6.3.4",
@@ -56,17 +57,17 @@
5657
"karma-mocha": "^2.0.1",
5758
"karma-mocha-reporter": "^2.2.5",
5859
"mocha": "^9.0.3",
60+
"postcss": "^8.4.14",
5961
"rimraf": "^3.0.2",
60-
"rollup": "^2.56.0",
61-
"rollup-plugin-node-resolve": "^5.2.0",
62-
"rollup-plugin-postcss": "^4.0.0",
62+
"rollup": "^2.77.2",
63+
"rollup-plugin-postcss": "^4.0.2",
6364
"rollup-plugin-sourcemaps": "^0.6.3",
6465
"terser": "^5.7.1",
65-
"tslib": "^2.3.0",
66+
"tslib": "^2.4.0",
6667
"typedoc": "~0.23.9",
6768
"typescript": "~4.7.3",
68-
"webpack": "^4.41.3",
69-
"webpack-cli": "^3.3.10"
69+
"webpack": "^5.74.0",
70+
"webpack-cli": "^4.10.0"
7071
},
7172
"publishConfig": {
7273
"access": "public"

‎packages/algorithm/rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import nodeResolve from 'rollup-plugin-node-resolve';
1+
import nodeResolve from '@rollup/plugin-node-resolve';
22
import sourcemaps from 'rollup-plugin-sourcemaps';
33
import postcss from 'rollup-plugin-postcss';
44

‎packages/algorithm/src/iter.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,9 @@ export function toArray<T>(object: IterableOrArrayLike<T>): T[] {
355355
* toObject(data); // { one: 1, two: 2, three: 3 }
356356
* ```
357357
*/
358-
export function toObject<T>(
359-
object: IterableOrArrayLike<[string, T]>
360-
): { [key: string]: T } {
358+
export function toObject<T>(object: IterableOrArrayLike<[string, T]>): {
359+
[key: string]: T;
360+
} {
361361
let it = iter(object);
362362
let pair: [string, T] | undefined;
363363
let result: { [key: string]: T } = {};

‎packages/algorithm/tests/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../../tsconfigbase",
33
"compilerOptions": {
4-
"lib": ["ES5"],
4+
"lib": ["ES6"],
55
"outDir": "lib",
66
"rootDir": "src",
77
"types": ["chai", "mocha"]

‎packages/algorithm/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "../../tsconfigbase",
33
"compilerOptions": {
44
"declarationDir": "types",
5-
"lib": ["ES5", "ES2015.Collection", "ES2015.Iterable"],
5+
"lib": ["ES6"],
66
"outDir": "lib",
77
"rootDir": "src"
88
},

‎packages/application/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
},
5353
"devDependencies": {
5454
"@microsoft/api-extractor": "^7.6.0",
55+
"@rollup/plugin-node-resolve": "^13.3.0",
5556
"@types/chai": "^3.4.35",
5657
"@types/mocha": "^2.2.39",
5758
"chai": "^4.3.4",
@@ -62,17 +63,17 @@
6263
"karma-mocha": "^2.0.1",
6364
"karma-mocha-reporter": "^2.2.5",
6465
"mocha": "^9.0.3",
66+
"postcss": "^8.4.14",
6567
"rimraf": "^3.0.2",
66-
"rollup": "^2.56.0",
67-
"rollup-plugin-node-resolve": "^5.2.0",
68-
"rollup-plugin-postcss": "^4.0.0",
68+
"rollup": "^2.77.2",
69+
"rollup-plugin-postcss": "^4.0.2",
6970
"rollup-plugin-sourcemaps": "^0.6.3",
7071
"terser": "^5.7.1",
71-
"tslib": "^2.3.0",
72+
"tslib": "^2.4.0",
7273
"typedoc": "~0.23.9",
7374
"typescript": "~4.7.3",
74-
"webpack": "^4.41.3",
75-
"webpack-cli": "^3.3.10"
75+
"webpack": "^5.74.0",
76+
"webpack-cli": "^4.10.0"
7677
},
7778
"publishConfig": {
7879
"access": "public"

‎packages/application/rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import nodeResolve from 'rollup-plugin-node-resolve';
1+
import nodeResolve from '@rollup/plugin-node-resolve';
22
import sourcemaps from 'rollup-plugin-sourcemaps';
33
import postcss from 'rollup-plugin-postcss';
44

‎packages/application/tests/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../../tsconfigbase",
33
"compilerOptions": {
4-
"lib": ["ES5"],
4+
"lib": ["ES6"],
55
"outDir": "lib",
66
"rootDir": "src",
77
"types": ["chai", "mocha"]

‎packages/application/tsconfig.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@
22
"extends": "../../tsconfigbase",
33
"compilerOptions": {
44
"declarationDir": "types",
5-
"lib": [
6-
"ES5",
7-
"ES2015.Collection",
8-
"ES2015.Promise",
9-
"ES2015.Iterable",
10-
"DOM"
11-
],
5+
"lib": ["DOM", "ES6"],
126
"outDir": "lib",
137
"rootDir": "src"
148
},

‎packages/collections/package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
},
5151
"devDependencies": {
5252
"@microsoft/api-extractor": "^7.6.0",
53+
"@rollup/plugin-node-resolve": "^13.3.0",
5354
"@types/chai": "^3.4.35",
5455
"@types/mocha": "^2.2.39",
5556
"chai": "^4.3.4",
@@ -60,17 +61,17 @@
6061
"karma-mocha": "^2.0.1",
6162
"karma-mocha-reporter": "^2.2.5",
6263
"mocha": "^9.0.3",
64+
"postcss": "^8.4.14",
6365
"rimraf": "^3.0.2",
64-
"rollup": "^2.56.0",
65-
"rollup-plugin-node-resolve": "^5.2.0",
66-
"rollup-plugin-postcss": "^4.0.0",
66+
"rollup": "^2.77.2",
67+
"rollup-plugin-postcss": "^4.0.2",
6768
"rollup-plugin-sourcemaps": "^0.6.3",
6869
"terser": "^5.7.1",
69-
"tslib": "^2.3.0",
70+
"tslib": "^2.4.0",
7071
"typedoc": "~0.23.9",
7172
"typescript": "~4.7.3",
72-
"webpack": "^4.41.3",
73-
"webpack-cli": "^3.3.10"
73+
"webpack": "^5.74.0",
74+
"webpack-cli": "^4.10.0"
7475
},
7576
"publishConfig": {
7677
"access": "public"

‎packages/collections/rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import nodeResolve from 'rollup-plugin-node-resolve';
1+
import nodeResolve from '@rollup/plugin-node-resolve';
22
import sourcemaps from 'rollup-plugin-sourcemaps';
33
import postcss from 'rollup-plugin-postcss';
44

‎packages/collections/tests/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../../../tsconfigbase",
33
"compilerOptions": {
4-
"lib": ["ES5"],
4+
"lib": ["ES6"],
55
"outDir": "lib",
66
"rootDir": "src",
77
"types": ["chai", "mocha"]

‎packages/collections/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "../../tsconfigbase",
33
"compilerOptions": {
44
"declarationDir": "types",
5-
"lib": ["ES5"],
5+
"lib": ["ES6"],
66
"outDir": "lib",
77
"rootDir": "src"
88
},

0 commit comments

Comments
 (0)