Skip to content

Commit 5338eb4

Browse files
tobiasengelhardttobiasengelhardt
authored
feat: update to angular 10 (CirclonGroup#844)
1 parent effe933 commit 5338eb4

File tree

11 files changed

+3220
-3700
lines changed

11 files changed

+3220
-3700
lines changed

‎package-lock.json

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

‎package.json

Lines changed: 33 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,20 @@
3232
"scripts": {
3333
"lint:lib": "ng lint angular-tree-component",
3434
"build:lib": "npm run lint:lib && npm run clean:dist && ng build angular-tree-component",
35+
"build": "npm run build:lib",
3536
"clean:dist": "rimraf dist",
3637
"copy:files": "cp ./README.md ./dist/angular-tree-component && cp ./LICENSE ./dist/angular-tree-component && cp ./projects/angular-tree-component/src/lib/angular-tree-component.css ./dist/angular-tree-component/css/",
3738
"copy:files:win": "copy README.md .\\dist\\angular-tree-component && copy LICENSE .\\dist\\angular-tree-component && xcopy .\\projects\\angular-tree-component\\src\\lib\\angular-tree-component.css .\\dist\\angular-tree-component\\css\\",
3839
"doc": "typedoc --module commonjs --out doc lib/defs/api.ts",
39-
"clean": "npm run clean:typescript && rimraf node_modules && npm cache clean",
40-
"clean:typescript": "rimraf dist",
40+
"clean:all": "npm run clean:dist && rimraf node_modules && npm cache clean",
4141
"lint": "tslint lib/**/*.ts",
42-
"rollup": "./node_modules/.bin/rollup -c rollup.config.js dist/angular-tree-component.js -o dist/angular-tree-component.umd.js",
43-
"build": "npm run lint && npm run clean:typescript && ng build angular-tree-component",
44-
"build:win": "npm run lint && npm run clean:typescript && ng build angular-tree-component",
4542
"prepublish:lib:win": "npm run build:lib && npm run copy:files:win",
4643
"start:example-app": "ng serve",
47-
"example:cli": "./node_modules/.bin/ngc && cp lib/angular-tree-component.css dist && cd example/cli && npm install && cp -rf ../../dist node_modules/angular-tree-component/ && ./node_modules/.bin/ng serve",
48-
"example:cli:win": ".\\node_modules\\.bin\\ngc && cd example\\cli && npm install && npm install ..\\..\\ && .\\node_modules\\.bin\\ng serve",
49-
"selupdate": "webdriver-manager update",
50-
"selenium": "webdriver-manager update && webdriver-manager start",
5144
"example:cli:build": "npm run build && cd example/cli && npm install && cp -rf ../../dist node_modules/angular-tree-component/ && cp src/index.build.html src/index.html && ./node_modules/.bin/ng build --aot && cp src/index.dev.html src/index.html && mkdir -p 500tech/angular-tree-component/master/example/cli/ && cp -rf dist 500tech/angular-tree-component/master/example/cli/",
52-
"test": "./node_modules/.bin/testcafe \"saucelabs:Chrome:Windows 10\" e2e/*.testcafe.js --app \"cd example/cli && node_modules/.bin/ng serve >/dev/null 2>&1\" -r xunit:/tmp/test-results/res.xml -c 4 --assertion-timeout 10000 --app-init-delay 20000 --page-load-timeout 10000 --selector-timeout 20000",
5345
"test:ci:local": "testcafe chrome:headless e2e/*.testcafe.js --app \"ng serve\" -r xunit:./xunit/res.xml -c 4 --assertion-timeout 10000 --app-init-delay 20000 --page-load-timeout 10000 --selector-timeout 20000",
5446
"test:dev": "testcafe chrome:headless e2e/*.testcafe.js",
55-
"test:debug": "./node_modules/.bin/testcafe chrome e2e/*.testcafe.js --inspect-brk",
56-
"test:slow": "./node_modules/.bin/testcafe chrome e2e/*.testcafe.js --speed 0.1",
57-
"test:setup": "npm run build && cd example/cli && npm install && cp -rf ../../dist node_modules/angular-tree-component/",
58-
"prepublishOnly": "cd example/cli && npm install && cd ../../ && npm run build",
47+
"test:debug": "testcafe chrome e2e/*.testcafe.js --inspect-brk",
48+
"test:slow": "testcafe chrome e2e/*.testcafe.js --speed 0.1",
5949
"e2e:tsc": "../node_modules/.bin/tsc --p e2e/tsconfig.json"
6050
},
6151
"files": [
@@ -66,69 +56,60 @@
6656
"Adam Klein <adam@500tech.com>"
6757
],
6858
"dependencies": {
69-
"core-js": "^2.5.4",
7059
"lodash-es": "^4.17.15",
7160
"mobx": "~4.14.1"
7261
},
7362
"devDependencies": {
74-
"@angular-devkit/build-angular": "^0.901.10",
75-
"@angular-devkit/build-ng-packagr": "~0.901.10",
76-
"@angular-devkit/core": "^9.0.0",
77-
"@angular/cli": "^9.0.0",
78-
"@angular/common": "^9.0.0",
79-
"@angular/compiler": "^9.0.0",
80-
"@angular/compiler-cli": "^9.0.0",
81-
"@angular/core": "^9.0.0",
82-
"@angular/forms": "^9.0.0",
83-
"@angular/platform-browser": "^9.0.0",
84-
"@angular/platform-browser-dynamic": "^9.0.0",
85-
"@angular/platform-server": "^9.0.0",
86-
"@angular/router": "^9.0.0",
63+
"@angular-devkit/build-angular": "^0.1000.3",
64+
"@angular-devkit/build-ng-packagr": "~0.1000.3",
65+
"@angular/animations": "^10.0.3",
66+
"@angular/cli": "^10.0.3",
67+
"@angular/common": "^10.0.4",
68+
"@angular/compiler": "^10.0.4",
69+
"@angular/compiler-cli": "^10.0.4",
70+
"@angular/core": "^10.0.4",
71+
"@angular/forms": "^10.0.4",
72+
"@angular/platform-browser": "^10.0.4",
73+
"@angular/platform-browser-dynamic": "^10.0.4",
74+
"@angular/platform-server": "^10.0.4",
75+
"@angular/router": "^10.0.4",
8776
"@types/jasmine": "2.5.38",
8877
"@types/jasminewd2": "~2.0.3",
8978
"@types/node": "^12.11.7",
9079
"@types/rx": "2.5.34",
9180
"@types/webpack": "^1.12.29",
92-
"codelyzer": "^5.2.2",
93-
"concurrently": "3.4.0",
94-
"growl": "~> 1.10.0",
95-
"hoek": "~> 5.0.3",
81+
"codelyzer": "^6.0.0",
9682
"html-dnd": "1.2.0",
9783
"http-server": "0.9.0",
9884
"husky": "^4.2.3",
9985
"lint-staged": "^10.0.7",
100-
"ng-packagr": "^9.0.0",
86+
"ng-packagr": "^10.0.0",
10187
"nightwatch": "0.9.12",
10288
"prettier": "^1.19.1",
103-
"jasmine-core": "~3.4.0",
104-
"jasmine-spec-reporter": "~4.2.1",
105-
"karma": "~4.2.0",
106-
"karma-chrome-launcher": "~3.0.0",
107-
"karma-coverage-istanbul-reporter": "~2.1.0",
108-
"karma-jasmine": "~2.0.1",
109-
"karma-jasmine-html-reporter": "^0.2.2",
89+
"jasmine-core": "~3.5.0",
90+
"jasmine-spec-reporter": "~5.0.0",
91+
"karma": "~5.0.0",
92+
"karma-chrome-launcher": "~3.1.0",
93+
"karma-coverage-istanbul-reporter": "~3.0.2",
94+
"karma-jasmine": "~3.3.0",
95+
"karma-jasmine-html-reporter": "^1.5.0",
11096
"rimraf": "^2.5.1",
111-
"rollup": "^0.41.4",
112-
"rollup-plugin-auto-external": "^2.0.0",
113-
"rollup-plugin-commonjs": "7.0.2",
114-
"rollup-plugin-node-resolve": "2.0.0",
115-
"rollup-plugin-uglify": "1.0.1",
11697
"rxjs": "^6.5.3",
117-
"testcafe": "^1.0.1",
118-
"testcafe-browser-provider-saucelabs": "^1.6.1",
119-
"tsickle": "^0.37.0",
120-
"tslib": "^1.10.0",
121-
"tslint": "^6.1.2",
98+
"testcafe": "^1.8.8",
99+
"tsickle": "^0.38.1",
100+
"tslib": "^2.0.0",
101+
"tslint": "~6.1.0",
122102
"typedoc": "^0.3.12",
123-
"typescript": "~3.7.4",
103+
"typescript": "~3.9.7",
104+
"uuid": "^8.2.0",
124105
"zone.js": "^0.10.2"
125106
},
126107
"repository": "https://github.com/CirclonGroup/angular-tree-component.git",
127108
"bugs": {
128109
"url": "https://github.com/CirclonGroup/angular-tree-component/issues"
129110
},
130111
"engines": {
131-
"node": ">=10.9.0"
112+
"node": ">=10.21.0"
132113
},
133114
"prettier": {
134115
"printWidth": 80,

‎projects/angular-tree-component/package.json

Lines changed: 53 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,71 +2,77 @@
22
"name": "@circlon/angular-tree-component",
33
"author": "Circlon Group <os-group@circlon.de>",
44
"homepage": "https://github.com/CirclonGroup/angular-tree-component",
5+
"description": "A simple yet powerful tree component for Angular",
56
"license": "MIT",
67
"version": "9.0.3",
78
"repository": "https://github.com/CirclonGroup/angular-tree-component.git",
89
"bugs": {
910
"url": "https://github.com/CirclonGroup/angular-tree-component/issues"
1011
},
1112
"readme": "https://github.com/CirclonGroup/angular-tree-component/blob/master/README.md",
13+
"keywords": [
14+
"ng",
15+
"angular",
16+
"ng2",
17+
"angular2",
18+
"tree",
19+
"treeview",
20+
"tree-view",
21+
"angular2-tree",
22+
"angular-tree",
23+
"angular tree",
24+
"angular2 tree",
25+
"ng2-tree",
26+
"ng2tree",
27+
"ng2 tree",
28+
"ngtree",
29+
"ng-tree",
30+
"angular-treeview",
31+
"angular2-treeview",
32+
"angular-tree-component",
33+
"angular tree component",
34+
"angular2-tree-component",
35+
"angular2 tree component"
36+
],
1237
"peerDependencies": {
13-
"core-js": "^2.5.4"
38+
"@angular/common": ">=10.0.0 <11.0.0",
39+
"@angular/core": ">=10.0.0 <11.0.0"
1440
},
1541
"dependencies": {
1642
"lodash-es": "^4.17.15",
17-
"mobx": "~4.14.1"
43+
"mobx": "~4.14.1",
44+
"tslib": "^2.0.0"
1845
},
1946
"devDependencies": {
20-
"@angular-devkit/build-angular": "^0.901.10",
21-
"@angular-devkit/build-ng-packagr": "~0.901.10",
22-
"@angular-devkit/core": "^9.0.0",
23-
"@angular/cli": "^9.0.0",
24-
"@angular/common": "^9.0.0",
25-
"@angular/compiler": "^9.0.0",
26-
"@angular/compiler-cli": "^9.0.0",
27-
"@angular/core": "^9.0.0",
28-
"@angular/forms": "^9.0.0",
29-
"@angular/platform-browser": "^9.0.0",
30-
"@angular/platform-browser-dynamic": "^9.0.0",
31-
"@angular/platform-server": "^9.0.0",
32-
"@angular/router": "^9.0.0",
47+
"@angular-devkit/build-angular": "^0.1000.3",
48+
"@angular-devkit/build-ng-packagr": "~0.1000.3",
49+
"@angular/cli": "^10.0.3",
50+
"@angular/common": "^10.0.4",
51+
"@angular/compiler": "^10.0.4",
52+
"@angular/compiler-cli": "^10.0.4",
53+
"@angular/core": "^10.0.4",
54+
"@angular/forms": "^10.0.4",
55+
"@angular/platform-browser": "^10.0.4",
56+
"@angular/platform-browser-dynamic": "^10.0.4",
57+
"@angular/platform-server": "^10.0.4",
58+
"@angular/router": "^10.0.4",
3359
"@types/jasmine": "2.5.38",
3460
"@types/jasminewd2": "~2.0.3",
3561
"@types/node": "^12.11.7",
36-
"@types/rx": "2.5.34",
3762
"@types/webpack": "^1.12.29",
38-
"codelyzer": "^5.2.2",
39-
"concurrently": "3.4.0",
40-
"growl": "~> 1.10.0",
41-
"hoek": "~> 5.0.3",
42-
"html-dnd": "1.2.0",
43-
"http-server": "0.9.0",
44-
"husky": "^4.2.3",
45-
"lint-staged": "^10.0.7",
46-
"ng-packagr": "^9.0.0",
47-
"nightwatch": "0.9.12",
48-
"prettier": "^1.19.1",
49-
"jasmine-core": "~3.4.0",
50-
"jasmine-spec-reporter": "~4.2.1",
51-
"karma": "~4.2.0",
52-
"karma-chrome-launcher": "~3.0.0",
53-
"karma-coverage-istanbul-reporter": "~2.1.0",
54-
"karma-jasmine": "~2.0.1",
55-
"karma-jasmine-html-reporter": "^0.2.2",
56-
"rimraf": "^2.5.1",
57-
"rollup": "^0.41.4",
58-
"rollup-plugin-auto-external": "^2.0.0",
59-
"rollup-plugin-commonjs": "7.0.2",
60-
"rollup-plugin-node-resolve": "2.0.0",
61-
"rollup-plugin-uglify": "1.0.1",
63+
"codelyzer": "^6.0.0",
64+
"ng-packagr": "^10.0.0",
65+
"jasmine-core": "~3.5.0",
66+
"jasmine-spec-reporter": "~5.0.0",
67+
"karma": "~5.0.0",
68+
"karma-chrome-launcher": "~3.1.0",
69+
"karma-coverage-istanbul-reporter": "~3.0.2",
70+
"karma-jasmine": "~3.3.0",
71+
"karma-jasmine-html-reporter": "^1.5.0",
6272
"rxjs": "^6.5.3",
63-
"testcafe": "^1.0.1",
64-
"testcafe-browser-provider-saucelabs": "^1.6.1",
65-
"tsickle": "^0.37.0",
66-
"tslib": "^1.10.0",
67-
"tslint": "^6.1.2",
68-
"typedoc": "^0.3.12",
69-
"typescript": "~3.7.4",
73+
"tsickle": "^0.38.1",
74+
"tslint": "~6.1.0",
75+
"typescript": "~3.9.7",
7076
"zone.js": "^0.10.2"
7177
}
7278
}

‎projects/angular-tree-component/tsconfig.lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/lib",
55
"target": "es2015",

‎projects/angular-tree-component/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"types": [

‎projects/example-app/browserslist renamed to ‎projects/example-app/.browserslistrc

File renamed without changes.

‎projects/example-app/tsconfig.app.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/app",
55
"module": "es2015",

‎projects/example-app/tsconfig.spec.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../../tsconfig.json",
2+
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
55
"module": "commonjs",

‎tsconfig.base.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": ".",
4+
"module": "es2020",
5+
"moduleResolution": "node",
6+
"target": "es2015",
7+
"outDir": "/dist/out-tsc",
8+
"allowSyntheticDefaultImports": true,
9+
"emitDecoratorMetadata": true,
10+
"experimentalDecorators": true,
11+
"inlineSourceMap": true,
12+
"inlineSources": true,
13+
"declaration": true,
14+
"skipLibCheck": true,
15+
"stripInternal": true,
16+
"lib": [
17+
"es2017",
18+
"dom"
19+
],
20+
"paths": {
21+
"angular-tree-component": [
22+
"dist/angular-tree-component",
23+
"dist/angular-tree-component"
24+
],
25+
"angular-tree-component/*": [
26+
"dist/angular-tree-component/*",
27+
"dist/angular-tree-component/*"
28+
]
29+
}
30+
},
31+
"files": [
32+
"lib/angular-tree-component"
33+
],
34+
"compileOnSave": false,
35+
"buildOnSave": false,
36+
"angularCompilerOptions": {
37+
"skipTemplateCodegen": true,
38+
"enableIvy": false
39+
}
40+
}

