@modern-js/plugin-testing 2.9.0 → 2.10.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @modern-js/plugin-testing
 
+## 2.10.0
+
+### Patch Changes
+
+- 0da32d0: chore: upgrade jest and puppeteer
+  chore: 升级 jest 和 puppeteer 到 latest
+- 0d9962b: fix: add types field in package.json
+  fix: 添加 package.json 中的 types 字段
+- Updated dependencies [d8bbf28]
+- Updated dependencies [a8db932]
+- Updated dependencies [3e0bd50]
+- Updated dependencies [92d247f]
+- Updated dependencies [0da32d0]
+- Updated dependencies [0d9962b]
+- Updated dependencies [5766414]
+- Updated dependencies [fbefa7e]
+- Updated dependencies [4d54233]
+- Updated dependencies [6db4864]
+- Updated dependencies [950e138]
+  - @modern-js/prod-server@2.10.0
+  - @modern-js/babel-preset-app@2.10.0
+  - @modern-js/runtime@2.10.0
+  - @modern-js/babel-compiler@2.10.0
+  - @modern-js/plugin@2.10.0
+  - @modern-js/utils@2.10.0
+
 ## 2.9.0
 
 ### Patch Changes

package/dist/cjs/base/config/patches/transformer.js

@@ -50,17 +50,10 @@ const patchTransformer = (testOperator) => {
     });
   }
   if (transformer === "ts-jest") {
+    const compilerOptions = resolveTsCompilerOptions();
     testOperator.mergeJestConfig({
       transform: {
-        "\\.[jt]sx?$": require.resolve("ts-jest")
-      }
-    });
-    const compilerOptions = resolveTsCompilerOptions();
-    compilerOptions && testOperator.mergeJestConfig({
-      globals: {
-        "ts-jest": {
-          tsconfig: compilerOptions
-        }
+        "\\.[jt]sx?$": [require.resolve("ts-jest"), compilerOptions || {}]
       }
     });
   }

package/dist/cjs/cli/bff/index.js

