fix: ignore v11

ngworker · Jun 1, 2022 · 5dcb625 · 5dcb625
1 parent cbef095
commit 5dcb625
Show file tree

Hide file tree

Showing 4 changed files with 975 additions and 540 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -177,122 +177,122 @@ jobs:
 #      - run: yarn build
 
 
-  e2e:
-    runs-on: ubuntu-latest
-    needs: build
+  # e2e:
+  #   runs-on: ubuntu-latest
+  #   needs: build
 
-    strategy:
-      matrix:
-        node-version: [12.x]
-        # angular-version: [9.0.x, 9.1.x, 10.0.x, 10.1.x, 10.2.x, 11.0.x, 11.1.x, 11.2.x]
-        # angular-version: [12.2.x, 12.1.x, 12.0.x, 11.2.x, 11.1.x, 11.0.x]
-        angular-version: [11.2.x, 11.1.x, 11.0.x]
-        # include:
-        #   - node-version: 14.x
-        #     angular-version: 12.0.x
-        #   - node-version: 14.x
-        #     angular-version: 12.1.x
-        #   - node-version: 14.x
-        #     angular-version: 12.2.x
+  #   strategy:
+  #     matrix:
+  #       node-version: [12.x]
+  #       # angular-version: [9.0.x, 9.1.x, 10.0.x, 10.1.x, 10.2.x, 11.0.x, 11.1.x, 11.2.x]
+  #       # angular-version: [12.2.x, 12.1.x, 12.0.x, 11.2.x, 11.1.x, 11.0.x]
+  #       angular-version: [11.2.x, 11.1.x]
+  #       # include:
+  #       #   - node-version: 14.x
+  #       #     angular-version: 12.0.x
+  #       #   - node-version: 14.x
+  #       #     angular-version: 12.1.x
+  #       #   - node-version: 14.x
+  #       #     angular-version: 12.2.x
 
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: Use Angular version ${{ matrix.angular-version }}
-        uses: ngworker/angular-versions-action@v4
-        with:
-          angular-version: ${{ matrix.angular-version }}
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - name: Use Node.js ${{ matrix.node-version }}
+  #       uses: actions/setup-node@v3
+  #       with:
+  #         node-version: ${{ matrix.node-version }}
+  #     - name: Use Angular version ${{ matrix.angular-version }}
+  #       uses: ngworker/angular-versions-action@v4
+  #       with:
+  #         angular-version: ${{ matrix.angular-version }}
 
-      - name: Variable-Yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Cache Yarn cache directory
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-node-${{ matrix.node-version }}-angular-${{ matrix.angular-version }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node-version }}-angular-${{ matrix.angular-version }}-yarn-
-            ${{ runner.os }}-node-${{ matrix.node-version }}-angular-
-      - run: yarn install
-      - run: yarn delete-path-alias @ngworker/lumberjack
-      - run: yarn delete-path-alias @ngworker/lumberjack/console-driver
-      - run: yarn delete-path-alias @ngworker/lumberjack/http-driver
-      - uses: actions/download-artifact@v3
-        with:
-          name: lumberjack-package
-          path: node_modules/@ngworker/lumberjack
-      - run: npx ngcc || true
+  #     - name: Variable-Yarn cache directory path
+  #       id: yarn-cache-dir-path
+  #       run: echo "::set-output name=dir::$(yarn cache dir)"
+  #     - name: Cache Yarn cache directory
+  #       uses: actions/cache@v3
+  #       with:
+  #         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+  #         key: ${{ runner.os }}-node-${{ matrix.node-version }}-angular-${{ matrix.angular-version }}-yarn-${{ hashFiles('yarn.lock') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-node-${{ matrix.node-version }}-angular-${{ matrix.angular-version }}-yarn-
+  #           ${{ runner.os }}-node-${{ matrix.node-version }}-angular-
+  #     - run: yarn install
+  #     - run: yarn delete-path-alias @ngworker/lumberjack
+  #     - run: yarn delete-path-alias @ngworker/lumberjack/console-driver
+  #     - run: yarn delete-path-alias @ngworker/lumberjack/http-driver
+  #     - uses: actions/download-artifact@v3
+  #       with:
+  #         name: lumberjack-package
+  #         path: node_modules/@ngworker/lumberjack
+  #     - run: npx ngcc || true
 
