build: bump angular 17 (#26)

cipchk · Nov 9, 2023 · a3d930f · a3d930f
1 parent fd0b953
commit a3d930f
Show file tree

Hide file tree

Showing 23 changed files with 147 additions and 173 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,11 +28,16 @@ jobs:
           cmd: install
 
       - name: run
-        run: |
-          yarn run test
-          cat ./coverage/lcov.info | ./node_modules/.bin/codecov
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        run: yarn run test
+
+      - uses: codecov/codecov-action@v3
+        name: upload
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: unittests
+          files: ./coverage/cobertura-coverage.xml
+          fail_ci_if_error: true
+          verbose: true
 
   lint:
     runs-on: ubuntu-latest
@@ -60,12 +65,12 @@ jobs:
 
       - name: build
         run: |
-          node --max_old_space_size=5120 ./node_modules/@angular/cli/bin/ng build --base-href /ngx-highlight-js/
-          cp ./dist/index.html ./dist/404.html
-          ls ./dist
+          node ./node_modules/@angular/cli/bin/ng build --base-href /ngx-highlight-js/
+          cp ./dist/browser/index.html ./dist/browser/404.html
+          ls ./dist/browser
 
       - name: deploy-to-gh-pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./dist
+          publish_dir: ./dist/browser
diff --git a/.gitignore b/.gitignore
@@ -1,42 +1,45 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
-# compiled output
+# Compiled output
 /dist
 /tmp
 /out-tsc
-/publish
-/yarn.lock
-/.angular/cache
+/bazel-out
 
-# dependencies
+# Node
 /node_modules
+npm-debug.log
+yarn-error.log
 
 # IDEs and editors
-/.idea
+.idea/
 .project
 .classpath
 .c9/
 *.launch
 .settings/
 *.sublime-workspace
 
-# IDE - VSCode
+# Visual Studio Code
 .vscode/*
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+.history/*
 
-# misc
-/.sass-cache
+# Miscellaneous
+/.angular/cache
+.sass-cache/
 /connect.lock
 /coverage
 /libpeerconnection.log
-npm-debug.log
-yarn-error.log
 testem.log
 /typings
 
-# System Files
+# System files
 .DS_Store
 Thumbs.db
+
+/publish
+/yarn.lock
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.16.1
+18.12.0
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@ Angular for syntax highlighting with highlight.js
 
 [![NPM version](https://img.shields.io/npm/v/ngx-highlight-js.svg)](https://www.npmjs.com/package/ngx-highlight-js)
 [![Ci](https://github.com/cipchk/ngx-highlight-js/workflows/Ci/badge.svg)](https://github.com/cipchk/ngx-highlight-js/actions)
+[![codecov](https://codecov.io/github/cipchk/ngx-highlight-js/graph/badge.svg?token=FI8lMVH3bN)](https://codecov.io/github/cipchk/ngx-highlight-js)
 
 ## Demo
 

diff --git a/angular.json b/angular.json
@@ -14,15 +14,15 @@
         }
       },
       "root": "",
-      "sourceRoot": "src",
+      "sourceRoot": "",
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
             "outputPath": "dist",
             "index": "src/index.html",
-            "main": "src/main.ts",
+            "browser": "src/main.ts",
             "polyfills": [
               "zone.js"
             ],
@@ -49,21 +49,12 @@
                   "maximumError": "4kb"
                 }
               ],
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
               "outputHashing": "all"
             },
             "development": {
-              "buildOptimizer": false,
               "optimization": false,
-              "vendorChunk": true,
               "extractLicenses": false,
-              "sourceMap": true,
-              "namedChunks": true
+              "sourceMap": true
             }
           },
           "defaultConfiguration": "production"
@@ -72,30 +63,28 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "browserTarget": "ngx-highlight-js:build:production"
+              "buildTarget": "ngx-highlight-js:build:production"
             },
             "development": {
-              "browserTarget": "ngx-highlight-js:build:development"
+              "buildTarget": "ngx-highlight-js:build:development"
             }
           },
           "defaultConfiguration": "development"
         },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "lib/test.ts",
+            "karmaConfig": "./karma.conf.js",
             "polyfills": [
               "zone.js",
               "zone.js/testing"
             ],
             "tsConfig": "tsconfig.spec.json",
-            "karmaConfig": "karma.conf.js",
             "scripts": [
               "src/assets/highlight.min.js"
             ],
             "include": [
-              "../lib/test.ts",
-              "../lib/**/*.spec.ts"
+              "lib/**/*.spec.ts"
             ]
           }
         },
@@ -112,10 +101,5 @@
         }
       }
     }
