Skip to content

Commit

Permalink
feat: update to angular 10 (#844)
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasengelhardt authored Jul 22, 2020
1 parent effe933 commit 5338eb4
Show file tree
Hide file tree
Showing 11 changed files with 3,220 additions and 3,700 deletions.
6,627 changes: 3,067 additions & 3,560 deletions package-lock.json

Large diffs are not rendered by default.

85 changes: 33 additions & 52 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,20 @@
"scripts": {
"lint:lib": "ng lint angular-tree-component",
"build:lib": "npm run lint:lib && npm run clean:dist && ng build angular-tree-component",
"build": "npm run build:lib",
"clean:dist": "rimraf dist",
"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/",
"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\\",
"doc": "typedoc --module commonjs --out doc lib/defs/api.ts",
"clean": "npm run clean:typescript && rimraf node_modules && npm cache clean",
"clean:typescript": "rimraf dist",
"clean:all": "npm run clean:dist && rimraf node_modules && npm cache clean",
"lint": "tslint lib/**/*.ts",
"rollup": "./node_modules/.bin/rollup -c rollup.config.js dist/angular-tree-component.js -o dist/angular-tree-component.umd.js",
"build": "npm run lint && npm run clean:typescript && ng build angular-tree-component",
"build:win": "npm run lint && npm run clean:typescript && ng build angular-tree-component",
"prepublish:lib:win": "npm run build:lib && npm run copy:files:win",
"start:example-app": "ng serve",
"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",
"example:cli:win": ".\\node_modules\\.bin\\ngc && cd example\\cli && npm install && npm install ..\\..\\ && .\\node_modules\\.bin\\ng serve",
"selupdate": "webdriver-manager update",
"selenium": "webdriver-manager update && webdriver-manager start",
"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/",
"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",
"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",
"test:dev": "testcafe chrome:headless e2e/*.testcafe.js",
"test:debug": "./node_modules/.bin/testcafe chrome e2e/*.testcafe.js --inspect-brk",
"test:slow": "./node_modules/.bin/testcafe chrome e2e/*.testcafe.js --speed 0.1",
"test:setup": "npm run build && cd example/cli && npm install && cp -rf ../../dist node_modules/angular-tree-component/",
"prepublishOnly": "cd example/cli && npm install && cd ../../ && npm run build",
"test:debug": "testcafe chrome e2e/*.testcafe.js --inspect-brk",
"test:slow": "testcafe chrome e2e/*.testcafe.js --speed 0.1",
"e2e:tsc": "../node_modules/.bin/tsc --p e2e/tsconfig.json"
},
"files": [
Expand All @@ -66,69 +56,60 @@
"Adam Klein <adam@500tech.com>"
],
"dependencies": {
"core-js": "^2.5.4",
"lodash-es": "^4.17.15",
"mobx": "~4.14.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.901.10",
"@angular-devkit/build-ng-packagr": "~0.901.10",
"@angular-devkit/core": "^9.0.0",
"@angular/cli": "^9.0.0",
"@angular/common": "^9.0.0",
"@angular/compiler": "^9.0.0",
"@angular/compiler-cli": "^9.0.0",
"@angular/core": "^9.0.0",
"@angular/forms": "^9.0.0",
"@angular/platform-browser": "^9.0.0",
"@angular/platform-browser-dynamic": "^9.0.0",
"@angular/platform-server": "^9.0.0",
"@angular/router": "^9.0.0",
"@angular-devkit/build-angular": "^0.1000.3",
"@angular-devkit/build-ng-packagr": "~0.1000.3",
"@angular/animations": "^10.0.3",
"@angular/cli": "^10.0.3",
"@angular/common": "^10.0.4",
"@angular/compiler": "^10.0.4",
"@angular/compiler-cli": "^10.0.4",
"@angular/core": "^10.0.4",
"@angular/forms": "^10.0.4",
"@angular/platform-browser": "^10.0.4",
"@angular/platform-browser-dynamic": "^10.0.4",
"@angular/platform-server": "^10.0.4",
"@angular/router": "^10.0.4",
"@types/jasmine": "2.5.38",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.7",
"@types/rx": "2.5.34",
"@types/webpack": "^1.12.29",
"codelyzer": "^5.2.2",
"concurrently": "3.4.0",
"growl": "~> 1.10.0",
"hoek": "~> 5.0.3",
"codelyzer": "^6.0.0",
"html-dnd": "1.2.0",
"http-server": "0.9.0",
"husky": "^4.2.3",
"lint-staged": "^10.0.7",
"ng-packagr": "^9.0.0",
"ng-packagr": "^10.0.0",
"nightwatch": "0.9.12",
"prettier": "^1.19.1",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.2.0",
"karma-chrome-launcher": "~3.0.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^0.2.2",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~3.3.0",
"karma-jasmine-html-reporter": "^1.5.0",
"rimraf": "^2.5.1",
"rollup": "^0.41.4",
"rollup-plugin-auto-external": "^2.0.0",
"rollup-plugin-commonjs": "7.0.2",
"rollup-plugin-node-resolve": "2.0.0",
"rollup-plugin-uglify": "1.0.1",
"rxjs": "^6.5.3",
"testcafe": "^1.0.1",
"testcafe-browser-provider-saucelabs": "^1.6.1",
"tsickle": "^0.37.0",
"tslib": "^1.10.0",
"tslint": "^6.1.2",
"testcafe": "^1.8.8",
"tsickle": "^0.38.1",
"tslib": "^2.0.0",
"tslint": "~6.1.0",
"typedoc": "^0.3.12",
"typescript": "~3.7.4",
"typescript": "~3.9.7",
"uuid": "^8.2.0",
"zone.js": "^0.10.2"
},
"repository": "https://github.com/CirclonGroup/angular-tree-component.git",
"bugs": {
"url": "https://github.com/CirclonGroup/angular-tree-component/issues"
},
"engines": {
"node": ">=10.9.0"
"node": ">=10.21.0"
},
"prettier": {
"printWidth": 80,
Expand Down
100 changes: 53 additions & 47 deletions projects/angular-tree-component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,71 +2,77 @@
"name": "@circlon/angular-tree-component",
"author": "Circlon Group <os-group@circlon.de>",
"homepage": "https://github.com/CirclonGroup/angular-tree-component",
"description": "A simple yet powerful tree component for Angular",
"license": "MIT",
"version": "9.0.3",
"repository": "https://github.com/CirclonGroup/angular-tree-component.git",
"bugs": {
"url": "https://github.com/CirclonGroup/angular-tree-component/issues"
},
"readme": "https://github.com/CirclonGroup/angular-tree-component/blob/master/README.md",
"keywords": [
"ng",
"angular",
"ng2",
"angular2",
"tree",
"treeview",
"tree-view",
"angular2-tree",
"angular-tree",
"angular tree",
"angular2 tree",
"ng2-tree",
"ng2tree",
"ng2 tree",
"ngtree",
"ng-tree",
"angular-treeview",
"angular2-treeview",
"angular-tree-component",
"angular tree component",
"angular2-tree-component",
"angular2 tree component"
],
"peerDependencies": {
"core-js": "^2.5.4"
"@angular/common": ">=10.0.0 <11.0.0",
"@angular/core": ">=10.0.0 <11.0.0"
},
"dependencies": {
"lodash-es": "^4.17.15",
"mobx": "~4.14.1"
"mobx": "~4.14.1",
"tslib": "^2.0.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.901.10",
"@angular-devkit/build-ng-packagr": "~0.901.10",
"@angular-devkit/core": "^9.0.0",
"@angular/cli": "^9.0.0",
"@angular/common": "^9.0.0",
"@angular/compiler": "^9.0.0",
"@angular/compiler-cli": "^9.0.0",
"@angular/core": "^9.0.0",
"@angular/forms": "^9.0.0",
"@angular/platform-browser": "^9.0.0",
"@angular/platform-browser-dynamic": "^9.0.0",
"@angular/platform-server": "^9.0.0",
"@angular/router": "^9.0.0",
"@angular-devkit/build-angular": "^0.1000.3",
"@angular-devkit/build-ng-packagr": "~0.1000.3",
"@angular/cli": "^10.0.3",
"@angular/common": "^10.0.4",
"@angular/compiler": "^10.0.4",
"@angular/compiler-cli": "^10.0.4",
"@angular/core": "^10.0.4",
"@angular/forms": "^10.0.4",
"@angular/platform-browser": "^10.0.4",
"@angular/platform-browser-dynamic": "^10.0.4",
"@angular/platform-server": "^10.0.4",
"@angular/router": "^10.0.4",
"@types/jasmine": "2.5.38",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.7",
"@types/rx": "2.5.34",
"@types/webpack": "^1.12.29",
"codelyzer": "^5.2.2",
"concurrently": "3.4.0",
"growl": "~> 1.10.0",
"hoek": "~> 5.0.3",
"html-dnd": "1.2.0",
"http-server": "0.9.0",
"husky": "^4.2.3",
"lint-staged": "^10.0.7",
"ng-packagr": "^9.0.0",
"nightwatch": "0.9.12",
"prettier": "^1.19.1",
"jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1",
"karma": "~4.2.0",
"karma-chrome-launcher": "~3.0.0",
"karma-coverage-istanbul-reporter": "~2.1.0",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "^0.2.2",
"rimraf": "^2.5.1",
"rollup": "^0.41.4",
"rollup-plugin-auto-external": "^2.0.0",
"rollup-plugin-commonjs": "7.0.2",
"rollup-plugin-node-resolve": "2.0.0",
"rollup-plugin-uglify": "1.0.1",
"codelyzer": "^6.0.0",
"ng-packagr": "^10.0.0",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~3.3.0",
"karma-jasmine-html-reporter": "^1.5.0",
"rxjs": "^6.5.3",
"testcafe": "^1.0.1",
"testcafe-browser-provider-saucelabs": "^1.6.1",
"tsickle": "^0.37.0",
"tslib": "^1.10.0",
"tslint": "^6.1.2",
"typedoc": "^0.3.12",
"typescript": "~3.7.4",
"tsickle": "^0.38.1",
"tslint": "~6.1.0",
"typescript": "~3.9.7",
"zone.js": "^0.10.2"
}
}
2 changes: 1 addition & 1 deletion projects/angular-tree-component/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/angular-tree-component/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"types": [
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion projects/example-app/tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
"module": "es2015",
Expand Down
2 changes: 1 addition & 1 deletion projects/example-app/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "../../out-tsc/spec",
"module": "commonjs",
Expand Down
40 changes: 40 additions & 0 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"compilerOptions": {
"baseUrl": ".",
"module": "es2020",
"moduleResolution": "node",
"target": "es2015",
"outDir": "/dist/out-tsc",
"allowSyntheticDefaultImports": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"inlineSourceMap": true,
"inlineSources": true,
"declaration": true,
"skipLibCheck": true,
"stripInternal": true,
"lib": [
"es2017",
"dom"
],
"paths": {
"angular-tree-component": [
"dist/angular-tree-component",
"dist/angular-tree-component"
],
"angular-tree-component/*": [
"dist/angular-tree-component/*",
"dist/angular-tree-component/*"
]
}
},
"files": [
"lib/angular-tree-component"
],
"compileOnSave": false,
"buildOnSave": false,
"angularCompilerOptions": {
"skipTemplateCodegen": true,
"enableIvy": false
}
}
57 changes: 20 additions & 37 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,40 +1,23 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"compilerOptions": {
"baseUrl": ".",
"module": "es2015",
"moduleResolution": "node",
"target": "es5",
"outDir": "dist/",
"allowSyntheticDefaultImports": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"inlineSourceMap": true,
"inlineSources": true,
"declaration": true,
"skipLibCheck": true,
"stripInternal": true,
"lib": [
"es2015",
"dom"
],
"paths": {
"angular-tree-component": [
"dist/angular-tree-component",
"dist/angular-tree-component"
],
"angular-tree-component/*": [
"dist/angular-tree-component/*",
"dist/angular-tree-component/*"
]
"files": [],
"references": [
{
"path": "./projects/example-app/tsconfig.app.json"
},
{
"path": "./projects/example-app/tsconfig.spec.json"
},
{
"path": "./projects/angular-tree-component/tsconfig.lib.json"
},
{
"path": "./projects/angular-tree-component/tsconfig.spec.json"
}
},
"files": [
"lib/angular-tree-component"
],
"compileOnSave": false,
"buildOnSave": false,
"angularCompilerOptions": {
"skipTemplateCodegen": true,
"enableIvy": false
}
]
}
3 changes: 3 additions & 0 deletions tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"check-space"
],
"curly": false,
"deprecation": {
"severity": "warning"
},
"eofline": true,
"forin": true,
"indent": [
Expand Down

0 comments on commit 5338eb4

Please sign in to comment.