-      - if: matrix.angular-version == '9.0.x' || matrix.angular-version == '9.1.x'
-        run: yarn delete-commonjs-allowlist
+  #     - if: matrix.angular-version == '9.0.x' || matrix.angular-version == '9.1.x'
+  #       run: yarn delete-commonjs-allowlist
 
-      - name: Update Chrome
-        uses: browser-actions/setup-chrome@latest
-        with:
-          chrome-version: stable
-      - run: yarn e2e
-#
-#  schematics-e2e:
-#    runs-on: ubuntu-latest
-#    needs: build
-#
-#    strategy:
-#      matrix:
-#        node-version: [12.x]
-#        # 9.0.x doesn't work due to Jest dependencies using TypeScript 3.8 import type syntax
-#        angular-version: [11.2.x, 11.1.x, 11.0.x]
-#        # angular-version: [12.2.x, 12.1.x, 12.0.x, 11.2.x, 11.1.x, 11.0.x]
-#        # angular-version: [9.1.x, 10.0.x, 10.1.x, 10.2.x, 11.0.x, 11.1.x, 11.2.x]
-#        # include:
-#        #   - node-version: 12.x
-#        #     angular-version: 12.0.x
-#        #   - node-version: 14.x
-#        #     angular-version: 12.0.x
-#        #   - node-version: 14.x
-#        #     angular-version: 12.1.x
-#        #   - node-version: 14.x
-#        #     angular-version: 12.2.x
-#
-#    steps:
-#      - uses: actions/checkout@v3
-#      - name: Use Node.js ${{ matrix.node-version }}
-#        uses: actions/setup-node@v3
-#        with:
-#          node-version: ${{ matrix.node-version }}
-#      - name: Use Angular version ${{ matrix.angular-version }}
-#        uses: ngworker/angular-versions-action@v4
-#        with:
-#          angular-version: ${{ matrix.angular-version }}
-#
-#      - name: Variable-Yarn cache directory path
-#        id: yarn-cache-dir-path
-#        run: echo "::set-output name=dir::$(yarn cache dir)"
-#      - name: Cache Yarn cache directory
-#        uses: actions/cache@v3
-#        with:
-#          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-#          key: ${{ runner.os }}-node-${{ matrix.node-version }}-angular-${{ matrix.angular-version }}-yarn-${{ hashFiles('yarn.lock') }}
-#          restore-keys: |
-#            ${{ runner.os }}-node-${{ matrix.node-version }}-angular-${{ matrix.angular-version }}-yarn-
-#            ${{ runner.os }}-node-${{ matrix.node-version }}-angular-
-#      - run: yarn install
-#      - run: yarn delete-path-alias @ngworker/lumberjack
-#      - run: yarn delete-path-alias @ngworker/lumberjack/console-driver
-#      - run: yarn delete-path-alias @ngworker/lumberjack/http-driver
-#      - uses: actions/download-artifact@v3
-#        with:
-#          name: lumberjack-package
-#          path: node_modules/@ngworker/lumberjack
-#      - run: npx ngcc || true
-#
-#      - if: matrix.angular-version == '9.0.x' || matrix.angular-version == '9.1.x'
-#        run: yarn delete-commonjs-allowlist
-#
-#      - run: yarn schematics-e2e
+  #     - name: Update Chrome
+  #       uses: browser-actions/setup-chrome@latest
+  #       with:
+  #         chrome-version: stable
+  #     - run: yarn e2e
+
+  schematics-e2e:
+   runs-on: ubuntu-latest
+   needs: build
+
+   strategy:
+     matrix:
+       node-version: [12.x]
+       # 9.0.x doesn't work due to Jest dependencies using TypeScript 3.8 import type syntax
+       angular-version: [11.2.x, 11.1.x, 11.0.x]
+       # angular-version: [12.2.x, 12.1.x, 12.0.x, 11.2.x, 11.1.x, 11.0.x]
+       # angular-version: [9.1.x, 10.0.x, 10.1.x, 10.2.x, 11.0.x, 11.1.x, 11.2.x]
+       # include:
+       #   - node-version: 12.x
+       #     angular-version: 12.0.x
+       #   - node-version: 14.x
+       #     angular-version: 12.0.x
+       #   - node-version: 14.x
+       #     angular-version: 12.1.x
+       #   - node-version: 14.x
+       #     angular-version: 12.2.x
+
+   steps:
+     - uses: actions/checkout@v3
+     - name: Use Node.js ${{ matrix.node-version }}
+       uses: actions/setup-node@v3
+       with:
+         node-version: ${{ matrix.node-version }}
+     - name: Use Angular version ${{ matrix.angular-version }}
+       uses: ngworker/angular-versions-action@v4
+       with:
+         angular-version: ${{ matrix.angular-version }}
+
+     - name: Variable-Yarn cache directory path
+       id: yarn-cache-dir-path
+       run: echo "::set-output name=dir::$(yarn cache dir)"
+     - name: Cache Yarn cache directory
+       uses: actions/cache@v3
+       with:
+         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+         key: ${{ runner.os }}-node-${{ matrix.node-version }}-angular-${{ matrix.angular-version }}-yarn-${{ hashFiles('yarn.lock') }}
+         restore-keys: |
+           ${{ runner.os }}-node-${{ matrix.node-version }}-angular-${{ matrix.angular-version }}-yarn-
+           ${{ runner.os }}-node-${{ matrix.node-version }}-angular-
+     - run: yarn install
+     - run: yarn delete-path-alias @ngworker/lumberjack
+     - run: yarn delete-path-alias @ngworker/lumberjack/console-driver
+     - run: yarn delete-path-alias @ngworker/lumberjack/http-driver
+     - uses: actions/download-artifact@v3
+       with:
+         name: lumberjack-package
+         path: node_modules/@ngworker/lumberjack
+     - run: npx ngcc || true
+
+     - if: matrix.angular-version == '9.0.x' || matrix.angular-version == '9.1.x'
+       run: yarn delete-commonjs-allowlist
+
+     - run: yarn schematics-e2e
 
 # sonar:
 #   runs-on: ubuntu-latest

