Update to nx 12 6 (scullyio#1417)

* chore: remove and ignore migrations files * chore: change jest settings to be compatible with jest 27 * chore: clean up * chore(scully): update to puppeteer 10
burke-software · Aug 9, 2021 · b4dfe9e · b4dfe9e
1 parent 532427e
commit b4dfe9e
Show file tree

Hide file tree

Showing 32 changed files with 16,907 additions and 18,652 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,3 +51,5 @@ libs/scully/.vscode/settings.json
 tools/autoVersion.js
 tools/autoVersion.js.map
 test_for_zoneJS.ts
+
+migrations.*
diff --git a/apps/sample-blog/jest.config.js b/apps/sample-blog/jest.config.js
@@ -1,10 +1,5 @@
-// const nxPreset = require('@nrwl/jest/preset');
-const jestPreset = require('../../jest.preset');
-
 module.exports = {
-  ...jestPreset,
-  roots: ['../../tests/jest/src'],
-  preset: '../../jest.config.js',
+  preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/apps/scully-docs/jest.config.js b/apps/scully-docs/jest.config.js
@@ -1,10 +1,5 @@
-// const nxPreset = require('@nrwl/jest/preset');
-const jestPreset = require('../../jest.preset');
-
 module.exports = {
-  ...jestPreset,
-  roots: ['../../tests/jest/src'],
-  preset: '../../jest.config.js',
+  preset: '../../jest.preset.js',
   setupFilesAfterEnv: ['../../tests/jest/src/setup-jest.ts'],
   coverageDirectory: '../../coverage/apps/scully-docs',
   transform: {

diff --git a/apps/scully-docs/src/main.playground.ts b/apps/scully-docs/src/main.playground.ts
diff --git a/jest.config.js b/jest.config.js
@@ -1,20 +1,5 @@
 module.exports = {
   projects: [
-    // '<rootDir>/libs/scully',
-    // '<rootDir>/libs/ng-lib',
-    // '<rootDir>/apps/sample-blog',
-    // '<rootDir>/apps/scully-docs',
-    // '<rootDir>/libs/plugins/extra',
-    '<rootDir>/libs/plugins/from-data',
-    // '<rootDir>/libs/plugins/scully-plugin-local-cache',
-    // '<rootDir>/libs/plugins/base-href-rewrite',
-    // '<rootDir>/libs/plugins/scully-plugin-flash-prevention',
-    // '<rootDir>/libs/plugins/logrocket',
-    // '<rootDir>/libs/plugins/sentry',
-    // '<rootDir>/libs/plugins/google-analytics',
-    // '<rootDir>/libs/plugins/docs-link-update',
-    // '<rootDir>/libs/plugins/scully-plugin-remove-scripts',
-    // '<rootDir>/libs/plugins/scully-plugin-critical-css',
-    // '<rootDir>/libs/plugins/scully-plugin-copy-to-clipboard',
+    '<rootDir>/tests/jest/src'
   ],
 };
diff --git a/jest.preset.js b/jest.preset.js
@@ -1,23 +1,5 @@
+const nxPreset = require('@nrwl/jest/preset');
+
 module.exports = {
-  roots: ['tests/jest/src'],
-  transform: {
-    '^.+\\.(ts|js|html)$': 'ts-jest',
-  },
-  setupFilesAfterEnv: ['./tests/jest/src/setup-jest.ts'],
-  moduleNameMapper: {
-    '@app/(.*)': '<rootDir>/apps/sample-blog/src/app/$1',
-    '@assets/(.*)': '<rootDir>/apps/sample-blog/src/assets/$1',
-    '@env': '<rootDir>/apps/sample-blog/src/environments/environment',
-    '@src/(.*)': '<rootDir>/apps/sample-blog/src/$1',
-    '@scullyio/ng-lib': '<rootDir>/dist/libs/ng-lib',
-  },
-  globals: {
-    'ts-jest': {
-      tsconfig: './tsconfig.spec.json',
-      stringifyContentPathRegex: '\\.html$',
-      astTransformers: {
-        // before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer'],
-      },
-    },
-  },
+  ...nxPreset
 };
diff --git a/libs/plugins/base-href-rewrite/jest.config.js b/libs/plugins/base-href-rewrite/jest.config.js
@@ -1,10 +1,8 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/libs/plugins/docs-link-update/jest.config.js b/libs/plugins/docs-link-update/jest.config.js
@@ -1,10 +1,8 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/libs/plugins/extra/jest.config.js b/libs/plugins/extra/jest.config.js
@@ -1,14 +1,18 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',
   },
+  globals: {
+    'ts-jest': {
+      tsconfig: '<rootDir>/tsconfig.spec.json',
+    },
+  },
+  testEnvironment: 'jsdom',
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   coverageDirectory: '../../../coverage/libs/plugins/extra',
   displayName: 'plugins-extra',

diff --git a/libs/plugins/from-data/jest.config.js b/libs/plugins/from-data/jest.config.js
@@ -1,10 +1,14 @@
-// const nxPreset = require('@nrwl/jest/preset');
-const jestPreset = require('../../../jest.preset');
+
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+  preset: '../../../jest.preset.js',
+  globals: {
+    'ts-jest': {
+      tsconfig: '<rootDir>/tsconfig.spec.json',
+    },
+  },
+  testEnvironment: 'jsdom',
+
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/libs/plugins/google-analytics/jest.config.js b/libs/plugins/google-analytics/jest.config.js
@@ -1,10 +1,8 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/libs/plugins/logrocket/jest.config.js b/libs/plugins/logrocket/jest.config.js
@@ -1,10 +1,8 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/libs/plugins/scully-plugin-copy-to-clipboard/jest.config.js b/libs/plugins/scully-plugin-copy-to-clipboard/jest.config.js
@@ -1,10 +1,8 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   globals: {
     'ts-jest': {

diff --git a/libs/plugins/scully-plugin-critical-css/jest.config.js b/libs/plugins/scully-plugin-critical-css/jest.config.js
@@ -1,10 +1,8 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   globals: {
     'ts-jest': {

diff --git a/libs/plugins/scully-plugin-flash-prevention/jest.config.js b/libs/plugins/scully-plugin-flash-prevention/jest.config.js
@@ -1,10 +1,8 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/libs/plugins/scully-plugin-local-cache/jest.config.js b/libs/plugins/scully-plugin-local-cache/jest.config.js
@@ -1,14 +1,11 @@
+
 module.exports = {
-  displayName: 'local-cache',
   preset: '../../../jest.preset.js',
-  globals: {
-    'ts-jest': {
-      tsConfig: '<rootDir>/tsconfig.spec.json',
-    },
-  },
+  setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',
   },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'],
   coverageDirectory: '../../../coverage/libs/plugins/scully-plugin-local-cache',
+  displayName: 'local-cache',
 };
diff --git a/libs/plugins/scully-plugin-local-cache/src/lib/handlePuppeteerRequest.ts b/libs/plugins/scully-plugin-local-cache/src/lib/handlePuppeteerRequest.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-prototype-builtins */
-import { Request } from 'puppeteer';
+import { HTTPRequest as Request } from 'puppeteer';
 import { config } from './config';
 import { generateId } from './generateId';
 import { del, get } from './ldb';

diff --git a/libs/plugins/scully-plugin-local-cache/src/lib/handlePuppeteerResponse.ts b/libs/plugins/scully-plugin-local-cache/src/lib/handlePuppeteerResponse.ts
@@ -12,7 +12,7 @@ export async function handlePuppeteerResponse(resp: HTTPResponse) {
   try {
     const responseHeaders = resp.headers();
     const id = generateId();
-    if (responseHeaders['from-scully-cache']) {
+    if (responseHeaders['from-scully-cache']==='true') {
       /** no need to reprocess */
       return;
     }
@@ -37,7 +37,7 @@ export async function handlePuppeteerResponse(resp: HTTPResponse) {
       requestHeaders: headers,
       TTL,
       response: {
-        headers: { ...responseHeaders, 'from-scully-cache': true },
+        headers: { ...responseHeaders, 'from-scully-cache': 'true' },
         contentType: resp.headers()['content-type'] || headers['content-type'] || 'umh',
         status: resp.status(),
         body,

diff --git a/libs/plugins/scully-plugin-remove-scripts/jest.config.js b/libs/plugins/scully-plugin-remove-scripts/jest.config.js
@@ -1,10 +1,10 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+preset: '../../../jest.preset.js',
+  preset: '../../../jest.preset.js',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/libs/plugins/sentry/jest.config.js b/libs/plugins/sentry/jest.config.js
@@ -1,10 +1,10 @@
-// const nxPreset = require('@nrwl/jest/preset');
+
 const jestPreset = require('../../../jest.preset');
 
 module.exports = {
-  ...jestPreset,
-  roots: ['../../../tests/jest/src'],
-  preset: '../../../jest.config.js',
+preset: '../../../jest.preset.js',
+  preset: '../../../jest.preset.js',
+  preset: '../../../jest.preset.js',
   setupFilesAfterEnv: ['../../../tests/jest/src/setup-jest.ts'],
   transform: {
     '^.+\\.[tj]sx?$': 'ts-jest',

diff --git a/libs/scully/src/lib/renderPlugins/launchedBrowser.ts b/libs/scully/src/lib/renderPlugins/launchedBrowser.ts
@@ -1,4 +1,4 @@
-import { Browser, launch, LaunchOptions } from 'puppeteer';
+import { Browser, launch, LaunchOptions, BrowserLaunchArgumentOptions } from 'puppeteer';
 import { BehaviorSubject, from, interval, merge, Observable, of, timer } from 'rxjs';
 import { catchError, delayWhen, filter, shareReplay, switchMap, take, throttleTime } from 'rxjs/operators';
 import { captureException } from '../utils/captureMessage';
@@ -53,7 +53,7 @@ export const reLaunch = (reason?: string): Promise<Browser> => {
  * Function that creates an observable with the puppeteer browser inside
  * @param options
  */
-function obsBrowser(options: LaunchOptions = scullyConfig.puppeteerLaunchOptions || {}): Observable<Browser> {
+function obsBrowser(options: any = scullyConfig.puppeteerLaunchOptions || {}): Observable<Browser> {
   if (showBrowser) {
     options.headless = false;
   }
@@ -143,7 +143,7 @@ function launchPuppeteerWithRetry(options, failedLaunches = 0): Promise<Browser>
     /** use a 1 minute timeout to detect a stalled launch of puppeteer */
     timeout(Math.max(/** serverTimeout,*/ 60 * 1000)),
     launch(options).then((b) => {
-      return b;
+      return b as unknown as Browser;
     }),
   ])
     .catch((e) => {
@@ -171,5 +171,5 @@ https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md
 =================================================================================================
       `);
       process.exit(15);
-    });
+    }) as unknown as Promise<Browser>;
 }
diff --git a/migrations.failed..json b/migrations.failed..json