fix(schematics): Don't fail if meta config already exists

valor-software · Mar 20, 2019 · ea647ad · ea647ad
1 parent 9e3dae1
commit ea647ad
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/ng2-charts-schematics/package-lock.json b/ng2-charts-schematics/package-lock.json
diff --git a/ng2-charts-schematics/src/ng2-charts-schematics/build-meta-config.ts b/ng2-charts-schematics/src/ng2-charts-schematics/build-meta-config.ts
@@ -33,6 +33,12 @@ export function buildMetaConfig(_options: any): Rule {
     _options.metaname = parsedPath.name;
     _options.metapath = parsedPath.path;
 
+    const metaConfigExists = tree.exists('/src/app/app-chart-config.ts');
+
+    if (metaConfigExists) {
+      return tree;
+    }
+
     const templateSource = apply(url('./files'), [
       applyTemplates({
         ...strings,

diff --git a/projects/ng2-charts/package-lock.json b/projects/ng2-charts/package-lock.json
diff --git a/projects/ng2-charts/package.json b/projects/ng2-charts/package.json
@@ -13,8 +13,7 @@
   "description": "Reactive, responsive, beautiful charts for Angular2 based on Chart.js",
   "main": "src/public_api.ts",
   "devDependencies": {
-    "@types/lodash": "^4.14.123",
-    "@types/node": "^11.11.3"
+    "@types/lodash": "^4.14.123"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/projects/ng2-charts/src/lib/chartjs/angular-chart.ts b/projects/ng2-charts/src/lib/chartjs/angular-chart.ts
@@ -9,7 +9,7 @@ import { ChartFontOptions } from './chart-font-options';
 import { ChartTooltipsStaticConfiguration } from './chart-tooltips-static-configuration';
 import { ChartArea } from './chart-area';
 
-require('chart.js');
+import 'chart.js';
 
 declare class Chart {
   // tslint:disable-next-line:variable-name

diff --git a/projects/ng2-charts/tsconfig.lib.json b/projects/ng2-charts/tsconfig.lib.json
@@ -11,9 +11,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "importHelpers": true,
-    "types": [
-      "node"
-    ],
+    "types": [],
     "lib": [
       "dom",
       "es2018"