diff --git a/jest.config.js b/jest.config.js
@@ -1,4 +1,4 @@
-const { pathsToModuleNameMapper } = require('ts-jest/utils');
+const { pathsToModuleNameMapper } = require('ts-jest');
 const { compilerOptions } = require('./tsconfig');
 
 module.exports = {
@@ -8,4 +8,5 @@ module.exports = {
   preset: 'jest-preset-angular',
   setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
   resetMocks: true,
+  testEnvironment: "jsdom"
 };
diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "@commitlint/config-conventional": "^11.0.0",
     "@types/copy": "^0.3.2",
     "@types/jasmine": "^3.8.2",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^27.5.1",
     "@types/node": "^12.20.20",
     "@types/rimraf": "^3.0.2",
     "@typescript-eslint/eslint-plugin": "4.16.1",
@@ -86,7 +86,8 @@
     "glob": "^7.1.7",
     "husky": "^4.3.8",
     "jasmine-spec-reporter": "^6.0.0",
-    "jest": "^27.0.6",
+    "jest": "^27.5.1",
+    "jest-preset-angular": "^9.0.7",
     "json": "^10.0.0",
     "lint-staged": "^10.5.3",
     "ng-packagr": "^12.2.0",
@@ -96,6 +97,8 @@
     "replace-in-file": "^6.2.0",
     "rimraf": "^3.0.2",
     "standard-version": "^9.1.0",
+    "ts-jest": "^27.1.5",
+    "ts-loader": "^8.4.0",
     "ts-node": "~8.3.0",
     "typescript": "~4.3.5"
   },