Skip to content

Commit

Permalink
Revert "chore: upgrade jest and puppeteer (web-infra-dev#3163)" (web-…
Browse files Browse the repository at this point in the history
…infra-dev#3166)

This reverts commit fca9731.
  • Loading branch information
caohuilin committed Mar 16, 2023
1 parent c61aabf commit 9bc2706
Show file tree
Hide file tree
Showing 126 changed files with 1,718 additions and 2,286 deletions.
80 changes: 0 additions & 80 deletions .changeset/dull-eyes-dream.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/integration-test-Windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:

- name: Install Puppeteer
if: ${{steps.docs-change.outputs.DOCS_CHANGE != 'docs only change'}}
run: cd ./tests/node_modules/puppeteer && npm run postinstall && cd ../..
run: cd ./tests/node_modules/puppeteer && npm run install && cd ../..

- name: Test
if: ${{steps.docs-change.outputs.DOCS_CHANGE != 'docs only change'}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test-macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

- name: Install Puppeteer
if: ${{steps.docs-change.outputs.DOCS_CHANGE != 'docs only change'}}
run: cd ./tests/node_modules/puppeteer && npm run postinstall && cd ../..
run: cd ./tests/node_modules/puppeteer && npm run install && cd ../..

- name: Test
if: ${{steps.docs-change.outputs.DOCS_CHANGE != 'docs only change'}}
Expand Down
26 changes: 10 additions & 16 deletions jestEnv.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
const { TestEnvironment } = require('jest-environment-jsdom');
const JsdomEnvironment = require('jest-environment-jsdom');

// https://github.com/facebook/jest/issues/4422
class JestEnvironment extends TestEnvironment {
constructor(config, testEnvironmentContext) {
super(
{
...config,
projectConfig: {
...config.projectConfig,
globals: {
...config.projectConfig.globals,
Uint8Array,
ArrayBuffer,
},
},
class JestEnvironment extends JsdomEnvironment {
constructor(config) {
super({
...config,
globals: {
...config.globals,
Uint8Array,
ArrayBuffer,
},
testEnvironmentContext,
);
});
}
}

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
"execa": "^5.1.1",
"globby": "^11.0.4",
"husky": "^8.0.0",
"jest": "^29.5.0",
"jest-environment-jsdom": "^29.5.0",
"jest": "^27.5.1",
"jest-environment-jsdom": "^27.2.2",
"turbo": "^1.6.3",
"vitest": "0.21.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/babel-preset-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
"core-js": "^3.26.0"
},
"devDependencies": {
"@types/jest": "^29",
"@types/jest": "^27",
"@types/node": "^14",
"typescript": "^4",
"@scripts/build": "workspace:*",
"jest": "^29",
"jest": "^27",
"@scripts/jest-config": "workspace:*"
},
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/babel-preset-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
"devDependencies": {
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@types/jest": "^29",
"@types/jest": "^27",
"@types/node": "^14",
"jest": "^29",
"jest": "^27",
"typescript": "^4"
},
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/babel-preset-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
},
"devDependencies": {
"@types/babel__core": "^7.1.15",
"@types/jest": "^29",
"@types/jest": "^27",
"@types/node": "^14",
"typescript": "^4",
"@scripts/build": "workspace:*",
"jest": "^29",
"jest": "^27",
"@scripts/jest-config": "workspace:*"
},
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/babel-preset-module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
},
"devDependencies": {
"@types/babel__core": "^7.1.15",
"@types/jest": "^29",
"@types/jest": "^27",
"@types/node": "^14",
"typescript": "^4",
"@scripts/build": "workspace:*",
"jest": "^29",
"jest": "^27",
"@scripts/jest-config": "workspace:*"
},
"sideEffects": false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`importPath babel plugin import/require static file, options is { staticDir: './static-dir'} 1`] = `
"import "./staitc-dir/static/a.json";
import "./staitc-dir/static/b.json";"
"import \\"./staitc-dir/static/a.json\\";
import \\"./staitc-dir/static/b.json\\";"
`;

exports[`importPath babel plugin import/require static file, options is { staticDir: './static-dir'} 2`] = `
"import "./staitc-dir/static/a.json";
import "./staitc-dir/static/b.json";
require("./staitc-dir/static/a.json");
require("./staitc-dir/static/b.json");"
"import \\"./staitc-dir/static/a.json\\";
import \\"./staitc-dir/static/b.json\\";
require(\\"./staitc-dir/static/a.json\\");
require(\\"./staitc-dir/static/b.json\\");"
`;

exports[`importPath babel plugin import/require style file, options is { styleDir: './style-dir' } 1`] = `
"import "./style-dir/a.less";
import "./style-dir/b.scss";
import "./style-dir/c.css";
import "./style-dir/d.sass";"
"import \\"./style-dir/a.less\\";
import \\"./style-dir/b.scss\\";
import \\"./style-dir/c.css\\";
import \\"./style-dir/d.sass\\";"
`;

exports[`importPath babel plugin import/require style file, options is { styleDir: './style-dir' } 2`] = `
"import "./style-dir/a.less";
import "./style-dir/b.scss";
import "./style-dir/c.css";
import "./style-dir/d.sass";
require("./style-dir/a.less");
require("./style-dir/b.scss");
require("./style-dir/c.css");
require("./style-dir/d.sass");"
"import \\"./style-dir/a.less\\";
import \\"./style-dir/b.scss\\";
import \\"./style-dir/c.css\\";
import \\"./style-dir/d.sass\\";
require(\\"./style-dir/a.less\\");
require(\\"./style-dir/b.scss\\");
require(\\"./style-dir/c.css\\");
require(\\"./style-dir/d.sass\\");"
`;

exports[`importPath babel plugin import/require style file, options is { styleDir: './style-dir', importStyle: 'compiled-code' } 1`] = `
"import "./style-dir/a.css";
import "./style-dir/b.css";
import "./style-dir/c.css";
import "./style-dir/d.css";"
"import \\"./style-dir/a.css\\";
import \\"./style-dir/b.css\\";
import \\"./style-dir/c.css\\";
import \\"./style-dir/d.css\\";"
`;

exports[`importPath babel plugin import/require style file, options is { styleDir: './style-dir', importStyle: 'compiled-code' } 2`] = `
"import "./style-dir/a.css";
import "./style-dir/b.css";
import "./style-dir/c.css";
import "./style-dir/d.css";
require("./style-dir/a.css");
require("./style-dir/b.css");
require("./style-dir/c.css");
require("./style-dir/d.css");"
"import \\"./style-dir/a.css\\";
import \\"./style-dir/b.css\\";
import \\"./style-dir/c.css\\";
import \\"./style-dir/d.css\\";
require(\\"./style-dir/a.css\\");
require(\\"./style-dir/b.css\\");
require(\\"./style-dir/c.css\\");
require(\\"./style-dir/d.css\\");"
`;
5 changes: 3 additions & 2 deletions packages/cli/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,21 @@
"@modern-js/utils": "workspace:*"
},
"devDependencies": {
"@jest/types": "^27.0.6",
"@modern-js/builder-shared": "workspace:*",
"@modern-js/babel-preset-app": "workspace:*",
"@modern-js/types": "workspace:*",
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@types/babel__code-frame": "^7.0.3",
"@types/babel__core": "^7.1.16",
"@types/jest": "^29",
"@types/jest": "^27",
"@types/less": "^3.0.3",
"@types/node": "^14",
"autoprefixer": "10.4.13",
"btsm": "2.2.2",
"html-webpack-plugin": "5.5.0",
"jest": "^29",
"jest": "^27",
"postcss": "8.4.21",
"sass": "^1.45.0",
"terser-webpack-plugin": "^5.1.4",
Expand Down
12 changes: 6 additions & 6 deletions packages/cli/core/tests/__snapshots__/mergeConfig.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`assign pkg config should merge properties deeply 1`] = `
{
"runtime": {
Object {
"runtime": Object {
"router": true,
"state": true,
},
}
`;

exports[`assign pkg config should preserve symbol of plugins 1`] = `
{
"plugins": [
{
Object {
"plugins": Array [
Object {
Symbol(test): "test",
},
],
"runtime": {
"runtime": Object {
"router": true,
},
}
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/plugin-bff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@
"@scripts/build": "workspace:*",
"@scripts/jest-config": "workspace:*",
"@types/babel__core": "^7.1.15",
"@types/jest": "^29",
"@types/jest": "^27",
"@types/node": "^14",
"jest": "^29",
"jest": "^27",
"memfs": "^3.3.0",
"ts-jest": "^29.0.5",
"ts-jest": "^27.0.5",
"typescript": "^4",
"webpack": "^5.75.0",
"webpack-chain": "^6.5.1"
Expand Down
Loading

0 comments on commit 9bc2706

Please sign in to comment.