diff --git a/.vscode/settings.json b/.vscode/settings.json index 4087d41..b067965 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,7 +2,7 @@ "editor.formatOnSave": true, "[typescript]": { "editor.codeActionsOnSave": { - "source.fixAll.tslint": true + "source.fixAll.tslint": "explicit" } }, "git.rebaseWhenSync": true diff --git a/LICENSE.md b/LICENSE.md index 0e57034..e6d89a0 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,7 +2,7 @@ MIT License -Copyright (c) 2018 Gabriel Sperrer +Copyright (c) 2024 Gabriel Sperrer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/angular.json b/angular.json index 39ce57b..39ec6c2 100644 --- a/angular.json +++ b/angular.json @@ -1,29 +1,24 @@ { "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "schematics": { - "@schematics/angular:component": { - "style": "scss" - } - }, "version": 1, - "newProjectRoot": "apps", + "newProjectRoot": "projects", "projects": { "angular-google-charts": { - "root": "libs/angular-google-charts", - "sourceRoot": "libs/angular-google-charts/src", + "root": "projects/angular-google-charts", + "sourceRoot": "projects/angular-google-charts/src", "projectType": "library", "prefix": "lib", "architect": { "build": { "builder": "@angular-devkit/build-angular:ng-packagr", "options": { - "tsConfig": "libs/angular-google-charts/tsconfig.lib.json", - "project": "libs/angular-google-charts/ng-package.json" + "tsConfig": "projects/angular-google-charts/tsconfig.lib.json", + "project": "projects/angular-google-charts/ng-package.json" }, "configurations": { "production": { - "project": "libs/angular-google-charts/ng-package.prod.json", - "tsConfig": "libs/angular-google-charts/tsconfig.lib.prod.json" + "project": "projects/angular-google-charts/ng-package.prod.json", + "tsConfig": "projects/angular-google-charts/tsconfig.lib.prod.json" } } }, @@ -31,7 +26,7 @@ "builder": "@angular-builders/jest:run", "options": { "configPath": "jest.config.js", - "projects": ["libs/angular-google-charts"], + "projects": ["projects/angular-google-charts"], "coverageDirectory": "../../coverage" } } @@ -40,8 +35,8 @@ "playground": { "projectType": "application", "schematics": {}, - "root": "apps/playground", - "sourceRoot": "apps/playground/src", + "root": "projects/playground", + "sourceRoot": "projects/playground/src", "prefix": "app", "architect": { "build": { @@ -49,20 +44,20 @@ "options": { "aot": true, "outputPath": "dist/playground", - "index": "apps/playground/src/index.html", - "main": "apps/playground/src/main.ts", - "polyfills": "apps/playground/src/polyfills.ts", - "tsConfig": "apps/playground/tsconfig.app.json", - "assets": ["apps/playground/src/favicon.ico", "apps/playground/src/assets"], - "styles": ["apps/playground/src/styles.scss"], + "index": "projects/playground/src/index.html", + "main": "projects/playground/src/main.ts", + "polyfills": "projects/playground/src/polyfills.ts", + "tsConfig": "projects/playground/tsconfig.app.json", + "assets": ["projects/playground/src/favicon.ico", "projects/playground/src/assets"], + "styles": ["projects/playground/src/styles.scss"], "scripts": [] }, "configurations": { "production": { "fileReplacements": [ { - "replace": "apps/playground/src/environments/environment.ts", - "with": "apps/playground/src/environments/environment.prod.ts" + "replace": "projects/playground/src/environments/environment.ts", + "with": "projects/playground/src/environments/environment.prod.ts" } ], "optimization": true, @@ -99,6 +94,90 @@ } } } + }, + "playground-test": { + "projectType": "application", + "schematics": {}, + "root": "projects/playground-test", + "sourceRoot": "projects/playground-test/src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist/playground-test", + "index": "projects/playground-test/src/index.html", + "main": "projects/playground-test/src/main.ts", + "polyfills": "projects/playground-test/src/polyfills.ts", + "tsConfig": "projects/playground-test/tsconfig.app.json", + "assets": ["projects/playground-test/src/favicon.ico", "projects/playground-test/src/assets"], + "styles": ["projects/playground-test/src/styles.css"], + "scripts": [] + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "500kb", + "maximumError": "1mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "2kb", + "maximumError": "4kb" + } + ], + "fileReplacements": [ + { + "replace": "projects/playground-test/src/environments/environment.ts", + "with": "projects/playground-test/src/environments/environment.prod.ts" + } + ], + "outputHashing": "all" + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "browserTarget": "playground-test:build:production" + }, + "development": { + "browserTarget": "playground-test:build:development" + } + }, + "defaultConfiguration": "development" + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "playground-test:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "projects/playground-test/src/test.ts", + "polyfills": "projects/playground-test/src/polyfills.ts", + "tsConfig": "projects/playground-test/tsconfig.spec.json", + "karmaConfig": "projects/playground-test/karma.conf.js", + "assets": ["projects/playground-test/src/favicon.ico", "projects/playground-test/src/assets"], + "styles": ["projects/playground-test/src/styles.css"], + "scripts": [] + } + } + } } }, "cli": { diff --git a/package-lock.json b/package-lock.json index f75bd3f..8e7df19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,7 @@ "name": "angular-google-charts", "version": "0.0.0", "workspaces": [ - "apps/*", - "libs/*" + "projects/*" ], "devDependencies": { "@angular/cli": "^12.0.4", @@ -26,6 +25,7 @@ } }, "apps/playground": { + "extraneous": true, "dependencies": { "@angular/common": "^12.0.4", "@angular/compiler": "^12.0.4", @@ -53,6 +53,7 @@ }, "libs/angular-google-charts": { "version": "2.2.3", + "extraneous": true, "license": "MIT", "dependencies": { "@types/google.visualization": "0.0.68", @@ -83,49 +84,6 @@ "@angular/core": ">=6.0.0 <=15.x.x" } }, - "libs/angular-google-charts/node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", - "dev": true, - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -4334,11 +4292,6 @@ "@types/node": "*" } }, - "node_modules/@types/google.visualization": { - "version": "0.0.68", - "resolved": "https://registry.npmjs.org/@types/google.visualization/-/google.visualization-0.0.68.tgz", - "integrity": "sha512-LkLniL1TYykhz+ZdRof3Bi8cp1OhqoK11Tj1RM2bPtGVBNexQ0eRnOrOWcWTdi80Sz9DzJ4JIG2rTlSJBVV58w==" - }, "node_modules/@types/graceful-fs": { "version": "4.1.6", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", @@ -4840,7 +4793,7 @@ } }, "node_modules/angular-google-charts": { - "resolved": "libs/angular-google-charts", + "resolved": "projects/angular-google-charts", "link": true }, "node_modules/ansi-colors": { @@ -16481,7 +16434,7 @@ } }, "node_modules/playground": { - "resolved": "apps/playground", + "resolved": "projects/playground", "link": true }, "node_modules/please-upgrade-node": { @@ -23460,6 +23413,112 @@ "dependencies": { "tslib": "^2.3.0" } + }, + "projects/angular-google-charts": { + "version": "2.2.3", + "license": "MIT", + "dependencies": { + "@types/google.visualization": "0.0.68", + "tslib": "^2.2.0" + }, + "devDependencies": { + "@angular-builders/jest": "^12.1.0", + "@angular-devkit/build-angular": "^12.0.4", + "@angular/cli": "^12.0.4", + "@angular/compiler-cli": "^12.0.4", + "@types/jest": "^26.0.22", + "@types/node": "^12.20.7", + "codelyzer": "^6.0.0", + "jest": "^27.0.0", + "jest-junit": "^12.2.0", + "jest-preset-angular": "^9.0.3", + "ng-packagr": "^12.0.5", + "standard-version": "^9.2.0", + "ts-jest": "^27.0.0", + "ts-node": "^10.0.0", + "tslint": "^6.1.3", + "tslint-angular": "^3.0.3", + "tslint-config-prettier": "^1.18.0", + "typescript": "~4.2.4" + }, + "peerDependencies": { + "@angular/common": ">=6.0.0 <=15.x.x", + "@angular/core": ">=6.0.0 <=15.x.x" + } + }, + "projects/angular-google-charts/node_modules/@types/google.visualization": { + "version": "0.0.74", + "resolved": "https://registry.npmjs.org/@types/google.visualization/-/google.visualization-0.0.74.tgz", + "integrity": "sha512-vcBDi9AF7bPGf7v+WvTUUyuF7KT/kdnOg0qyI8UsQtEuW8dYQcQTG3atejfy8Vwb9bzpa42IE80d9571QXy8jg==" + }, + "projects/angular-google-charts/node_modules/ts-node": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "projects/playground": { + "dependencies": { + "@angular/common": "^12.0.4", + "@angular/compiler": "^12.0.4", + "@angular/core": "^12.0.4", + "@angular/platform-browser": "^12.0.4", + "@angular/platform-browser-dynamic": "^12.0.4", + "@angular/router": "^12.0.4", + "core-js": "^3.10.1", + "rxjs": "^6.6.7", + "tslib": "^2.2.0", + "zone.js": "^0.11.4" + }, + "devDependencies": { + "@angular-devkit/build-angular": "^12.0.4", + "@angular/cli": "^12.0.4", + "@angular/compiler-cli": "^12.0.4", + "@types/node": "^12.20.7", + "codelyzer": "^6.0.0", + "ts-node": "^8.10.2", + "tslint": "^6.1.3", + "tslint-angular": "^3.0.3", + "tslint-config-prettier": "^1.18.0", + "typescript": "~4.2.4" + } } }, "dependencies": { @@ -26244,7 +26303,8 @@ "version": "12.2.18", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-12.2.18.tgz", "integrity": "sha512-6h/QSG6oZDs2BGfrozdOKqtM5daoCu05q+0gyb3owHz1u9FtMeXXKQ3sQfyFC/GNT3dTMlH6YFxsJPvMPwuy9A==", - "dev": true + "dev": true, + "requires": {} }, "@nodelib/fs.scandir": { "version": "2.1.5", @@ -26561,11 +26621,6 @@ "@types/node": "*" } }, - "@types/google.visualization": { - "version": "0.0.68", - "resolved": "https://registry.npmjs.org/@types/google.visualization/-/google.visualization-0.0.68.tgz", - "integrity": "sha512-LkLniL1TYykhz+ZdRof3Bi8cp1OhqoK11Tj1RM2bPtGVBNexQ0eRnOrOWcWTdi80Sz9DzJ4JIG2rTlSJBVV58w==" - }, "@types/graceful-fs": { "version": "4.1.6", "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", @@ -26926,7 +26981,8 @@ "version": "1.8.0", "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", - "dev": true + "dev": true, + "requires": {} }, "acorn-walk": { "version": "8.2.0", @@ -26996,7 +27052,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true + "dev": true, + "requires": {} }, "ajv-formats": { "version": "2.1.0", @@ -27011,10 +27068,11 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true + "dev": true, + "requires": {} }, "angular-google-charts": { - "version": "file:libs/angular-google-charts", + "version": "file:projects/angular-google-charts", "requires": { "@angular-builders/jest": "^12.1.0", "@angular-devkit/build-angular": "^12.0.4", @@ -27038,10 +27096,14 @@ "typescript": "~4.2.4" }, "dependencies": { + "@types/google.visualization": { + "version": "https://registry.npmjs.org/@types/google.visualization/-/google.visualization-0.0.74.tgz", + "integrity": "sha512-vcBDi9AF7bPGf7v+WvTUUyuF7KT/kdnOg0qyI8UsQtEuW8dYQcQTG3atejfy8Vwb9bzpa42IE80d9571QXy8jg==" + }, "ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "requires": { "@cspotcode/source-map-support": "^0.8.0", @@ -27963,7 +28025,8 @@ "version": "5.2.2", "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz", "integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==", - "dev": true + "dev": true, + "requires": {} }, "cjs-module-lexer": { "version": "1.2.2", @@ -28148,13 +28211,15 @@ "version": "9.0.0", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.0.tgz", "integrity": "sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==", - "dev": true + "dev": true, + "requires": {} }, "@angular/core": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.0.tgz", "integrity": "sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==", - "dev": true + "dev": true, + "requires": {} }, "source-map": { "version": "0.5.7", @@ -28966,7 +29031,8 @@ "version": "6.3.1", "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz", "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==", - "dev": true + "dev": true, + "requires": {} }, "css-has-pseudo": { "version": "0.10.0", @@ -29249,7 +29315,8 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", - "dev": true + "dev": true, + "requires": {} }, "csso": { "version": "4.2.0", @@ -31615,7 +31682,8 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true + "dev": true, + "requires": {} }, "ieee754": { "version": "1.2.1", @@ -33196,7 +33264,8 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", - "dev": true + "dev": true, + "requires": {} }, "jest-preset-angular": { "version": "9.0.7", @@ -35883,7 +35952,7 @@ } }, "playground": { - "version": "file:apps/playground", + "version": "file:projects/playground", "requires": { "@angular-devkit/build-angular": "^12.0.4", "@angular/cli": "^12.0.4", @@ -36383,25 +36452,29 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-duplicates": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-empty": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", - "dev": true + "dev": true, + "requires": {} }, "postcss-discard-overridden": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-double-position-gradients": { "version": "1.0.0", @@ -36859,7 +36932,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", - "dev": true + "dev": true, + "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", @@ -36927,7 +37001,8 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", - "dev": true + "dev": true, + "requires": {} }, "postcss-normalize-display-values": { "version": "5.1.0", @@ -39256,7 +39331,8 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.2.1.tgz", "integrity": "sha512-1k9ZosJCRFaRbY6hH49JFlRB0fVSbmnyq1iTPjNxUmGVjBNEmwrrHPenhlp+Lgo51BojHSf6pl2FcqYaN3PfVg==", - "dev": true + "dev": true, + "requires": {} }, "stylehacks": { "version": "5.1.1", @@ -39773,7 +39849,8 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/tslint-angular/-/tslint-angular-3.0.3.tgz", "integrity": "sha512-5xD1gLE89lBExfSbMslDw/ZfOZM0t0CJsoJa4svsgF7tlwVS3IpXjzNcNRN0RZqDBj+cdTlbeel6GpZ3PqpPiw==", - "dev": true + "dev": true, + "requires": {} }, "tslint-config-prettier": { "version": "1.18.0", @@ -41094,7 +41171,8 @@ "version": "7.5.9", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", - "dev": true + "dev": true, + "requires": {} }, "xml": { "version": "1.0.1", diff --git a/package.json b/package.json index 3e69f0e..2ec5c72 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,7 @@ "release": "standard-version" }, "workspaces": [ - "apps/*", - "libs/*" + "projects/*" ], "husky": { "hooks": { diff --git a/libs/angular-google-charts/README.md b/projects/angular-google-charts/README.md similarity index 100% rename from libs/angular-google-charts/README.md rename to projects/angular-google-charts/README.md diff --git a/libs/angular-google-charts/jest.config.js b/projects/angular-google-charts/jest.config.js similarity index 100% rename from libs/angular-google-charts/jest.config.js rename to projects/angular-google-charts/jest.config.js diff --git a/libs/angular-google-charts/ng-package.json b/projects/angular-google-charts/ng-package.json similarity index 100% rename from libs/angular-google-charts/ng-package.json rename to projects/angular-google-charts/ng-package.json diff --git a/libs/angular-google-charts/ng-package.prod.json b/projects/angular-google-charts/ng-package.prod.json similarity index 100% rename from libs/angular-google-charts/ng-package.prod.json rename to projects/angular-google-charts/ng-package.prod.json diff --git a/libs/angular-google-charts/package.json b/projects/angular-google-charts/package.json similarity index 100% rename from libs/angular-google-charts/package.json rename to projects/angular-google-charts/package.json diff --git a/libs/angular-google-charts/src/index.ts b/projects/angular-google-charts/src/index.ts similarity index 100% rename from libs/angular-google-charts/src/index.ts rename to projects/angular-google-charts/src/index.ts diff --git a/libs/angular-google-charts/src/lib/components/chart-base/chart-base.component.ts b/projects/angular-google-charts/src/lib/components/chart-base/chart-base.component.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/chart-base/chart-base.component.ts rename to projects/angular-google-charts/src/lib/components/chart-base/chart-base.component.ts diff --git a/libs/angular-google-charts/src/lib/components/chart-editor/chart-editor-ref.spec.ts b/projects/angular-google-charts/src/lib/components/chart-editor/chart-editor-ref.spec.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/chart-editor/chart-editor-ref.spec.ts rename to projects/angular-google-charts/src/lib/components/chart-editor/chart-editor-ref.spec.ts diff --git a/libs/angular-google-charts/src/lib/components/chart-editor/chart-editor-ref.ts b/projects/angular-google-charts/src/lib/components/chart-editor/chart-editor-ref.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/chart-editor/chart-editor-ref.ts rename to projects/angular-google-charts/src/lib/components/chart-editor/chart-editor-ref.ts diff --git a/libs/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.spec.ts b/projects/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.spec.ts similarity index 95% rename from libs/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.spec.ts rename to projects/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.spec.ts index 2ac7fbf..ec133be 100644 --- a/libs/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.spec.ts +++ b/projects/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.spec.ts @@ -90,7 +90,7 @@ describe('ChartEditorComponent', () => { Object.defineProperty(chartComponent, 'chartWrapper', { get: () => chartWrapper }); component['editor'] = editorMock; - ((ChartEditorRef as any) as jest.SpyInstance).mockReturnValue(editorRefMock); + (ChartEditorRef as any as jest.SpyInstance).mockReturnValue(editorRefMock); editorRefMock.afterClosed.mockReturnValue(EMPTY); }); @@ -140,13 +140,13 @@ describe('ChartEditorComponent', () => { expect(setSpy).not.toHaveBeenCalled(); }); - it('should throw if the component\' chart wrapper is undefined', () => { + it("should throw if the component' chart wrapper is undefined", () => { delete (chartComponent as any).chartWrapper; expect(() => component.editChart(chartComponent)).toThrow(); }); - it('should throw if the component\' editor is undefined', () => { + it("should throw if the component' editor is undefined", () => { component['editor'] = undefined; expect(() => component.editChart(chartComponent)).toThrow(); diff --git a/libs/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.ts b/projects/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.ts rename to projects/angular-google-charts/src/lib/components/chart-editor/chart-editor.component.ts diff --git a/libs/angular-google-charts/src/lib/components/chart-editor/types.ts b/projects/angular-google-charts/src/lib/components/chart-editor/types.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/chart-editor/types.ts rename to projects/angular-google-charts/src/lib/components/chart-editor/types.ts diff --git a/libs/angular-google-charts/src/lib/components/chart-wrapper/chart-wrapper.component.spec.ts b/projects/angular-google-charts/src/lib/components/chart-wrapper/chart-wrapper.component.spec.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/chart-wrapper/chart-wrapper.component.spec.ts rename to projects/angular-google-charts/src/lib/components/chart-wrapper/chart-wrapper.component.spec.ts diff --git a/libs/angular-google-charts/src/lib/components/chart-wrapper/chart-wrapper.component.ts b/projects/angular-google-charts/src/lib/components/chart-wrapper/chart-wrapper.component.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/chart-wrapper/chart-wrapper.component.ts rename to projects/angular-google-charts/src/lib/components/chart-wrapper/chart-wrapper.component.ts diff --git a/libs/angular-google-charts/src/lib/components/control-wrapper/control-wrapper.component.spec.ts b/projects/angular-google-charts/src/lib/components/control-wrapper/control-wrapper.component.spec.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/control-wrapper/control-wrapper.component.spec.ts rename to projects/angular-google-charts/src/lib/components/control-wrapper/control-wrapper.component.spec.ts diff --git a/libs/angular-google-charts/src/lib/components/control-wrapper/control-wrapper.component.ts b/projects/angular-google-charts/src/lib/components/control-wrapper/control-wrapper.component.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/control-wrapper/control-wrapper.component.ts rename to projects/angular-google-charts/src/lib/components/control-wrapper/control-wrapper.component.ts diff --git a/libs/angular-google-charts/src/lib/components/dashboard/dashboard.component.spec.ts b/projects/angular-google-charts/src/lib/components/dashboard/dashboard.component.spec.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/dashboard/dashboard.component.spec.ts rename to projects/angular-google-charts/src/lib/components/dashboard/dashboard.component.spec.ts diff --git a/libs/angular-google-charts/src/lib/components/dashboard/dashboard.component.ts b/projects/angular-google-charts/src/lib/components/dashboard/dashboard.component.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/dashboard/dashboard.component.ts rename to projects/angular-google-charts/src/lib/components/dashboard/dashboard.component.ts diff --git a/libs/angular-google-charts/src/lib/components/google-chart/google-chart.component.spec.ts b/projects/angular-google-charts/src/lib/components/google-chart/google-chart.component.spec.ts similarity index 97% rename from libs/angular-google-charts/src/lib/components/google-chart/google-chart.component.spec.ts rename to projects/angular-google-charts/src/lib/components/google-chart/google-chart.component.spec.ts index 08501e1..3953a38 100644 --- a/libs/angular-google-charts/src/lib/components/google-chart/google-chart.component.spec.ts +++ b/projects/angular-google-charts/src/lib/components/google-chart/google-chart.component.spec.ts @@ -94,18 +94,15 @@ describe('GoogleChartComponent', () => { expect(service.loadChartPackages).toHaveBeenCalled(); }); - it( - 'should not throw if only the type, but no data is provided', - waitForAsync(() => { - const service = TestBed.inject(ScriptLoaderService) as jest.Mocked; - service.loadChartPackages.mockReturnValueOnce(of(null)); + it('should not throw if only the type, but no data is provided', waitForAsync(() => { + const service = TestBed.inject(ScriptLoaderService) as jest.Mocked; + service.loadChartPackages.mockReturnValueOnce(of(null)); - component.ngOnInit(); + component.ngOnInit(); - expect(component['wrapper']).toBeDefined(); - expect(chartWrapperMock.draw).toHaveBeenCalledTimes(1); - }) - ); + expect(component['wrapper']).toBeDefined(); + expect(chartWrapperMock.draw).toHaveBeenCalledTimes(1); + })); it('should create the data table', () => { const service = TestBed.inject(ScriptLoaderService) as jest.Mocked; @@ -585,7 +582,7 @@ describe('GoogleChartComponent', () => { component.ngOnInit(); visualizationMock.events.addListener.mockReturnValue('handle1'); - const rollupCallback = () => { }; + const rollupCallback = () => {}; let handle = component.addEventListener('rollup', rollupCallback); expect(handle).toBe('handle1'); expect(visualizationMock.events.addListener).lastCalledWith(chartMock, 'rollup', rollupCallback); diff --git a/libs/angular-google-charts/src/lib/components/google-chart/google-chart.component.ts b/projects/angular-google-charts/src/lib/components/google-chart/google-chart.component.ts similarity index 100% rename from libs/angular-google-charts/src/lib/components/google-chart/google-chart.component.ts rename to projects/angular-google-charts/src/lib/components/google-chart/google-chart.component.ts diff --git a/libs/angular-google-charts/src/lib/google-charts.module.spec.ts b/projects/angular-google-charts/src/lib/google-charts.module.spec.ts similarity index 100% rename from libs/angular-google-charts/src/lib/google-charts.module.spec.ts rename to projects/angular-google-charts/src/lib/google-charts.module.spec.ts diff --git a/libs/angular-google-charts/src/lib/google-charts.module.ts b/projects/angular-google-charts/src/lib/google-charts.module.ts similarity index 100% rename from libs/angular-google-charts/src/lib/google-charts.module.ts rename to projects/angular-google-charts/src/lib/google-charts.module.ts diff --git a/libs/angular-google-charts/src/lib/helpers/chart.helper.ts b/projects/angular-google-charts/src/lib/helpers/chart.helper.ts similarity index 100% rename from libs/angular-google-charts/src/lib/helpers/chart.helper.ts rename to projects/angular-google-charts/src/lib/helpers/chart.helper.ts diff --git a/libs/angular-google-charts/src/lib/helpers/id.helper.ts b/projects/angular-google-charts/src/lib/helpers/id.helper.ts similarity index 100% rename from libs/angular-google-charts/src/lib/helpers/id.helper.ts rename to projects/angular-google-charts/src/lib/helpers/id.helper.ts diff --git a/libs/angular-google-charts/src/lib/services/data-table.service.ts b/projects/angular-google-charts/src/lib/services/data-table.service.ts similarity index 100% rename from libs/angular-google-charts/src/lib/services/data-table.service.ts rename to projects/angular-google-charts/src/lib/services/data-table.service.ts diff --git a/libs/angular-google-charts/src/lib/services/script-loader.service.spec.ts b/projects/angular-google-charts/src/lib/services/script-loader.service.spec.ts similarity index 100% rename from libs/angular-google-charts/src/lib/services/script-loader.service.spec.ts rename to projects/angular-google-charts/src/lib/services/script-loader.service.spec.ts diff --git a/libs/angular-google-charts/src/lib/services/script-loader.service.ts b/projects/angular-google-charts/src/lib/services/script-loader.service.ts similarity index 99% rename from libs/angular-google-charts/src/lib/services/script-loader.service.ts rename to projects/angular-google-charts/src/lib/services/script-loader.service.ts index 8971bcc..7fdad20 100644 --- a/libs/angular-google-charts/src/lib/services/script-loader.service.ts +++ b/projects/angular-google-charts/src/lib/services/script-loader.service.ts @@ -14,7 +14,7 @@ export class ScriptLoaderService { private zone: NgZone, @Inject(LOCALE_ID) private localeId: string, @Inject(GOOGLE_CHARTS_LAZY_CONFIG) private readonly config$: Observable - ) { } + ) {} /** * Checks whether `google.charts` is available. diff --git a/libs/angular-google-charts/src/lib/types/chart-type.ts b/projects/angular-google-charts/src/lib/types/chart-type.ts similarity index 100% rename from libs/angular-google-charts/src/lib/types/chart-type.ts rename to projects/angular-google-charts/src/lib/types/chart-type.ts diff --git a/libs/angular-google-charts/src/lib/types/control-type.ts b/projects/angular-google-charts/src/lib/types/control-type.ts similarity index 100% rename from libs/angular-google-charts/src/lib/types/control-type.ts rename to projects/angular-google-charts/src/lib/types/control-type.ts diff --git a/libs/angular-google-charts/src/lib/types/events.ts b/projects/angular-google-charts/src/lib/types/events.ts similarity index 100% rename from libs/angular-google-charts/src/lib/types/events.ts rename to projects/angular-google-charts/src/lib/types/events.ts diff --git a/libs/angular-google-charts/src/lib/types/formatter.ts b/projects/angular-google-charts/src/lib/types/formatter.ts similarity index 100% rename from libs/angular-google-charts/src/lib/types/formatter.ts rename to projects/angular-google-charts/src/lib/types/formatter.ts diff --git a/libs/angular-google-charts/src/lib/types/google-charts-config.ts b/projects/angular-google-charts/src/lib/types/google-charts-config.ts similarity index 100% rename from libs/angular-google-charts/src/lib/types/google-charts-config.ts rename to projects/angular-google-charts/src/lib/types/google-charts-config.ts diff --git a/libs/angular-google-charts/src/setup-tests.ts b/projects/angular-google-charts/src/setup-tests.ts similarity index 100% rename from libs/angular-google-charts/src/setup-tests.ts rename to projects/angular-google-charts/src/setup-tests.ts diff --git a/libs/angular-google-charts/tsconfig.lib.json b/projects/angular-google-charts/tsconfig.lib.json similarity index 100% rename from libs/angular-google-charts/tsconfig.lib.json rename to projects/angular-google-charts/tsconfig.lib.json diff --git a/libs/angular-google-charts/tsconfig.lib.prod.json b/projects/angular-google-charts/tsconfig.lib.prod.json similarity index 100% rename from libs/angular-google-charts/tsconfig.lib.prod.json rename to projects/angular-google-charts/tsconfig.lib.prod.json diff --git a/libs/angular-google-charts/tsconfig.spec.json b/projects/angular-google-charts/tsconfig.spec.json similarity index 100% rename from libs/angular-google-charts/tsconfig.spec.json rename to projects/angular-google-charts/tsconfig.spec.json diff --git a/libs/angular-google-charts/tslint.json b/projects/angular-google-charts/tslint.json similarity index 100% rename from libs/angular-google-charts/tslint.json rename to projects/angular-google-charts/tslint.json diff --git a/apps/playground/.browserslistrc b/projects/playground/.browserslistrc similarity index 100% rename from apps/playground/.browserslistrc rename to projects/playground/.browserslistrc diff --git a/apps/playground/package.json b/projects/playground/package.json similarity index 100% rename from apps/playground/package.json rename to projects/playground/package.json diff --git a/apps/playground/src/app/app-routing.module.ts b/projects/playground/src/app/app-routing.module.ts similarity index 100% rename from apps/playground/src/app/app-routing.module.ts rename to projects/playground/src/app/app-routing.module.ts diff --git a/apps/playground/src/app/app.component.ts b/projects/playground/src/app/app.component.ts similarity index 100% rename from apps/playground/src/app/app.component.ts rename to projects/playground/src/app/app.component.ts diff --git a/apps/playground/src/app/app.module.ts b/projects/playground/src/app/app.module.ts similarity index 100% rename from apps/playground/src/app/app.module.ts rename to projects/playground/src/app/app.module.ts diff --git a/apps/playground/src/app/main/main.component.html b/projects/playground/src/app/main/main.component.html similarity index 100% rename from apps/playground/src/app/main/main.component.html rename to projects/playground/src/app/main/main.component.html diff --git a/apps/playground/src/app/main/main.component.ts b/projects/playground/src/app/main/main.component.ts similarity index 100% rename from apps/playground/src/app/main/main.component.ts rename to projects/playground/src/app/main/main.component.ts diff --git a/apps/playground/src/app/test/test.component.html b/projects/playground/src/app/test/test.component.html similarity index 100% rename from apps/playground/src/app/test/test.component.html rename to projects/playground/src/app/test/test.component.html diff --git a/apps/playground/src/app/test/test.component.ts b/projects/playground/src/app/test/test.component.ts similarity index 98% rename from apps/playground/src/app/test/test.component.ts rename to projects/playground/src/app/test/test.component.ts index 9566290..18fdc72 100644 --- a/apps/playground/src/app/test/test.component.ts +++ b/projects/playground/src/app/test/test.component.ts @@ -72,7 +72,7 @@ export class TestComponent { @ViewChild(ChartEditorComponent) public readonly editor!: ChartEditorComponent; - constructor(private location: Location, private scriptLoaderService: ScriptLoaderService) { } + constructor(private location: Location, private scriptLoaderService: ScriptLoaderService) {} public edit(chart: ChartBase) { this.editor diff --git a/apps/playground/src/assets/.gitkeep b/projects/playground/src/assets/.gitkeep similarity index 100% rename from apps/playground/src/assets/.gitkeep rename to projects/playground/src/assets/.gitkeep diff --git a/apps/playground/src/environments/environment.prod.ts b/projects/playground/src/environments/environment.prod.ts similarity index 100% rename from apps/playground/src/environments/environment.prod.ts rename to projects/playground/src/environments/environment.prod.ts diff --git a/apps/playground/src/environments/environment.ts b/projects/playground/src/environments/environment.ts similarity index 100% rename from apps/playground/src/environments/environment.ts rename to projects/playground/src/environments/environment.ts diff --git a/apps/playground/src/favicon.ico b/projects/playground/src/favicon.ico similarity index 100% rename from apps/playground/src/favicon.ico rename to projects/playground/src/favicon.ico diff --git a/apps/playground/src/index.html b/projects/playground/src/index.html similarity index 100% rename from apps/playground/src/index.html rename to projects/playground/src/index.html diff --git a/apps/playground/src/main.ts b/projects/playground/src/main.ts similarity index 100% rename from apps/playground/src/main.ts rename to projects/playground/src/main.ts diff --git a/apps/playground/src/polyfills.ts b/projects/playground/src/polyfills.ts similarity index 100% rename from apps/playground/src/polyfills.ts rename to projects/playground/src/polyfills.ts diff --git a/apps/playground/src/styles.scss b/projects/playground/src/styles.scss similarity index 100% rename from apps/playground/src/styles.scss rename to projects/playground/src/styles.scss diff --git a/apps/playground/tsconfig.app.json b/projects/playground/tsconfig.app.json similarity index 100% rename from apps/playground/tsconfig.app.json rename to projects/playground/tsconfig.app.json diff --git a/apps/playground/tslint.json b/projects/playground/tslint.json similarity index 100% rename from apps/playground/tslint.json rename to projects/playground/tslint.json diff --git a/tsconfig.json b/tsconfig.json index cf41dec..0c164d8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,7 +16,7 @@ "lib": ["es2017", "dom"], "noUnusedLocals": true, "paths": { - "angular-google-charts": ["libs/angular-google-charts/src/index.ts"] + "angular-google-charts": ["projects/angular-google-charts/src/index.ts"] } }, "angularCompilerOptions": {