Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update jest to fix build break #1531

Merged
merged 3 commits into from
Mar 12, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update jest
  • Loading branch information
nicholasrice committed Mar 12, 2019
commit 2ad7e85c7a1cc03974968660bd71a475d32ae08a
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
aliases:
- &container_config
docker:
- image: "circleci/node:11.10.0"
- image: "circleci/node:latest"
working_directory: ~/fast-dna

- &node_install
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,25 +79,25 @@
},
"devDependencies": {
"@microsoft/fast-tslint-rules": "^3.0.0",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.4.7",
"babel-core": "^6.26.0",
"babel-jest": "^23.6.0",
"babel-jest": "^24.5.0",
"babel-preset-env": "^1.6.1",
"chalk": "^2.4.2",
"docusaurus-init": "^1.0.2",
"dotenv": "^6.0.0",
"eyes.selenium": "3.6.2",
"glob": "^7.1.2",
"husky": "^1.1.2",
"jest": "^23.6.0",
"jest": "^24.5.0",
"lerna": "3.11.1",
"lint-staged": "^7.3.0",
"markdown-it": "^8.4.1",
"prettier": "1.14.3",
"rimraf": "^2.6.2",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"ts-node": "^5.0.1",
"tslint": "^5.9.1",
"typedoc": "^0.14.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-animation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"global": {
"statements": 72,
"branches": 57,
"functions": 68,
"functions": 67,
"lines": 72
}
},
Expand All @@ -58,7 +58,7 @@
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/node": "^7.0.22",
"@types/react": "^15.0.24",
"@types/react-dom": "^15.5.0",
Expand All @@ -70,7 +70,7 @@
"file-loader": "^3.0.1",
"fork-ts-checker-webpack-plugin": "^0.4.0",
"html-webpack-plugin": "^3.2.0",
"jest": "^23.6.0",
"jest": "^24.5.0",
"lodash-es": "^4.0.0",
"mini-css-extract-plugin": "^0.5.0",
"modernizr-webpack-plugin": "^1.0.5",
Expand All @@ -82,7 +82,7 @@
"react-router": "^4.1.1",
"require-dir": "^0.3.2",
"style-loader": "^0.13.2",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"tslint": "^5.3.2",
"tslint-config-prettier": "^1.15.0",
"tslint-loader": "^3.5.3",
Expand Down
12 changes: 6 additions & 6 deletions packages/fast-application-utilities/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"collectCoverage": true,
"coverageThreshold": {
"global": {
"statements": 87,
"statements": 85,
"branches": 75,
"functions": 100,
"lines": 87
"lines": 85
}
},
"testURL": "http://localhost",
Expand All @@ -63,14 +63,14 @@
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"jest": "^23.6.0",
"babel-jest": "^24.5.0",
"jest": "^24.5.0",
"lodash-es": "^4.0.0",
"prettier": "1.14.3",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"ts-loader": "^4.0.1",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-breakpoint-tracker-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,22 @@
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.0.0",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.4.6",
"@types/react": "^16.4.18",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-jest": "^24.5.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"exenv-es6": "^1.0.0",
"jest": "^23.0.0",
"jest": "^24.5.0",
"lodash-es": "^4.0.0",
"prettier": "1.14.3",
"react": "^16.6.0",
"react-dom": "^16.6.0",
"react-test-renderer": "^16.2.0",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
"typescript": "^3.0.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/fast-colors/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"babel-core": "^7.0.0-bridge.0",
"chroma-js": "^1.3.0",
"jest": "^23.6.0",
"jest": "^24.5.0",
"prettier": "1.14.3",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
"typescript": "^3.0.1"
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-components-foundation-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.4.6",
"@types/react": "^16.4.18",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-jest": "^24.5.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"exenv-es6": "^1.0.0",
"jest": "^23.6.0",
"jest": "^24.5.0",
"jsdom-global": "^3.0.2",
"lodash-es": "^4.0.0",
"prettier": "1.14.3",
"react": "^16.6.0",
"react-dom": "^16.6.0",
"react-test-renderer": "^16.3.0",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"ts-loader": "^4.0.1",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-components-react-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,18 @@
"@microsoft/fast-tslint-rules": "^3.0.2",
"@microsoft/fast-web-utilities": "^3.1.2",
"@types/enzyme": "^3.1.15",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.4.6",
"@types/react": "^16.3.6",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-jest": "^24.5.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"exenv-es6": "^1.0.0",
"glob": "^7.1.2",
"html-webpack-plugin": "^3.0.4",
"jest": "^23.6.0",
"jest": "^24.5.0",
"jsdom-global": "^3.0.2",
"lodash-es": "^4.0.0",
"prettier": "1.14.3",
Expand All @@ -98,7 +98,7 @@
"react-test-renderer": "^16.3.0",
"regenerator-runtime": "^0.11.1",
"rimraf": "^2.6.2",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"ts-loader": "^4.0.1",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-components-react-msft/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@
"@microsoft/fast-jss-manager": "^3.0.12",
"@microsoft/fast-sketch-library": "^3.0.5",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.4.6",
"@types/react": "^16.4.18",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-jest": "^24.5.0",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"exenv-es6": "^1.0.0",
Expand All @@ -95,13 +95,13 @@
"file-loader": "^1.1.11",
"focus-visible": "^4.1.5",
"html-webpack-plugin": "^3.0.4",
"jest": "^23.6.0",
"jest": "^24.5.0",
"lodash-es": "^4.0.0",
"prettier": "1.14.3",
"react": "^16.6.0",
"react-dom": "^16.6.0",
"rimraf": "^2.6.2",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"ts-loader": "^4.0.1",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-css-editor-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,22 +79,22 @@
"@microsoft/fast-jss-utilities": "^3.2.4",
"@microsoft/fast-sketch-library": "^3.0.5",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.4.6",
"@types/react": "^16.4.18",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-jest": "^24.5.0",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.7.0",
"html-webpack-plugin": "^3.0.4",
"jest": "^23.6.0",
"jest": "^24.5.0",
"lodash-es": "^4.0.0",
"prettier": "1.14.3",
"react": "^16.6.0",
"react-dom": "^16.6.0",
"react-test-renderer": "^16.6.3",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"ts-loader": "^4.0.1",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-data-utilities-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.6.7",
"@types/react": "^16.3.6",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"jest": "^23.6.0",
"babel-jest": "^24.5.0",
"jest": "^24.5.0",
"lodash-es": "^4.0.0",
"prettier": "1.14.3",
"react": "^16.3.0",
"rimraf": "^2.6.2",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
"tslint-react": "^3.5.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-form-generator-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@
"@microsoft/fast-permutator": "^2.2.6",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/enzyme": "^3.1.15",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.6.2",
"@types/react": "^16.4.18",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"babel-jest": "^24.5.0",
"enzyme": "^3.7.0",
"enzyme-adapter-react-16": "^1.7.0",
"exenv-es6": "^1.0.0",
"fork-ts-checker-webpack-plugin": "^0.4.1",
"glob": "^7.1.2",
"html-webpack-plugin": "^3.2.0",
"jest": "^23.6.0",
"jest": "^24.5.0",
"lodash-es": "^4.0.0",
"mkdirp": "^0.5.1",
"path": "^0.12.7",
Expand All @@ -103,7 +103,7 @@
"react-dom": "^16.6.0",
"react-redux": "^5.0.7",
"react-sortable-hoc": "^0.6.8",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"ts-loader": "^4.2.0",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/fast-jest-snapshots-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@
},
"devDependencies": {
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^23.3.5",
"@types/jest": "^24.0.11",
"@types/react": "^16.4.18",
"jest": "^23.6.0",
"jest": "^24.5.0",
"prettier": "1.14.3",
"react": "^16.6.0",
"ts-jest": "^23.10.4",
"ts-jest": "^24.0.0",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
"typescript": "^3.0.1"
Expand All @@ -68,7 +68,7 @@
"react-test-renderer": "^16.3.0"
},
"peerDependencies": {
"jest": "^22.0.0 || ^23.0.0",
"jest": "^22.0.0 || ^23.0.0 || ^24.0.0",
"react": "^16.6.0"
}
}
10 changes: 5 additions & 5 deletions packages/fast-jss-manager-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"coverageThreshold": {
"global": {
"statements": 41,
"branches": 6,
"branches": 0,
"functions": 20,
"lines": 40
}
Expand Down Expand Up @@ -69,21 +69,21 @@
"@angular/platform-browser-dynamic": "^5.2.9",
"@babel/preset-env": "^7.1.0",
"@microsoft/fast-tslint-rules": "^3.0.2",
"@types/jest": "^22.1.2",
"@types/jest": "^24.0.11",
"@types/lodash-es": "^4.17.0",
"@types/node": "^9.4.6",
"babel-jest": "^22.4.3",
"babel-jest": "^24.5.0",
"core-js": "^2.4.1",
"fork-ts-checker-webpack-plugin": "^0.4.2",
"html-webpack-plugin": "^3.2.0",
"jest": "^22.3.0",
"jest": "^24.5.0",
"jest-preset-angular": "^5.2.1",
"jss": "^9.8.0",
"jss-preset-default": "^4.3.0",
"lodash-es": "^4.0.0",
"prettier": "1.14.3",
"rxjs": "^5.5.6",
"ts-jest": "^22.0.4",
"ts-jest": "^24.0.0",
"ts-loader": "^4.4.1",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.15.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/fast-jss-manager-angular/src/manage-jss.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, ElementRef, Input, SimpleChanges } from "@angular/core";
import { SheetsManager, StyleSheet } from "jss";
import { SheetsManager } from "jss";
import { ComponentStyles } from "@microsoft/fast-jss-manager";
import { eventNames } from "./utilities/get-event-names";
import jss, { stylesheetManager } from "./jss";
import jss, { stylesheetManager } from "./jss-instance";

/**
* State interface for JSS manager
Expand Down
Loading