chore: moved schematics to separate build

valor-software · Jul 19, 2023 · 28bb710 · 28bb710
1 parent 7349d05
commit 28bb710
Show file tree

Hide file tree

Showing 72 changed files with 584 additions and 223 deletions.
diff --git a/_old/projects/ng2-charts/package.json b/_old/projects/ng2-charts/package.json
@@ -8,8 +8,8 @@
     "build": "npx tsc -p ../../../libs/ng2-charts/tsconfig.schematics.json",
     "test": "jasmine",
     "copy:schemas": "rsync -R ../../libs/ng2-charts/schematics/*/schema.json ../../../dist/ng2-charts",
-    "copy:templates": "rsync -aR ../../../libs/ng2-charts/schematics/ng-generate --include '*.template' --include '*/' --exclude '*' ../../dist/ng2-charts/",
-    "copy:collection": "cp ../../../libs/ng2-charts/schematics/collection.json ../../dist/ng2-charts/schematics/collection.json",
+    "copy:templates": "rsync -aR ../../../libs/ng2-charts-schematics/src/ng-generate --include '*.template' --include '*/' --exclude '*' ../../dist/ng2-charts/",
+    "copy:collection": "cp ../../../libs/ng2-charts-schematics/src/collection.json ../../dist/ng2-charts/schematics/collection.json",
     "postbuild": "npm run copy:schemas && npm run copy:templates && npm run copy:collection"
   },
   "peerDependencies": {

diff --git a/apps/ng2-charts-demo/project.json b/apps/ng2-charts-demo/project.json
@@ -97,5 +97,6 @@
         "buildTarget": "ng2-charts-demo:build"
       }
     }
-  }
+  },
+  "implicitDependencies": ["ng2-charts"]
 }