@@ -50,11 +50,6 @@ const setJestConfigForBFF = async ({
     testEnvironment: "node",
     testMatch: [`**/api/**/*.test.[jt]s`],
     globals: {
-      "ts-jest": {
-        diagnostics: {
-          warnOnly: true
-        }
-      },
       [import_constant.bff_info_key]: {
         appDir: pwd,
         modernUserConfig: userConfig,
@@ -68,7 +63,14 @@ const setJestConfigForBFF = async ({
   const aliasMapper = (0, import_base.getModuleNameMapper)(alias);
   const { moduleNameMapper } = jestConfig;
   const transform = {
-    "\\.[jt]sx?$": require.resolve("ts-jest")
+    "\\.[jt]sx?$": [
+      require.resolve("ts-jest"),
+      {
+        diagnostics: {
+          warnOnly: true
+        }
+      }
+    ]
   };
   const apiOnly = await (0, import_utils.isApiOnly)(pwd);
   const mergedModuleNameMapper = {

package/dist/esm/base/config/patches/transformer.js

@@ -18,17 +18,13 @@ var patchTransformer = function(testOperator) {
         });
     }
     if (transformer === "ts-jest") {
+        var compilerOptions = resolveTsCompilerOptions();
         testOperator.mergeJestConfig({
             transform: {
-                "\\.[jt]sx?$": require.resolve("ts-jest")
-            }
-        });
-        var compilerOptions = resolveTsCompilerOptions();
-        compilerOptions && testOperator.mergeJestConfig({
-            globals: {
-                "ts-jest": {
-                    tsconfig: compilerOptions
-                }
+                "\\.[jt]sx?$": [
+                    require.resolve("ts-jest"),
+                    compilerOptions || {}
+                ]
             }
         });
     }

package/dist/esm/cli/bff/index.js

@@ -171,13 +171,7 @@ var setJestConfigForBFF = function() {
                         testMatch: [
                             "**/api/**/*.test.[jt]s"
                         ],
-                        globals: _defineProperty({
-                            "ts-jest": {
-                                diagnostics: {
-                                    warnOnly: true
-                                }
-                            }
-                        }, bff_info_key, {
+                        globals: _defineProperty({}, bff_info_key, {
                             appDir: pwd,
                             modernUserConfig: userConfig,
                             plugins: plugins,
@@ -189,7 +183,14 @@ var setJestConfigForBFF = function() {
                     aliasMapper = getModuleNameMapper(alias);
                     moduleNameMapper = jestConfig.moduleNameMapper;
                     transform = {
-                        "\\.[jt]sx?$": require.resolve("ts-jest")
+                        "\\.[jt]sx?$": [
+                            require.resolve("ts-jest"),
+                            {
+                                diagnostics: {
+                                    warnOnly: true
+                                }
+                            }
+                        ]
                     };
                     return [
                         4,

package/dist/esm-node/base/config/patches/transformer.js

@@ -18,17 +18,10 @@ const patchTransformer = (testOperator) => {
     });
   }
   if (transformer === "ts-jest") {
+    const compilerOptions = resolveTsCompilerOptions();
     testOperator.mergeJestConfig({
       transform: {
-        "\\.[jt]sx?$": require.resolve("ts-jest")
-      }
-    });
-    const compilerOptions = resolveTsCompilerOptions();
-    compilerOptions && testOperator.mergeJestConfig({
-      globals: {
-        "ts-jest": {
-          tsconfig: compilerOptions
-        }
+        "\\.[jt]sx?$": [require.resolve("ts-jest"), compilerOptions || {}]
       }
     });
   }

package/dist/esm-node/cli/bff/index.js

@@ -20,11 +20,6 @@ const setJestConfigForBFF = async ({
     testEnvironment: "node",
     testMatch: [`**/api/**/*.test.[jt]s`],
     globals: {
-      "ts-jest": {
-        diagnostics: {
-          warnOnly: true
-        }
-      },
       [bff_info_key]: {
         appDir: pwd,
         modernUserConfig: userConfig,
@@ -38,7 +33,14 @@ const setJestConfigForBFF = async ({
   const aliasMapper = getModuleNameMapper(alias);
   const { moduleNameMapper } = jestConfig;
   const transform = {
-    "\\.[jt]sx?$": require.resolve("ts-jest")
+    "\\.[jt]sx?$": [
+      require.resolve("ts-jest"),
+      {
+        diagnostics: {
+          warnOnly: true
+        }
+      }
+    ]
   };
   const apiOnly = await isApiOnly(pwd);
   const mergedModuleNameMapper = {

package/dist/types/base/config/index.d.ts

@@ -7,121 +7,7 @@ import { TestConfigOperator } from './testConfigOperator';
  */
 
 declare const getJestUtils: (testConfig: TestConfig) => TestConfigOperator;
-declare const patchConfig: (testOperator: TestConfigOperator) => Promise<Partial<{
-  automock: boolean;
-  bail: number | boolean;
-  cache: boolean;
-  cacheDirectory: string;
-  ci: boolean;
-  clearMocks: boolean;
-  changedFilesWithAncestor: boolean;
-  changedSince: string;
-  collectCoverage: boolean;
-  collectCoverageFrom: string[];
-  collectCoverageOnlyFrom: {
-    [key: string]: boolean;
-  };
-  coverageDirectory: string;
-  coveragePathIgnorePatterns: string[];
-  coverageProvider: "babel" | "v8";
-  coverageReporters: import("@jest/types/build/Config").CoverageReporters;
-  coverageThreshold: {
-    [path: string]: import("@jest/types/build/Config").CoverageThresholdValue;
-    global: import("@jest/types/build/Config").CoverageThresholdValue;
-  };
-  dependencyExtractor: string;
-  detectLeaks: boolean;
-  detectOpenHandles: boolean;
-  displayName: string | import("@jest/types/build/Config").DisplayName;
-  expand: boolean;
-  extensionsToTreatAsEsm: string[];
-  extraGlobals: string[];
-  filter: string;
-  findRelatedTests: boolean;
-  forceCoverageMatch: string[];
-  forceExit: boolean;
-  json: boolean;
-  globals: import("@jest/types/build/Config").ConfigGlobals;
-  globalSetup: string | null | undefined;
-  globalTeardown: string | null | undefined;
-  haste: import("@jest/types/build/Config").HasteConfig;
-  injectGlobals: boolean;
-  reporters: (string | import("@jest/types/build/Config").ReporterConfig)[];
-  logHeapUsage: boolean;
-  lastCommit: boolean;
-  listTests: boolean;
-  maxConcurrency: number;
-  maxWorkers: string | number;
-  moduleDirectories: string[];
-  moduleFileExtensions: string[];
-  moduleLoader: string;
-  moduleNameMapper: {
-    [key: string]: string | string[];
-  };
-  modulePathIgnorePatterns: string[];
-  modulePaths: string[];
-  name: string;
-  noStackTrace: boolean;
-  notify: boolean;
-  notifyMode: string;
-  onlyChanged: boolean;
-  onlyFailures: boolean;
-  outputFile: string;
-  passWithNoTests: boolean;
-  preprocessorIgnorePatterns: string[];
-  preset: string | null | undefined;
-  prettierPath: string | null | undefined;
-  projects: (string | import("@jest/types/build/Config").InitialProjectOptions)[];
-  replname: string | null | undefined;
-  resetMocks: boolean;
-  resetModules: boolean;
-  resolver: string | null | undefined;
-  restoreMocks: boolean;
-  rootDir: string;
-  roots: string[];
-  runner: string;
-  runTestsByPath: boolean;
-  scriptPreprocessor: string;
-  setupFiles: string[];
-  setupTestFrameworkScriptFile: string;
-  setupFilesAfterEnv: string[];
-  silent: boolean;
-  skipFilter: boolean;
-  skipNodeResolution: boolean;
-  slowTestThreshold: number;
-  snapshotResolver: string;
-  snapshotSerializers: string[];
-  snapshotFormat: import("@jest/types/build/Config").PrettyFormatOptions;
-  errorOnDeprecated: boolean;
-  testEnvironment: string;
-  testEnvironmentOptions: Record<string, unknown>;
-  testFailureExitCode: string | number;
-  testLocationInResults: boolean;
-  testMatch: string[];
-  testNamePattern: string;
-  testPathDirs: string[];
-  testPathIgnorePatterns: string[];
-  testRegex: string | string[];
-  testResultsProcessor: string;
-  testRunner: string;
-  testSequencer: string;
-  testURL: string;
-  testTimeout: number;
-  timers: "legacy" | "modern" | "real" | "fake";
-  transform: {
-    [regex: string]: string | import("@jest/types/build/Config").TransformerConfig;
-  };
-  transformIgnorePatterns: string[];
-  watchPathIgnorePatterns: string[];
-  unmockedModulePathPatterns: string[];
-  updateSnapshot: boolean;
-  useStderr: boolean;
-  verbose?: boolean | undefined;
-  watch: boolean;
-  watchAll: boolean;
-  watchman: boolean;
-  watchPlugins: (string | [string, Record<string, unknown>])[];
-}>>;
+declare const patchConfig: (testOperator: TestConfigOperator) => Promise<JestConfigTypes.InitialOptions>;
 export declare const DEFAULT_RESOLVER_PATH: string;
 export type UserConfig = {
   source?: {

package/dist/types/base/config/testConfigOperator.d.ts

@@ -14,121 +14,7 @@ declare class TestConfigOperator {
   setJestConfig(sourceConfig: JestConfig, options?: {
     force: boolean;
   }): void;
-  getFinalConfig(): Partial<{
-    automock: boolean;
-    bail: number | boolean;
-    cache: boolean;
-    cacheDirectory: string;
-    ci: boolean;
-    clearMocks: boolean;
-    changedFilesWithAncestor: boolean;
-    changedSince: string;
-    collectCoverage: boolean;
-    collectCoverageFrom: string[];
-    collectCoverageOnlyFrom: {
-      [key: string]: boolean;
-    };
-    coverageDirectory: string;
-    coveragePathIgnorePatterns: string[];
-    coverageProvider: "babel" | "v8";
-    coverageReporters: import("@jest/types/build/Config").CoverageReporters;
-    coverageThreshold: {
-      [path: string]: import("@jest/types/build/Config").CoverageThresholdValue;
-      global: import("@jest/types/build/Config").CoverageThresholdValue;
-    };
-    dependencyExtractor: string;
-    detectLeaks: boolean;
-    detectOpenHandles: boolean;
-    displayName: string | import("@jest/types/build/Config").DisplayName;
-    expand: boolean;
-    extensionsToTreatAsEsm: string[];
-    extraGlobals: string[];
-    filter: string;
-    findRelatedTests: boolean;
-    forceCoverageMatch: string[];
-    forceExit: boolean;
-    json: boolean;
-    globals: import("@jest/types/build/Config").ConfigGlobals;
-    globalSetup: string | null | undefined;
-    globalTeardown: string | null | undefined;
-    haste: import("@jest/types/build/Config").HasteConfig;
-    injectGlobals: boolean;
-    reporters: (string | import("@jest/types/build/Config").ReporterConfig)[];
-    logHeapUsage: boolean;
-    lastCommit: boolean;
-    listTests: boolean;
-    maxConcurrency: number;
-    maxWorkers: string | number;
-    moduleDirectories: string[];
-    moduleFileExtensions: string[];
-    moduleLoader: string;
-    moduleNameMapper: {
-      [key: string]: string | string[];
-    };
-    modulePathIgnorePatterns: string[];
-    modulePaths: string[];
-    name: string;
-    noStackTrace: boolean;
-    notify: boolean;
-    notifyMode: string;
-    onlyChanged: boolean;
-    onlyFailures: boolean;
-    outputFile: string;
-    passWithNoTests: boolean;
-    preprocessorIgnorePatterns: string[];
-    preset: string | null | undefined;
-    prettierPath: string | null | undefined;
-    projects: (string | import("@jest/types/build/Config").InitialProjectOptions)[];
-    replname: string | null | undefined;
-    resetMocks: boolean;
-    resetModules: boolean;
-    resolver: string | null | undefined;
-    restoreMocks: boolean;
-    rootDir: string;
-    roots: string[];
-    runner: string;
-    runTestsByPath: boolean;
-    scriptPreprocessor: string;
-    setupFiles: string[];
-    setupTestFrameworkScriptFile: string;
-    setupFilesAfterEnv: string[];
-    silent: boolean;
-    skipFilter: boolean;
-    skipNodeResolution: boolean;
-    slowTestThreshold: number;
-    snapshotResolver: string;
-    snapshotSerializers: string[];
-    snapshotFormat: import("@jest/types/build/Config").PrettyFormatOptions;
-    errorOnDeprecated: boolean;
-    testEnvironment: string;
-    testEnvironmentOptions: Record<string, unknown>;
-    testFailureExitCode: string | number;
-    testLocationInResults: boolean;
-    testMatch: string[];
-    testNamePattern: string;
-    testPathDirs: string[];
-    testPathIgnorePatterns: string[];
-    testRegex: string | string[];
-    testResultsProcessor: string;
-    testRunner: string;
-    testSequencer: string;
-    testURL: string;
-    testTimeout: number;
-    timers: "legacy" | "modern" | "real" | "fake";
-    transform: {
-      [regex: string]: string | import("@jest/types/build/Config").TransformerConfig;
-    };
-    transformIgnorePatterns: string[];
-    watchPathIgnorePatterns: string[];
-    unmockedModulePathPatterns: string[];
-    updateSnapshot: boolean;
-    useStderr: boolean;
-    verbose?: boolean | undefined;
-    watch: boolean;
-    watchAll: boolean;
-    watchman: boolean;
-    watchPlugins: (string | [string, Record<string, unknown>])[];
-  }>;
+  getFinalConfig(): any;
 }
 
 export { TestConfigOperator };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.9.0",
+  "version": "2.10.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "main": "./dist/cjs/cli/index.js",
@@ -27,6 +27,7 @@
     },
     ".": {
       "jsnext:source": "./src/cli/index.ts",
+      "types": "./dist/types/cli/index.d.ts",
       "default": "./dist/cjs/cli/index.js"
     },
     "./runtime": {
@@ -35,6 +36,7 @@
         "import": "./dist/esm-node/runtime-testing/index.js",
         "require": "./dist/cjs/runtime-testing/index.js"
       },
+      "types": "./dist/types/runtime-testing/index.d.ts",
       "default": "./dist/esm/runtime-testing/index.js"
     },
     "./runtime-base": {
@@ -43,18 +45,22 @@
         "import": "./dist/esm-node/runtime-testing/base.js",
         "require": "./dist/cjs/runtime-testing/base.js"
       },
+      "types": "./dist/types/runtime-testing/base.d.ts",
       "default": "./dist/esm/runtime-testing/base.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
+      "types": "./dist/types/cli/index.d.ts",
       "default": "./dist/cjs/cli/index.js"
     },
     "./bff-cli": {
       "jsnext:source": "./src/cli/bff/index.ts",
+      "types": "./dist/types/cli/bff/index.d.ts",
       "default": "./dist/cjs/cli/bff/index.js"
     },
     "./base": {
       "jsnext:source": "./src/base/index.ts",
+      "types": "./dist/types/base/index.d.ts",
       "default": "./dist/cjs/base/index.js"
     }
   },
@@ -97,25 +103,26 @@
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^13.4.0",
     "@types/testing-library__jest-dom": "^5.14.3",
-    "jest-environment-node": "^27.2.2",
     "path-to-regexp": "^6.2.0",
     "supertest": "^6.1.6",
     "babel-jest": "^27.0.6",
     "enhanced-resolve": "^5.8.3",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^27.0.6",
-    "ts-jest": "^27.0.4",
+    "jest": "^29.5.0",
+    "jest-environment-jsdom": "^29.5.0",
+    "@jest/types": "^29.5.0",
+    "ts-jest": "^29.0.5",
     "yargs": "^17.0.1",
-    "@modern-js/babel-compiler": "2.9.0",
-    "@modern-js/utils": "2.9.0",
-    "@modern-js/babel-preset-app": "2.9.0",
-    "@modern-js/plugin": "2.9.0",
-    "@modern-js/prod-server": "2.9.0"
+    "@modern-js/babel-compiler": "2.10.0",
+    "@modern-js/utils": "2.10.0",
+    "@modern-js/babel-preset-app": "2.10.0",
+    "@modern-js/plugin": "2.10.0",
+    "@modern-js/prod-server": "2.10.0"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17",
-    "@modern-js/runtime": "^2.9.0"
+    "@modern-js/runtime": "^2.10.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -125,19 +132,17 @@
   "devDependencies": {
     "react": "^18",
     "react-dom": "^18",
-    "@types/jest": "^27",
+    "@types/jest": "^29",
     "@types/supertest": "^2.0.11",
     "@types/node": "^14",
     "@types/yargs": "^17.0.2",
-    "@jest/types": "^27.0.6",
-    "jest": "^27",
     "typescript": "^4",
-    "@modern-js/core": "2.9.0",
-    "@modern-js/types": "2.9.0",
-    "@modern-js/runtime": "2.9.0",
-    "@modern-js/bff-core": "2.9.0",
-    "@scripts/build": "2.9.0",
-    "@scripts/jest-config": "2.9.0"
+    "@modern-js/core": "2.10.0",
+    "@modern-js/types": "2.10.0",
+    "@modern-js/runtime": "2.10.0",
+    "@modern-js/bff-core": "2.10.0",
+    "@scripts/build": "2.10.0",
+    "@scripts/jest-config": "2.10.0"
   },
   "sideEffects": false,
   "modernConfig": {},