‎tsconfig.json

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,23 @@
1+
/*
2+
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
3+
It is not intended to be used to perform a compilation.
4+
5+
To learn more about this file see: https://angular.io/config/solution-tsconfig.
6+
*/
17
{
2-
"compilerOptions": {
3-
"baseUrl": ".",
4-
"module": "es2015",
5-
"moduleResolution": "node",
6-
"target": "es5",
7-
"outDir": "dist/",
8-
"allowSyntheticDefaultImports": true,
9-
"emitDecoratorMetadata": true,
10-
"experimentalDecorators": true,
11-
"inlineSourceMap": true,
12-
"inlineSources": true,
13-
"declaration": true,
14-
"skipLibCheck": true,
15-
"stripInternal": true,
16-
"lib": [
17-
"es2015",
18-
"dom"
19-
],
20-
"paths": {
21-
"angular-tree-component": [
22-
"dist/angular-tree-component",
23-
"dist/angular-tree-component"
24-
],
25-
"angular-tree-component/*": [
26-
"dist/angular-tree-component/*",
27-
"dist/angular-tree-component/*"
28-
]
8+
"files": [],
9+
"references": [
10+
{
11+
"path": "./projects/example-app/tsconfig.app.json"
12+
},
13+
{
14+
"path": "./projects/example-app/tsconfig.spec.json"
15+
},
16+
{
17+
"path": "./projects/angular-tree-component/tsconfig.lib.json"
18+
},
19+
{
20+
"path": "./projects/angular-tree-component/tsconfig.spec.json"
2921
}
30-
},
31-
"files": [
32-
"lib/angular-tree-component"
33-
],
34-
"compileOnSave": false,
35-
"buildOnSave": false,
36-
"angularCompilerOptions": {
37-
"skipTemplateCodegen": true,
38-
"enableIvy": false
39-
}
22+
]
4023
}

‎tslint.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
"check-space"
1010
],
1111
"curly": false,
12+
"deprecation": {
13+
"severity": "warning"
14+
},
1215
"eofline": true,
1316
"forin": true,
1417
"indent": [

0 commit comments

Comments
 (0)