diff --git a/libs/ng2-charts-schematics/.eslintrc.json b/libs/ng2-charts-schematics/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}
diff --git a/libs/ng2-charts-schematics/README.md b/libs/ng2-charts-schematics/README.md
@@ -0,0 +1,11 @@
+# ng2-charts-schematics
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build ng2-charts-schematics` to build the library.
+
+## Running unit tests
+
+Run `nx test ng2-charts-schematics` to execute the unit tests via [Jest](https://jestjs.io).
diff --git a/libs/ng2-charts-schematics/jest.config.ts b/libs/ng2-charts-schematics/jest.config.ts
@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: 'ng2-charts-schematics',
+  preset: '../../jest.preset.js',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../coverage/libs/ng2-charts-schematics',
+};
diff --git a/libs/ng2-charts-schematics/package.json b/libs/ng2-charts-schematics/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "ng2-charts-schematics",
+  "version": "0.0.1",
+  "type": "commonjs"
+}
diff --git a/libs/ng2-charts-schematics/project.json b/libs/ng2-charts-schematics/project.json
@@ -0,0 +1,43 @@
+{
+  "name": "ng2-charts-schematics",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "libs/ng2-charts-schematics/src",
+  "projectType": "library",
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": ["{options.outputPath}"],
+      "options": {
+        "outputPath": "dist/libs/ng2-charts/schematics",
+        "main": "libs/ng2-charts-schematics/src/ng-add/index.ts",
+        "tsConfig": "libs/ng2-charts-schematics/tsconfig.lib.json",
+        "assets": [
+          "libs/ng2-charts-schematics/*.md",
+          "libs/ng2-charts-schematics/src/**/*.json"
+        ]
+      }
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["libs/ng2-charts-schematics/**/*.ts"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "libs/ng2-charts-schematics/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  },
+  "tags": []
+}
diff --git a/libs/ng2-charts/schematics/README.md → libs/ng2-charts-schematics/src/README.md b/libs/ng2-charts/schematics/README.md → libs/ng2-charts-schematics/src/README.md
diff --git a/libs/ng2-charts/schematics/collection.json → ...ng2-charts-schematics/src/collection.json b/libs/ng2-charts/schematics/collection.json → ...ng2-charts-schematics/src/collection.json
diff --git a/...g2-charts/schematics/ng-add/index.spec.ts → ...harts-schematics/src/ng-add/index.spec.ts b/...g2-charts/schematics/ng-add/index.spec.ts → ...harts-schematics/src/ng-add/index.spec.ts
diff --git a/libs/ng2-charts/schematics/ng-add/index.ts → ...ng2-charts-schematics/src/ng-add/index.ts b/libs/ng2-charts/schematics/ng-add/index.ts → ...ng2-charts-schematics/src/ng-add/index.ts
diff --git a/.../ng2-charts/schematics/ng-add/messages.ts → ...-charts-schematics/src/ng-add/messages.ts b/.../ng2-charts/schematics/ng-add/messages.ts → ...-charts-schematics/src/ng-add/messages.ts
diff --git a/.../ng2-charts/schematics/ng-add/schema.json → ...-charts-schematics/src/ng-add/schema.json b/.../ng2-charts/schematics/ng-add/schema.json → ...-charts-schematics/src/ng-add/schema.json
diff --git a/libs/ng2-charts/schematics/ng-add/schema.ts → ...g2-charts-schematics/src/ng-add/schema.ts b/libs/ng2-charts/schematics/ng-add/schema.ts → ...g2-charts-schematics/src/ng-add/schema.ts
diff --git a/...s/schematics/ng-add/setup-project.spec.ts → ...hematics/src/ng-add/setup-project.spec.ts b/...s/schematics/ng-add/setup-project.spec.ts → ...hematics/src/ng-add/setup-project.spec.ts
diff --git a/...charts/schematics/ng-add/setup-project.ts → ...ts-schematics/src/ng-add/setup-project.ts b/...charts/schematics/ng-add/setup-project.ts → ...ts-schematics/src/ng-add/setup-project.ts
diff --git a/...ics/ng-add/steps/add-ng2-charts-module.ts → ...src/ng-add/steps/add-ng2-charts-module.ts b/...ics/ng-add/steps/add-ng2-charts-module.ts → ...src/ng-add/steps/add-ng2-charts-module.ts
diff --git a/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template b/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template
diff --git a/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template b/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template
diff --git a/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template b/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template
diff --git a/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template b/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template
diff --git a/...harts/schematics/ng-generate/bar/index.ts → ...s-schematics/src/ng-generate/bar/index.ts b/...harts/schematics/ng-generate/bar/index.ts → ...s-schematics/src/ng-generate/bar/index.ts
diff --git a/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template b/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template
diff --git a/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template b/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template
diff --git a/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template b/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template
diff --git a/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template b/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template
diff --git a/...ts/schematics/ng-generate/bubble/index.ts → ...chematics/src/ng-generate/bubble/index.ts b/...ts/schematics/ng-generate/bubble/index.ts → ...chematics/src/ng-generate/bubble/index.ts
diff --git a/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template b/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template
diff --git a/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template b/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template
diff --git a/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template b/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template
diff --git a/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template b/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template
diff --git a/.../schematics/ng-generate/doughnut/index.ts → ...ematics/src/ng-generate/doughnut/index.ts b/.../schematics/ng-generate/doughnut/index.ts → ...ematics/src/ng-generate/doughnut/index.ts
diff --git a/...arts/schematics/ng-generate/index.spec.ts → ...-schematics/src/ng-generate/index.spec.ts b/...arts/schematics/ng-generate/index.spec.ts → ...-schematics/src/ng-generate/index.spec.ts
diff --git a/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template b/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template
diff --git a/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template b/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template
diff --git a/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template b/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template
diff --git a/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template b/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template
diff --git a/...arts/schematics/ng-generate/line/index.ts → ...-schematics/src/ng-generate/line/index.ts b/...arts/schematics/ng-generate/line/index.ts → ...-schematics/src/ng-generate/line/index.ts
diff --git a/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template b/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template
diff --git a/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template b/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template
diff --git a/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template b/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template
diff --git a/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template b/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template
diff --git a/...harts/schematics/ng-generate/pie/index.ts → ...s-schematics/src/ng-generate/pie/index.ts b/...harts/schematics/ng-generate/pie/index.ts → ...s-schematics/src/ng-generate/pie/index.ts
diff --git a/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template b/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template
diff --git a/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template b/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template
diff --git a/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template b/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template
diff --git a/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template b/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template
diff --git a/...chematics/ng-generate/polar-area/index.ts → ...atics/src/ng-generate/polar-area/index.ts b/...chematics/ng-generate/polar-area/index.ts → ...atics/src/ng-generate/polar-area/index.ts
diff --git a/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template b/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template
diff --git a/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template b/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template
diff --git a/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template b/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template
diff --git a/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template b/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template
diff --git a/...rts/schematics/ng-generate/radar/index.ts → ...schematics/src/ng-generate/radar/index.ts b/...rts/schematics/ng-generate/radar/index.ts → ...schematics/src/ng-generate/radar/index.ts
diff --git a/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template b/...@dasherize__.component.__style__.template → ...@dasherize__.component.__style__.template
diff --git a/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template b/..._name@dasherize__.component.html.template → ..._name@dasherize__.component.html.template
diff --git a/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template b/...me@dasherize__.component.spec.ts.template → ...me@dasherize__.component.spec.ts.template
diff --git a/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template b/.../__name@dasherize__.component.ts.template → .../__name@dasherize__.component.ts.template
diff --git a/...s/schematics/ng-generate/scatter/index.ts → ...hematics/src/ng-generate/scatter/index.ts b/...s/schematics/ng-generate/scatter/index.ts → ...hematics/src/ng-generate/scatter/index.ts
diff --git a/...charts/schematics/ng-generate/schema.json → ...ts-schematics/src/ng-generate/schema.json b/...charts/schematics/ng-generate/schema.json → ...ts-schematics/src/ng-generate/schema.json
diff --git a/...2-charts/schematics/ng-generate/schema.ts → ...arts-schematics/src/ng-generate/schema.ts b/...2-charts/schematics/ng-generate/schema.ts → ...arts-schematics/src/ng-generate/schema.ts
diff --git a/...charts/schematics/utils/package-config.ts → ...ts-schematics/src/utils/package-config.ts b/...charts/schematics/utils/package-config.ts → ...ts-schematics/src/utils/package-config.ts
diff --git a/libs/ng2-charts/schematics/utils/project.ts → ...g2-charts-schematics/src/utils/project.ts b/libs/ng2-charts/schematics/utils/project.ts → ...g2-charts-schematics/src/utils/project.ts
diff --git a/libs/ng2-charts/schematics/utils/testing.ts → ...g2-charts-schematics/src/utils/testing.ts b/libs/ng2-charts/schematics/utils/testing.ts → ...g2-charts-schematics/src/utils/testing.ts
diff --git a/libs/ng2-charts-schematics/tsconfig.json b/libs/ng2-charts-schematics/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}
diff --git a/libs/ng2-charts-schematics/tsconfig.lib.json b/libs/ng2-charts-schematics/tsconfig.lib.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es2015",
+    "outDir": "../../dist/out-tsc",
+    "declaration": true,
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/libs/ng2-charts-schematics/tsconfig.spec.json b/libs/ng2-charts-schematics/tsconfig.spec.json
@@ -0,0 +1,14 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "jest.config.ts",
+    "src/**/*.test.ts",
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
+}
diff --git a/libs/ng2-charts/ng-package.json b/libs/ng2-charts/ng-package.json
@@ -1,6 +1,7 @@
 {
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/libs/ng2-charts",
+  "deleteDestPath": false,
   "lib": {
     "entryFile": "src/index.ts"
   },

diff --git a/libs/ng2-charts/package.json b/libs/ng2-charts/package.json
@@ -1,17 +1,7 @@
 {
-  "name": "ng2-charts",
   "version": "5.0.0",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "scripts": {
-    "build": "npx tsc -p tsconfig.schematics.json",
-    "test": "nx test ng2-charts --verbose",
-    "copy:schemas": "rsync -R ../../libs/ng2-charts/schematics/*/schema.json ../../dist/ng2-charts/",
-    "copy:templates": "rsync -aR ../../libs/ng2-charts/schematics/ng-generate --include '*.template' --include '*/' --exclude '*' ../../dist/ng2-charts/",
-    "copy:collection": "cp ../../libs/ng2-charts/schematics/collection.json ../../dist/ng2-charts/schematics/collection.json",
-    "postbuild": "npm run copy:schemas && npm run copy:templates && npm run copy:collection"
-  },
+  "name": "ng2-charts",
+  "description": "Reactive, responsive, beautiful charts for Angular based on Chart.js",
   "peerDependencies": {
     "@angular/common": ">=16.0.0",
     "@angular/core": ">=16.0.0",
@@ -22,8 +12,6 @@
   "dependencies": {
     "lodash-es": "^4.17.15"
   },
-  "description": "Reactive, responsive, beautiful charts for Angular based on Chart.js",
-  "main": "../../libs/ng2-charts/src/public_api.ts",
   "author": "Dmitriy Shekhovtsov <valorkin@gmail.com>",
   "contributors": [
     {
@@ -45,7 +33,7 @@
     "type": "git",
     "url": "git+https://github.com/valor-software/ng2-charts.git"
   },
-  "schematics": "./schematics/collection.json",
+  "schematics": "./schematics/src/collection.json",
   "ng-add": {
     "save": "dependencies"
   },

diff --git a/libs/ng2-charts/project.json b/libs/ng2-charts/project.json
@@ -10,6 +10,7 @@
       "executor": "@nx/angular:package",
       "outputs": ["{workspaceRoot}/dist/{projectRoot}"],
       "options": {
+
         "project": "libs/ng2-charts/ng-package.json"
       },
       "configurations": {
@@ -46,5 +47,8 @@
         ]
       }
     }
-  }
+  },
+  "implicitDependencies": [
+    "ng2-charts-schematics"
+  ]
 }