From 9cc76d7aa55a43f28841d067e904645324833a3b Mon Sep 17 00:00:00 2001 From: Martin Reinhardt Date: Tue, 10 Sep 2019 03:42:48 +0200 Subject: [PATCH] fix(Build): Corrected CI build --- package-lock.json | 6 +- package.json | 278 +++++++++++++++++++++++----------------------- tslint.json | 12 +- 3 files changed, 146 insertions(+), 150 deletions(-) diff --git a/package-lock.json b/package-lock.json index ab8704ad..2016dc8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10859,9 +10859,9 @@ "dev": true }, "typescript": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.2.tgz", - "integrity": "sha512-lmQ4L+J6mnu3xweP8+rOrUwzmN+MRAj7TgtJtDaXE5PMyX2kCrklhg3rvOsOIfNeAWMQWO2F1GPc1kMD2vLAfw==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", + "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 7c620137..2468f533 100644 --- a/package.json +++ b/package.json @@ -1,141 +1,141 @@ { - "name": "ngx-vis", - "version": "2.3.2", - "main": "ngx-vis", - "types": "ngx-vis.d.ts", - "description": "Angular x components for using vis.js", - "scripts": { - "flow.compile": "npm run flow.compile:common && npm run flow.compile:system && npm run flow.extract-metadata", - "flow.compile:tsc": "tsc -p tsconfig.publish.json", - "flow.compile:common": "npm run flow.compile:tsc", - "flow.compile:system": "node ./.config/bundle-system.js", - "flow.copy:src": "cpy ngx-vis.ts \"components/*.ts\" ts --parents", - "flow.clean": "rimraf bundles coverage dist demo-build \"components/**/*.+(metadata.json|js|d.ts|js.map)\" dist \"ngx-vis.+(js|d.ts|js.map)\"", - "flow.eslint": "eslint --ignore-path .gitignore --ext js --fix . .config", - "flow.extract-metadata": "ngc -p tsconfig.publish.json", - "flow.tslint": "tslint --project tsconfig.json --exclude **/*.d.ts", - "flow.lint": "npm run flow.eslint && npm run flow.tslint", - "flow.build:prod": "cross-env NODE_ENV=production webpack --config .config/webpack.prod.js --progress --color", - "flow.build:github-pages": "cross-env NODE_ENV=production webpack --config .config/webpack.github.js --progress --color", - "flow.build:dev": "webpack --progress --color", - "flow.serve:dev": "webpack-dev-server --hot --inline --colors", - "flow.serve:prod": "cross-env NODE_ENV=production webpack-dev-server --config .config/webpack.prod.js --hot --inline --colors", - "serve": "npm run flow.serve:dev", - "preclean": "npm i", - "clean": "npm run flow.clean", - "check": "check-audit --ignoreLow", - "build": "npm run flow.compile", - "build:demo": "rm -rf docs/* && npm run flow.build:prod", - "build:docs": "rm -rf docs/* && npm run flow.build:github-pages", - "pretest": "npm run flow.lint", - "test": "karma start --browsers=ChromeHeadless", - "test:watch": "cross-env NODE_ENV=test karma start --auto-watch --no-single-run", - "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", - "changelog:add": "git add CHANGELOG.md && git commit -m 'chore(changelog): Updated CHANGELOG.md'", - "release:pre": "npm run clean && npm run build && npm run test", - "release:post": "npm run changelog && npm run changelog:add", - "release:major": "npm run release:pre && npm version major && npm run release:post && git push origin && git push origin --tags && npm run version-and-push", - "release:minor": "npm run release:pre && npm version minor && npm run release:post && git push origin && git push origin --tags && npm run version-and-push", - "release:patch": "npm run release:pre && npm version patch && npm run release:post && git push origin && git push origin --tags && npm run version-and-push", - "version-and-push": "git push origin && git push origin --tags && npm run publish-and-merge", - "publish-and-merge": "git checkout master && git merge develop && git push && git checkout develop && npm publish", - "prepublish": "npm run build" - }, - "dependencies": { - "vis": "4.21.0", - "@types/vis": "4.21.19" - }, - "peerDependencies": { - "@angular/common": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0", - "@angular/core": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0", - "@angular/compiler": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0" - }, - "devDependencies": { - "@angular/animations": "8.2.5", - "@angular/common": "8.2.5", - "@angular/compiler": "8.2.5", - "@angular/compiler-cli": "^8.2.5", - "@angular/core": "8.2.5", - "@angular/forms": "8.2.5", - "@angular/platform-browser": "8.2.5", - "@angular/platform-browser-dynamic": "8.2.5", - "@angular/platform-server": "8.2.5", - "@angular/router": "8.2.5", - "@types/jasmine": "^3.3.1", - "@types/node": "12.7.4", - "@types/webpack": "^4.4.25", - "ajv": "6.10.2", - "angular2-template-loader": "^0.6.2", - "awesome-typescript-loader": "^5.2.1", - "codecov": "^3.1.0", - "conventional-changelog-cli": "^2.0.12", - "copy-webpack-plugin": "^5.0.0", - "cpy-cli": "^2.0.0", - "cross-env": "^5.1.1", - "css-loader": "^3.0.0", - "es6-promise": "^4.1.0", - "es6-shim": "^0.35.3", - "eslint": "^6.1.0", - "file-loader": "^4.0.0", - "gitignore-to-glob": "^0.3.0", - "html-loader": "^0.5.1", - "html-webpack-plugin": "^3.2.0", - "istanbul-instrumenter-loader": "3.0.1", - "jasmine-core": "^3.3.0", - "karma": "^4.0.1", - "karma-chrome-launcher": "^3.0.0", - "karma-coverage": "^2.0.1", - "karma-jasmine": "^2.0.0", - "karma-mocha": "^1.3.0", - "karma-mocha-reporter": "^2.2.2", - "karma-sourcemap-loader": "^0.3.7", - "karma-webpack": "^4.0.2", - "mini-css-extract-plugin": "^0.8.0", - "npm-audit-resolver": "^1.4.0", - "null-loader": "^3.0.0", - "pre-commit": "^1.2.2", - "puppeteer": "1.19.0", - "raw-loader": "^3.0.0", - "reflect-metadata": "^0.1.10", - "require-dir": "^1.2.0", - "rimraf": "^3.0.0", - "rxjs": "^6.0.0", - "rxjs-compat": "^6.0.0", - "source-map-loader": "^0.2.0", - "style-loader": "^1.0.0", - "systemjs-builder": "^0.16.13", - "to-string-loader": "^1.1.5", - "ts-helpers": "^1.1.2", - "tslint": "^5.8.0", - "tslint-loader": "^3.4.3", - "typescript": "3.6.2", - "webpack": "^4.32.2", - "webpack-cli": "^3.2.3", - "webpack-dev-server": "^3.2.1", - "webpack-merge": "^4.1.0", - "zone.js": "0.10.2" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/hypery2k/ngx-vis.git" - }, - "keywords": [ - "angular2", - "ng2", - "vis", - "angular2-vis", - "ngx-vis", - "ngx-vis" - ], - "author": "Martin Reinhardt ", - "license": "MIT", - "contributors": [ - "Paul Hindenberg ", - "Severin Friede ", - "Martin Reinhardt " - ], - "bugs": { - "url": "https://github.com/hypery2k/ngx-vis/issues" - }, - "homepage": "https://github.com/hypery2k/ngx-vis#readme" + "name": "ngx-vis", + "version": "2.3.2", + "main": "ngx-vis", + "types": "ngx-vis.d.ts", + "description": "Angular x components for using vis.js", + "scripts": { + "flow.compile": "npm run flow.compile:common && npm run flow.compile:system && npm run flow.extract-metadata", + "flow.compile:tsc": "tsc -p tsconfig.publish.json", + "flow.compile:common": "npm run flow.compile:tsc", + "flow.compile:system": "node ./.config/bundle-system.js", + "flow.copy:src": "cpy ngx-vis.ts \"components/*.ts\" ts --parents", + "flow.clean": "rimraf bundles coverage dist demo-build \"components/**/*.+(metadata.json|js|d.ts|js.map)\" dist \"ngx-vis.+(js|d.ts|js.map)\"", + "flow.eslint": "eslint --ignore-path .gitignore --ext js --fix . .config", + "flow.extract-metadata": "ngc -p tsconfig.publish.json", + "flow.tslint": "tslint --project tsconfig.json --exclude **/*.d.ts", + "flow.lint": "npm run flow.eslint && npm run flow.tslint", + "flow.build:prod": "cross-env NODE_ENV=production webpack --config .config/webpack.prod.js --progress --color", + "flow.build:github-pages": "cross-env NODE_ENV=production webpack --config .config/webpack.github.js --progress --color", + "flow.build:dev": "webpack --progress --color", + "flow.serve:dev": "webpack-dev-server --hot --inline --colors", + "flow.serve:prod": "cross-env NODE_ENV=production webpack-dev-server --config .config/webpack.prod.js --hot --inline --colors", + "serve": "npm run flow.serve:dev", + "preclean": "npm i", + "clean": "npm run flow.clean", + "check": "check-audit --ignoreLow", + "build": "npm run flow.compile", + "build:demo": "rm -rf docs/* && npm run flow.build:prod", + "build:docs": "rm -rf docs/* && npm run flow.build:github-pages", + "pretest": "npm run flow.lint", + "test": "karma start --browsers=ChromeHeadless", + "test:watch": "cross-env NODE_ENV=test karma start --auto-watch --no-single-run", + "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0", + "changelog:add": "git add CHANGELOG.md && git commit -m 'chore(changelog): Updated CHANGELOG.md'", + "release:pre": "npm run clean && npm run build && npm run test", + "release:post": "npm run changelog && npm run changelog:add", + "release:major": "npm run release:pre && npm version major && npm run release:post && git push origin && git push origin --tags && npm run version-and-push", + "release:minor": "npm run release:pre && npm version minor && npm run release:post && git push origin && git push origin --tags && npm run version-and-push", + "release:patch": "npm run release:pre && npm version patch && npm run release:post && git push origin && git push origin --tags && npm run version-and-push", + "version-and-push": "git push origin && git push origin --tags && npm run publish-and-merge", + "publish-and-merge": "git checkout master && git merge develop && git push && git checkout develop && npm publish", + "prepublish": "npm run build" + }, + "dependencies": { + "vis": "4.21.0", + "@types/vis": "4.21.19" + }, + "peerDependencies": { + "@angular/common": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0", + "@angular/core": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0", + "@angular/compiler": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0" + }, + "devDependencies": { + "@angular/animations": "8.2.5", + "@angular/common": "8.2.5", + "@angular/compiler": "8.2.5", + "@angular/compiler-cli": "^8.2.5", + "@angular/core": "8.2.5", + "@angular/forms": "8.2.5", + "@angular/platform-browser": "8.2.5", + "@angular/platform-browser-dynamic": "8.2.5", + "@angular/platform-server": "8.2.5", + "@angular/router": "8.2.5", + "@types/jasmine": "^3.3.1", + "@types/node": "12.7.4", + "@types/webpack": "^4.4.25", + "ajv": "6.10.2", + "angular2-template-loader": "^0.6.2", + "awesome-typescript-loader": "^5.2.1", + "codecov": "^3.1.0", + "conventional-changelog-cli": "^2.0.12", + "copy-webpack-plugin": "^5.0.0", + "cpy-cli": "^2.0.0", + "cross-env": "^5.1.1", + "css-loader": "^3.0.0", + "es6-promise": "^4.1.0", + "es6-shim": "^0.35.3", + "eslint": "^6.1.0", + "file-loader": "^4.0.0", + "gitignore-to-glob": "^0.3.0", + "html-loader": "^0.5.1", + "html-webpack-plugin": "^3.2.0", + "istanbul-instrumenter-loader": "3.0.1", + "jasmine-core": "^3.3.0", + "karma": "^4.0.1", + "karma-chrome-launcher": "^3.0.0", + "karma-coverage": "^2.0.1", + "karma-jasmine": "^2.0.0", + "karma-mocha": "^1.3.0", + "karma-mocha-reporter": "^2.2.2", + "karma-sourcemap-loader": "^0.3.7", + "karma-webpack": "^4.0.2", + "mini-css-extract-plugin": "^0.8.0", + "npm-audit-resolver": "^1.4.0", + "null-loader": "^3.0.0", + "pre-commit": "^1.2.2", + "puppeteer": "1.19.0", + "raw-loader": "^3.0.0", + "reflect-metadata": "^0.1.10", + "require-dir": "^1.2.0", + "rimraf": "^3.0.0", + "rxjs": "^6.0.0", + "rxjs-compat": "^6.0.0", + "source-map-loader": "^0.2.0", + "style-loader": "^1.0.0", + "systemjs-builder": "^0.16.13", + "to-string-loader": "^1.1.5", + "ts-helpers": "^1.1.2", + "tslint": "^5.8.0", + "tslint-loader": "^3.4.3", + "typescript": "^3.5.3", + "webpack": "^4.32.2", + "webpack-cli": "^3.2.3", + "webpack-dev-server": "^3.2.1", + "webpack-merge": "^4.1.0", + "zone.js": "0.10.2" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/hypery2k/ngx-vis.git" + }, + "keywords": [ + "angular2", + "ng2", + "vis", + "angular2-vis", + "ngx-vis", + "ngx-vis" + ], + "author": "Martin Reinhardt ", + "license": "MIT", + "contributors": [ + "Paul Hindenberg ", + "Severin Friede ", + "Martin Reinhardt " + ], + "bugs": { + "url": "https://github.com/hypery2k/ngx-vis/issues" + }, + "homepage": "https://github.com/hypery2k/ngx-vis#readme" } diff --git a/tslint.json b/tslint.json index 7f7a1fb7..d80e6e86 100644 --- a/tslint.json +++ b/tslint.json @@ -1,19 +1,15 @@ { "extends": "tslint:latest", "rules": { - "max-line-length": [ - true, - 180 - ], + "max-line-length": [true, 180], "quotemark": false, "only-arrow-functions": false, "no-string-literal": false, "linebreak-style": false, - "interface-name": [ - false - ], + "interface-name": [false], "no-reference": false, "max-classes-per-file": false, - "no-empty-interface": false + "no-empty-interface": false, + "trailing-comma": false } }