Skip to content

Commit

Permalink
Merge pull request #140 from sitevision/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
albinohrn authored Sep 2, 2024
2 parents b1cf021 + 363282e commit af9b273
Show file tree
Hide file tree
Showing 15 changed files with 3,565 additions and 3,825 deletions.
1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
export PATH=/usr/local/bin:$PATH
yarn precommit
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,16 @@
This is a collection of libraries that will help you build better Sitevision WebApps/RESTApps.

To get started checkout [@sitevision/create-sitevision-app](packages/create-sitevision-app/)

## Changelogs

Changelogs can be found in respective package folders.

- [sitevision-scripts](packages/sitevision-scripts/CHANGELOG.md)
- [create-sitevision-app](packages/create-sitevision-app/CHANGELOG.md)
- [api](packages/api/CHANGELOG.md)
- [babel-preset-react-client](packages/babel-preset-react-client/CHANGELOG.md)
- [babel-preset-react-server](packages/babel-preset-react-server/CHANGELOG.md)
- [eslint-config-recommended](packages/eslint-config-recommended/CHANGELOG.md)
- [eslint-config-typescript](packages/eslint-config-typescript/CHANGELOG.md)
- [eslint-config-webapp-react](packages/eslint-config-webapp-react/CHANGELOG.md)
14 changes: 8 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@
"packages/*"
],
"scripts": {
"postinstall": "husky install",
"prepare": "husky",
"precommit": "lint-staged",
"release:create": "lerna version --conventional-commits",
"release:publish": "lerna publish from-git"
},
"devDependencies": {
"@lerna-lite/cli": "^1.12.0",
"eslint": "^8.27.0",
"husky": "^6.0.0",
"lint-staged": "^11.0.0",
"prettier": "^2.3.0"
"@lerna-lite/cli": "^3.8.0",
"@lerna-lite/publish": "^3.8.0",
"@lerna-lite/version": "^3.8.0",
"eslint": "^8.57.0",
"husky": "^9.1.5",
"lint-staged": "^15.2.9",
"prettier": "^2.8.8"
},
"lint-staged": {
"*.js": "eslint --cache --fix",
Expand Down
12 changes: 6 additions & 6 deletions packages/babel-preset-react-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
"url": "https://github.com/sitevision/sitevision-apps/issues"
},
"dependencies": {
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"core-js": "^3.26.1",
"regenerator-runtime": "0.13.10"
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"core-js": "^3.38.1",
"regenerator-runtime": "^0.14.1"
},
"devDependencies": {
"@babel/core": "^7.20.2"
"@babel/core": "^7.25.2"
},
"peerDependencies": {
"@babel/core": "^7.20.2"
"@babel/core": "^7.25.2"
}
}
10 changes: 5 additions & 5 deletions packages/babel-preset-react-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"url": "https://github.com/sitevision/sitevision-apps/issues"
},
"dependencies": {
"@babel/preset-env": "^7.20.2",
"@babel/preset-react": "^7.18.6",
"@babel/preset-typescript": "7.18.6"
"@babel/preset-env": "^7.25.4",
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7"
},
"devDependencies": {
"@babel/core": "^7.20.2"
"@babel/core": "^7.25.2"
},
"peerDependencies": {
"@babel/core": "^7.20.2"
"@babel/core": "^7.25.2"
}
}
2 changes: 1 addition & 1 deletion packages/create-sitevision-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"chalk": "^5.1.2",
"chalk": "^5.3.0",
"cross-spawn": "^7.0.3"
}
}
4 changes: 2 additions & 2 deletions packages/eslint-config-recommended/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"url": "https://github.com/sitevision/sitevision-apps/issues"
},
"devDependencies": {
"eslint": "^8.27.0"
"eslint": "^8.57.0"
},
"peerDependencies": {
"eslint": "^8.27.0"
"eslint": "^8.57.0"
}
}
8 changes: 4 additions & 4 deletions packages/eslint-config-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"url": "https://github.com/sitevision/sitevision-apps/issues"
},
"devDependencies": {
"eslint": "^8.27.0"
"eslint": "^8.57.0"
},
"peerDependencies": {
"eslint": "^8.27.0"
"eslint": "^8.57.0"
},
"dependencies": {
"@typescript-eslint/eslint-plugin": "^5.3.1",
"@typescript-eslint/parser": "^5.3.1"
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0"
}
}
4 changes: 2 additions & 2 deletions packages/eslint-config-webapp-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"url": "https://github.com/sitevision/sitevision-apps/issues"
},
"devDependencies": {
"eslint": "^8.27.0"
"eslint": "^8.57.0"
},
"peerDependencies": {
"eslint": "^8.27.0"
"eslint": "^8.57.0"
},
"dependencies": {
"eslint-plugin-react": "^7.31.10",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export const getCssLoader = (cssPrefix, emit) => ({
options: {
modules: {
localIdentHashSalt: cssPrefix,
namedExport: false,
},
},
},
Expand Down
59 changes: 30 additions & 29 deletions packages/sitevision-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,48 +18,49 @@
"author": "",
"license": "ISC",
"dependencies": {
"@babel/cli": "^7.19.3",
"@babel/core": "^7.20.2",
"@babel/preset-env": "^7.20.2",
"@babel/preset-typescript": "^7.18.6",
"@jest/globals": "^29.3.1",
"@babel/cli": "^7.24.8",
"@babel/core": "^7.25.2",
"@babel/preset-env": "^7.25.4",
"@babel/preset-typescript": "^7.24.7",
"@jest/globals": "^29.7.0",
"@sitevision/babel-preset-react-client": "^1.0.3",
"@sitevision/babel-preset-react-server": "^1.0.4",
"@sitevision/eslint-config-recommended": "^1.0.3",
"@sitevision/eslint-config-typescript": "^1.0.1",
"@sitevision/eslint-config-webapp-react": "^1.0.3",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/react": "^12.1.5",
"autoprefixer": "^10.4.13",
"babel-jest": "^29.3.1",
"babel-loader": "^9.1.0",
"chalk": "^5.1.2",
"copy-webpack-plugin": "^11.0.0",
"@types/jest": "^29.5.12",
"autoprefixer": "^10.4.20",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
"chalk": "^5.3.0",
"copy-webpack-plugin": "^12.0.2",
"cross-spawn": "^7.0.3",
"css-loader": "^6.7.2",
"eslint": "^8.27.0",
"css-loader": "^7.1.2",
"eslint": "^8.57.0",
"form-data": "^4.0.0",
"fs-extra": "^10.1.0",
"handlebars": "^4.7.7",
"fs-extra": "^11.2.0",
"handlebars": "^4.7.8",
"identity-obj-proxy": "^3.0.0",
"inquirer": "^9.1.4",
"jest": "^29.3.1",
"jest-cli": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"jest": "^29.7.0",
"jest-cli": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"json-loader": "^0.5.7",
"mini-css-extract-plugin": "^2.6.1",
"mini-css-extract-plugin": "^2.9.1",
"mini-svg-data-uri": "^1.4.4",
"node-fetch": "^3.3.0",
"nodemon": "^2.0.20",
"postcss": "^8.4.19",
"postcss-loader": "^7.0.1",
"prettier": "^2.7.1",
"node-fetch": "^3.3.2",
"nodemon": "^3.1.4",
"postcss": "^8.4.41",
"postcss-loader": "^8.1.1",
"prettier": "^2.8.8",
"resolve-bin": "^1.0.1",
"sass": "^1.56.1",
"sass-loader": "^13.2.0",
"ts-loader": "^9.4.1",
"typescript": "^4.9.3",
"webpack": "^5.75.0",
"sass": "^1.77.8",
"sass-loader": "^16.0.1",
"ts-loader": "^9.5.1",
"typescript": "^4.9.5",
"webpack": "^5.94.0",
"zip-dir": "^2.0.0"
}
}
8 changes: 7 additions & 1 deletion packages/sitevision-scripts/scripts/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ import path from 'path';
import { execSync } from 'child_process';
import { getDirname } from '../util/dirname.js';

const setupTestFile = path.resolve(process.cwd(), 'src', 'setupTests.js');
let setupTestFile = path.resolve(process.cwd(), 'src', 'setupTests.ts');

if (!fs.existsSync(setupTestFile)) {
// Fallback to js file
setupTestFile = path.resolve(process.cwd(), 'src', 'setupTests.js');
}

const __dirname = getDirname(import.meta.url);

const config = {
Expand Down
Loading

0 comments on commit af9b273

Please sign in to comment.