Skip to content

Commit

Permalink
2022 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
dtauer committed Mar 25, 2022
1 parent 71e4ae2 commit 87abce0
Show file tree
Hide file tree
Showing 13 changed files with 54 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"useTabs": false,
"semi": false,
"singleQuote": true,
"trailingComma": 'all',
"trailingComma": "all",
"bracketSpacing": false,
"jsxBracketSameLine": false
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sudo: false
language: node_js
node_js: 8
node_js: 16
addons:
apt:
packages:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ you're working with.
## System Requirements

- [git][git] v2.14.1 or greater
- [NodeJS][node] v8.9.4 or greater
- [npm][npm] v5.6.0 or greater
- [NodeJS][node] v16.13.1 or greater
- [npm][npm] v8.3.0 or greater

All of these must be available in your `PATH`. To verify things are set up
properly, you can run this:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
environment:
matrix:
- node_version: "8"
- node_version: "16"

branches:
only:
Expand Down
3 changes: 3 additions & 0 deletions babel.config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-env"]
}
4 changes: 1 addition & 3 deletions client/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ module.exports = {
url: 'https://til.test.com',
},
testPathIgnorePatterns: ['/node_modules/', '/helpers/'],
setupTestFrameworkScriptFile: require.resolve(
'./test/setup-test-framework.js',
),
setupFilesAfterEnv: ['./test/setup-test-framework.js'],
modulePaths: ['<rootDir>/src', '<rootDir>/test'],
moduleNameMapper: {
'\\.svg$': '<rootDir>/test/svg-file-mock.js',
Expand Down
5 changes: 3 additions & 2 deletions cypress/support/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'babel-polyfill'
import 'cypress-testing-library/add-commands'
import "core-js/stable";
import "regenerator-runtime/runtime";
import '@testing-library/cypress'
import './commands'
12 changes: 0 additions & 12 deletions other/whats-a-mock/.babelrc

This file was deleted.

62 changes: 33 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,37 @@
"setup": "node ./scripts/verify && node ./scripts/install && npm run validate && node ./scripts/autofill-feedback-email.js"
},
"devDependencies": {
"all-contributors-cli": "4.10.1",
"as-a": "1.3.1",
"axios": "0.18.0",
"babel-polyfill": "6.26.0",
"babel-preset-env": "1.6.1",
"@babel/plugin-transform-runtime": "^7.17.0",
"@babel/preset-env": "7.16.11",
"@testing-library/cypress": "^8.0.2",
"all-contributors-cli": "6.20.0",
"as-a": "2.2.0",
"axios": "0.26.1",
"child-process-promise": "2.2.1",
"concurrently": "3.5.1",
"cross-env": "5.1.3",
"cross-spawn": "6.0.4",
"cypress": "2.0.2",
"cypress-testing-library": "1.0.1",
"doctoc": "1.3.0",
"eslint": "4.18.0",
"eslint-config-kentcdodds": "13.0.1",
"eslint-import-resolver-jest": "2.1.1",
"eslint-plugin-cypress": "2.0.1",
"faker": "4.1.0",
"fs-extra": "5.0.0",
"husky": "0.14.3",
"inquirer": "5.2.0",
"is-ci": "1.1.0",
"jest": "22.1.2",
"lint-staged": "7.0.4",
"concurrently": "7.0.0",
"cross-env": "7.0.3",
"cross-spawn": "7.0.3",
"cypress": "9.5.2",
"doctoc": "2.1.0",
"eslint": "8.11.0",
"eslint-config-kentcdodds": "20.1.0",
"eslint-import-resolver-jest": "3.0.2",
"eslint-plugin-cypress": "2.12.1",
"faker": "6.6.6",
"fs-extra": "10.0.1",
"husky": "7.0.4",
"inquirer": "8.2.1",
"is-ci": "3.0.1",
"jest": "27.5.1",
"lint-staged": "12.3.7",
"lodash.omit": "4.5.0",
"node": "8.9.4",
"npm-run-all": "4.1.2",
"prettier": "1.12.0",
"npm-run-all": "4.1.5",
"prettier": "2.6.0",
"react": "16.3.1",
"react-dom": "16.3.1",
"react-dom": "16.3.3",
"react-test-renderer": "16.3.1",
"replace-in-file": "3.4.0",
"rimraf": "2.6.2"
"replace-in-file": "6.3.2",
"rimraf": "3.0.2"
},
"lint-staged": {
"linters": {
Expand Down Expand Up @@ -118,5 +117,10 @@
"coverage",
"workshop-setup.js",
"other/coverage-example"
]
],
"dependencies": {
"@babel/runtime": "^7.17.8",
"core-js": "^3.21.1",
"regenerator-runtime": "^0.13.9"
}
}
2 changes: 1 addition & 1 deletion server/dev.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
;(async () => {
require('babel-register')
require('@babel/register')
const serverTestUtils = require('./test/til-server-test-utils')
await serverTestUtils.initDb()
await serverTestUtils.insertTestUser()
Expand Down
15 changes: 6 additions & 9 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"author": "Kent C. Dodds <[email protected]> (http://kentcdodds.com/)",
"license": "MIT",
"dependencies": {
"@babel/polyfill": "^7.12.1",
"axios": "0.18.0",
"body-parser": "1.18.2",
"cors": "2.8.4",
Expand All @@ -35,20 +36,16 @@
},
"babel": {
"presets": [
[
"env",
{
"targets": {
"node": "current"
}
}
]
"@babel/preset-env"
],
"plugins": [
"transform-object-rest-spread"
"transform-object-rest-spread",
"@babel/plugin-transform-runtime"
]
},
"devDependencies": {
"@babel/core": "^7.17.8",
"@babel/register": "^7.17.7",
"babel-cli": "6.26.0",
"babel-core": "6.26.0",
"babel-plugin-transform-object-rest-spread": "6.26.0",
Expand Down
1 change: 1 addition & 0 deletions server/test/til-server-test-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// actually can run synchronously.
import * as generate from 'til-shared/generate'
import db from '../src/utils/db'
import '@babel/polyfill'

async function initDb({
users = Array.from({length: 10}, () =>
Expand Down
1 change: 1 addition & 0 deletions shared/generate.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable prefer-object-spread */
const omit = require('lodash.omit')
const faker = require('faker')
const {getSaltAndHash, getUserToken} = require('./auth')
Expand Down

0 comments on commit 87abce0

Please sign in to comment.