🐛 fix(devkit): adjust tsconfig for build (#1361)

* adjust tsconfig for build * revert to old setup for schematics * format files * fix lint issue * fix styles migration for windows * update docs * fix lint issue * update changesets
baloise · Mar 19, 2024 · c4ecf31 · c4ecf31
1 parent 726282f
commit c4ecf31
Show file tree

Hide file tree

Showing 18 changed files with 115 additions and 224 deletions.
diff --git a/.changeset/great-peaches-tan.md b/.changeset/great-peaches-tan.md
@@ -0,0 +1,5 @@
+---
+'@baloise/ds-core': patch
+---
+
+**css**: support new grid class names like `grid` and `col`
diff --git a/.changeset/heavy-penguins-watch.md b/.changeset/heavy-penguins-watch.md
@@ -0,0 +1,5 @@
+---
+'@baloise/ds-core': patch
+---
+
+**styles**: fix paths in the migration script for windows
diff --git a/.changeset/quick-months-rhyme.md b/.changeset/quick-months-rhyme.md
@@ -0,0 +1,5 @@
+---
+'@baloise/ds-core': patch
+---
+
+**devkit**: fix build issue of ng-add schematics
diff --git a/.changeset/unlucky-cameras-jam.md b/.changeset/unlucky-cameras-jam.md
@@ -2,4 +2,4 @@
 '@baloise/ds-core': patch
 ---
 
-**styles**: add migration for compact theme and grid
+**styles**: add migration for compact theme
diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,11 @@ packages/favicons/CHANGELOG.md
 packages/fonts/CHANGELOG.md
 packages/icons/CHANGELOG.md
 
+packages/devkit/src/**/*.js
+packages/devkit/src/**/*.js.map
+packages/devkit/src/**/*.d.ts
+
+
 libs/output-targets-angular/CHANGELOG.md
 libs/output-targets-react/CHANGELOG.md
 libs/output-targets-vue/CHANGELOG.md

diff --git a/.prettierignore b/.prettierignore
@@ -9,6 +9,8 @@ packages/maps/src/markers.json
 packages/core/icons
 packages/core/src/utils/constants/icons.constant.ts
 packages/core/src/components.d.ts
+packages/devkit/src/**/*.js
+packages/devkit/src/**/*.d.ts
 
 resources/data/tags.json
 

diff --git a/docs/stories/development/00-guides/00-getting-started.stories.mdx b/docs/stories/development/00-guides/00-getting-started.stories.mdx
@@ -50,7 +50,7 @@ If the projects requires translations, then install [\{TRANSLOCO\}](https://ngne
 Configure project:
 
 ```bash
-ng add @ngneat/transloco
+npx ng add @ngneat/transloco
 # On an nx workspace
 nx g @ngneat/transloco:ng-add
 ```
@@ -64,7 +64,7 @@ Lets install the schematics to configure and add the design system to an Angular
 Install the library using Angular CLI:
 
 ```bash
-ng add @baloise/ds-devkit
+npx ng add @baloise/ds-devkit
 # On an nx workspace
 nx g @baloise/ds-devkit:ng-add
 ```

diff --git a/docs/stories/development/02-upgrade/upgrade-guide.v16.stories.mdx b/docs/stories/development/02-upgrade/upgrade-guide.v16.stories.mdx
@@ -111,7 +111,7 @@ npm add -D -E @baloise/ds-devkit
 2. **Angular Schematics Script:** Rename the packages by simply run the following command in your project's root directory:
 
 ```bash
-ng generate @baloise/ds-devkit:up16
+npx ng generate @baloise/ds-devkit:up16
 ```
 
 3. **Verify the Changes:** Once the script has run, review the changes to ensure everything has been updated correctly. It's a good practice to check the git diff if your project is version-controlled.

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/devkit/.eslintignore b/packages/devkit/.eslintignore
@@ -1,3 +1,5 @@
 node_modules
 dist
 files
+src/**/*.js
+src/**/*.d.ts
diff --git a/packages/devkit/.eslintrc.json b/packages/devkit/.eslintrc.json
@@ -21,7 +21,15 @@
         "@nx/dependency-checks": [
           "error",
           {
-            "ignoredDependencies": ["@angular/common", "@angular/core", "tslib"]
+            "ignoredDependencies": [
+              "@angular/common",
+              "@angular/core",
+              "@angular-devkit/core",
+              "@angular-devkit/schematics",
+              "@schematics/angular",
+              "typescript",
+              "tslib"
+            ]
           }
         ]
       }

diff --git a/packages/devkit/.npmignore b/packages/devkit/.npmignore
@@ -0,0 +1,4 @@
+
+# Ignores TypeScript files, but keeps definitions.
+*.ts
+!*.d.ts
diff --git a/packages/devkit/package.json b/packages/devkit/package.json
@@ -11,21 +11,15 @@
   },
   "homepage": "https://design.baloise.dev",
   "license": "Apache-2.0",