-  },
-  "cli": {
-    "schematicCollections": [
-      "@angular-eslint/schematics"
-    ]
   }
 }
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,50 +1,51 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
-
-module.exports = function (config) {
-  config.set({
-    basePath: '',
-    frameworks: ['jasmine', '@angular-devkit/build-angular'],
-    plugins: [
-      require('karma-jasmine'),
-      require('karma-chrome-launcher'),
-      require('karma-jasmine-html-reporter'),
-      require('karma-coverage'),
-      require('@angular-devkit/build-angular/plugins/karma')
-    ],
-    client: {
-      jasmine: {
-        // you can add configuration options for Jasmine here
-        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
-        // for example, you can disable the random execution with `random: false`
-        // or set a specific seed with `seed: 4321`
-      },
-      clearContext: false // leave Jasmine Spec Runner output visible in browser
-    },
-    jasmineHtmlReporter: {
-      suppressAll: true // removes the duplicated traces
-    },
-    coverageReporter: {
-      dir: require('path').join(__dirname, './coverage'),
-      subdir: '.',
-      reporters: [
-        { type: 'html' },
-        { type: 'text-summary' }
-      ]
-    },
-    reporters: ['progress', 'kjhtml'],
-    port: 9876,
-    colors: true,
-    logLevel: config.LOG_INFO,
-    autoWatch: true,
-    browsers: ['Chrome'],
-    singleRun: false,
-    restartOnFileChange: true,
-    customLaunchers: {
-      ChromeHeadlessCI: {
-        base: 'ChromeHeadless',
-        flags: ['--no-sandbox'],
-      },
-    }
-  });
-};
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client: {
+      jasmine: {
+        // you can add configuration options for Jasmine here
+        // the possible options are listed at https://jasmine.github.io/api/edge/Configuration.html
+        // for example, you can disable the random execution with `random: false`
+        // or set a specific seed with `seed: 4321`
+      },
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    jasmineHtmlReporter: {
+      suppressAll: true // removes the duplicated traces
+    },
+    coverageReporter: {
+      dir: require('path').join(__dirname, './coverage'),
+      subdir: '.',
+      reporters: [
+        { type: 'html' },
+        { type: 'text-summary' },
+        { type: 'cobertura' },
+      ]
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    restartOnFileChange: true,
+    customLaunchers: {
+      ChromeHeadlessCI: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox'],
+      },
+    }
+  });
+};
diff --git a/lib/index.ts b/lib/index.ts
@@ -1 +1 @@
-export * from './public_api';
+export * from './public-api';
diff --git a/lib/ng-package.json b/lib/ng-package.json
@@ -3,7 +3,7 @@
   "dest": "../publish",
   "deleteDestPath": true,
   "lib": {
-    "entryFile": "public_api.ts"
+    "entryFile": "public-api.ts"
   },
   "allowedNonPeerDependencies": ["tslib", "angular", "highlight.js"]
 }
diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-highlight-js",
-  "version": "16.1.0",
+  "version": "17.0.0",
   "description": "Angular for syntax highlighting with highlight.js",
   "keywords": [
     "highlight",
@@ -21,6 +21,6 @@
   },
   "homepage": "https://cipchk.github.io/ngx-highlight-js/",
   "dependencies": {
-    "highlight.js": "^11.0.0"
+    "highlight.js": "^11.9.0"
   }
 }
diff --git a/lib/public_api.ts → lib/public-api.ts b/lib/public_api.ts → lib/public-api.ts
diff --git a/lib/src/highlight-js.directive.ts b/lib/src/highlight-js.directive.ts
@@ -103,10 +103,8 @@ export class HighlightJsDirective implements AfterViewInit, OnDestroy {
 
   ngOnDestroy(): void {
     this.destroy();
-    this.destroyMutation();
-    if (this.modelValue$) {
-      this.modelValue$.unsubscribe();
-    }
+    this.observer?.disconnect();
+    this.modelValue$?.unsubscribe();
   }
 
   private initMutation(): void {
@@ -122,8 +120,4 @@ export class HighlightJsDirective implements AfterViewInit, OnDestroy {
       });
     });
   }
-
-  private destroyMutation(): void {
-    this.observer?.disconnect();
-  }
 }
diff --git a/lib/test.ts b/lib/test.ts
diff --git a/lib/tsconfig.lib.json b/lib/tsconfig.lib.json
@@ -4,12 +4,12 @@
     "alwaysStrict": true,
     "inlineSources": true,
     "strictFunctionTypes": true,
-    "stripInternal": true
+    "stripInternal": true,
+    "declarationMap": false
   },
   "files": ["./src/highlight-js.module.ts"],
   "include": ["**/*.ts"],
   "angularCompilerOptions": {
-    "enableIvy": true,
     "compilationMode": "partial"
   }
 }