-  "dependencies": {
-    "@angular-devkit/core": "~15.0.5",
-    "@angular-devkit/schematics": "~15.0.5",
-    "@schematics/angular": "~15.0.5",
-    "glob": "~10.3.10"
-  },
-  "peerDependencies": {
-    "@angular/common": ">=15.0.0",
-    "@angular/core": ">=15.0.0"
-  },
   "schematics": "./src/collection.json",
   "ng-add": {
     "save": "devDependencies"
   },
-  "devDependencies": {
-    "copyfiles": "~2.4.1"
+  "dependencies": {
+    "@angular-devkit/core": "^17.0.10",
+    "@angular-devkit/schematics": "^17.0.10",
+    "@schematics/angular": "^17.0.10",
+    "typescript": "~5.2.2",
+    "glob": "~10.3.10"
   }
 }
diff --git a/packages/devkit/project.json b/packages/devkit/project.json
@@ -7,31 +7,20 @@
     "nx-release-publish": {
       "executor": "@nx/js:release-publish",
       "options": {
-        "packageRoot": "{projectRoot}/dist"
-      }
-    },
-    "prepare": {
-      "executor": "@nx/js:tsc",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "{projectRoot}/dist",
-        "main": "{projectRoot}/src/index.ts",
-        "tsConfig": "{projectRoot}/tsconfig.lib.json",
-        "assets": ["{projectRoot}/**/files/**", "{projectRoot}/src/**/*.json"]
+        "packageRoot": "{projectRoot}"
       }
     },
     "build": {
       "executor": "nx:run-commands",
-      "dependsOn": ["^build", "prepare"],
       "options": {
         "cwd": "{projectRoot}",
-        "command": "copyfiles src/*/schema.json src/*/files/** src/collection.json dist"
+        "command": "tsc -p tsconfig.json"
       }
     },
     "link": {
       "executor": "nx:run-commands",
       "options": {
-        "cwd": "{projectRoot}/dist",
+        "cwd": "{projectRoot}",
         "command": "npm link"
       }
     }

diff --git a/packages/devkit/src/ng-upgrade-16/index.ts b/packages/devkit/src/ng-upgrade-16/index.ts
@@ -180,7 +180,6 @@ function updateSassImports(): Rule {
           recorder.remove(0, content.length)
           recorder.insertLeft(0, newContent)
           tree.commitUpdate(recorder)
-          _context.logger.info(`Updated import in ${path}`)
         }
       }
     })

diff --git a/packages/devkit/tsconfig.json b/packages/devkit/tsconfig.json
@@ -1,11 +1,24 @@
 {
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {},
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    }
-  ]
+  "compilerOptions": {
+    "baseUrl": "tsconfig",
+    "lib": ["es2018", "dom"],
+    "declaration": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmitOnError": true,
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "noUnusedParameters": true,
+    "noUnusedLocals": true,
+    "rootDir": "src/",
+    "skipDefaultLibCheck": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strictNullChecks": true,
+    "target": "es6",
+    "types": ["node"]
+  },
+  "include": ["src/**/*"],
+  "exclude": ["src/*/files/**/*"]
 }