Skip to content

Commit

Permalink
Merge pull request #123 from paulogoncalvs/development
Browse files Browse the repository at this point in the history
Sync master < development
  • Loading branch information
paulogoncalvs committed Mar 8, 2024
2 parents e0a2048 + b0eb7be commit 3777d27
Show file tree
Hide file tree
Showing 33 changed files with 4,567 additions and 20,611 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/test.yml → .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,18 @@ jobs:
yarn lint
- name: Run Tests - Jest
run: yarn tests:jest
- name: Runu Tests - Playwright
- name: Run Tests - Playwright
run: |
yarn tests:pw:build
yarn tests:pw:run
- name: Upload results
uses: actions/upload-artifact@v4
if: always()
with:
name: pw-results
path: src/tests/playwright/results
- name: Upload reports
uses: actions/upload-artifact@v4
with:
name: pw-report
path: src/tests/playwright/report
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
node_modules
dist
src/tests/**/results
src/tests/**/report.pnp/*
src/tests/**/report
stats.json
todo.md
public/sitemap.xml
Expand Down
18 changes: 12 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"editor.formatOnSave": false
},
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"editor.formatOnSave": false
},
"[json]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"editor.formatOnSave": false
},
Expand All @@ -27,7 +27,7 @@
"typescriptreact"
],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"css.validate": false,
"less.validate": false,
Expand All @@ -39,7 +39,13 @@
"**/.pnp.*": true
},
"eslint.nodePath": ".yarn/sdks",
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
"prettier.requireConfig": true,
"prettier.configPath": "./prettier.config.cjs",
"typescript.tsdk": ".yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true
"typescript.enablePromptUseWorkspaceTsdk": true,
"[javascript][json][typescript]": {
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
}
}
}
9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.0.0.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.1.0.cjs

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,4 @@ nmMode: hardlinks-local

nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: '@yarnpkg/plugin-typescript'

yarnPath: .yarn/releases/yarn-4.0.0.cjs
yarnPath: .yarn/releases/yarn-4.1.0.cjs
66 changes: 33 additions & 33 deletions README.MD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Paulo Gonçalves Website

[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/paulogoncalvs/pg-web)
[![Website shields.io](https://img.shields.io/website-up-down-green-red/http/shields.io.svg)](https://www.paulogoncalves.dev/)
[![CI](https://github.com/paulogoncalvs/pg-web/actions/workflows/test.yml/badge.svg)](https://github.com/paulogoncalvs/pg-web/actions/workflows/test.yml)

## Configuration

Expand All @@ -14,42 +14,42 @@ Create `.env.development` and `.env.production` based on `.env.dist`.
<details>
<summary>List</summary>

| COMMAND | DESCRIPTION |
|:-------------------------------|-------------------------------------------------|
| **BUILD** | |
| `yarn prebuild` | Generate sitemap |
| `yarn build` | Generate dist |
| **SERVER** | |
| `yarn start:dev` | Start **Development** server |
| `yarn start:prod` | Generate dist + Start **Production** server |
| `yarn start:prod:server` | Start Production server without dist generation |
| **TESTS** | |
| `yarn tests:jest` | Run Jest tests |
| `yarn tests:jest:update` | Update Jest tests |
| `yarn tests:pw` | Generate dist + Run Playwright tests |
| `yarn tests:pw:update` | Generate dist + Update Playwright tests |
| `yarn tests:pw:run` | Run Playwright tests without dist generation |
| `yarn tests:pw:build` | Build Playwright docker image |
| `yarn tests` | Run all tests |
| `yarn tests:update` | Update all tests |
| **PRETTIFY** | |
| `yarn prettify` | Code formatting - Check |
| `yarn prettify:fix` | Code formatting - Fix |
| **LINT** | |
| `yarn lint:ts` | Lint TypeScript |
| `yarn lint:ts:fix` | Lint TypeScript - Fix |
| `yarn lint:css` | Lint CSS |
| `yarn lint:css:fix` | Lint CSS - Fix |
| `yarn lint` | Lint All |
| `yarn lint:fix` | Lint All - Fix |
| **PACKAGES** | |
| `yarn upgrade:all` | Upgrade all the packages |
| `yarn upgrade:latest` | Upgrades packages to their latest version |
| COMMAND | DESCRIPTION |
| :----------------------- | ----------------------------------------------- |
| **BUILD** | |
| `yarn prebuild` | Generate sitemap |
| `yarn build` | Generate dist |
| **SERVER** | |
| `yarn start:dev` | Start **Development** server |
| `yarn start:prod` | Generate dist + Start **Production** server |
| `yarn start:prod:server` | Start Production server without dist generation |
| **TESTS** | |
| `yarn tests:jest` | Run Jest tests |
| `yarn tests:jest:update` | Update Jest tests |
| `yarn tests:pw` | Generate dist + Run Playwright tests |
| `yarn tests:pw:update` | Generate dist + Update Playwright tests |
| `yarn tests:pw:run` | Run Playwright tests without dist generation |
| `yarn tests:pw:build` | Build Playwright docker image |
| `yarn tests` | Run all tests |
| `yarn tests:update` | Update all tests |
| **PRETTIFY** | |
| `yarn prettify` | Code formatting - Check |
| `yarn prettify:fix` | Code formatting - Fix |
| **LINT** | |
| `yarn lint:ts` | Lint TypeScript |
| `yarn lint:ts:fix` | Lint TypeScript - Fix |
| `yarn lint:css` | Lint CSS |
| `yarn lint:css:fix` | Lint CSS - Fix |
| `yarn lint` | Lint All |
| `yarn lint:fix` | Lint All - Fix |
| **PACKAGES** | |
| `yarn upgrade:all` | Upgrade all the packages |
| `yarn upgrade:latest` | Upgrades packages to their latest version |

</details>

---

**STATUS: WIP**

**Made with Love :heart: in my spare time.**
**Made with Love :heart: in my spare time.**
116 changes: 58 additions & 58 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@paulogoncalvs/pg-web",
"description": "Paulo Gonçalves Website",
"version": "1.2.0",
"version": "1.2.1",
"keywords": [
"preact",
"webpack",
Expand All @@ -19,99 +19,99 @@
"author": "Paulo Gonçalves",
"type": "module",
"devDependencies": {
"@babel/core": "^7.23.2",
"@babel/eslint-parser": "^7.22.15",
"@babel/plugin-transform-async-to-generator": "^7.22.5",
"@babel/plugin-transform-react-jsx": "^7.22.15",
"@babel/plugin-transform-runtime": "^7.23.2",
"@babel/preset-env": "^7.23.2",
"@babel/preset-typescript": "^7.23.2",
"@babel/core": "^7.24.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-transform-async-to-generator": "^7.23.3",
"@babel/plugin-transform-react-jsx": "^7.23.4",
"@babel/plugin-transform-runtime": "^7.24.0",
"@babel/preset-env": "^7.24.0",
"@babel/preset-typescript": "^7.23.3",
"@jest/globals": "^29.7.0",
"@jest/types": "^29.6.3",
"@playwright/test": "^1.39.0",
"@tailwindcss/forms": "^0.5.6",
"@types/jest": "^29.5.6",
"@types/jest-axe": "^3.5.7",
"@types/node": "^20.8.9",
"@playwright/test": "^1.42.1",
"@tailwindcss/forms": "^0.5.7",
"@types/jest": "^29.5.12",
"@types/jest-axe": "^3.5.9",
"@types/node": "^20.11.25",
"@types/prettier": "^3.0.0",
"@types/webpack": "^5.28.4",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.9.0",
"autoprefixer": "^10.4.16",
"@types/webpack": "^5.28.5",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"autoprefixer": "^10.4.18",
"babel-jest": "^29.7.0",
"babel-loader": "^9.1.3",
"classnames": "^2.3.2",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^5.0.1",
"classnames": "^2.5.1",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^6.10.0",
"css-minimizer-webpack-plugin": "^6.0.0",
"dotenv-webpack": "^8.0.1",
"enzyme": "^3.11.0",
"eslint": "^8.52.0",
"eslint": "^8.57.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsx-a11y": "^6.8.0",
"eslint-plugin-react": "^7.34.0",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-tailwindcss": "^3.13.0",
"fork-ts-checker-webpack-plugin": "^9.0.0",
"eslint-plugin-tailwindcss": "^3.14.3",
"fork-ts-checker-webpack-plugin": "^9.0.2",
"html-webpack-deploy-plugin": "^3.0.0",
"html-webpack-plugin": "^5.5.3",
"html-webpack-plugin": "^5.6.0",
"html-webpack-tags-plugin": "^3.0.2",
"http-server": "^14.1.1",
"husky": "^8.0.3",
"husky": "^9.0.11",
"jest": "^29.7.0",
"jest-axe": "^8.0.0",
"jest-environment-jsdom": "^29.7.0",
"jest-environment-node": "^29.7.0",
"jest-serializer-html": "^7.1.0",
"lint-staged": "^15.0.2",
"mini-css-extract-plugin": "^2.7.6",
"postcss": "^8.4.31",
"postcss-import": "^15.1.0",
"postcss-loader": "^7.3.3",
"prettier": "^3.0.3",
"sass": "^1.69.5",
"sass-loader": "^13.3.2",
"style-loader": "^3.3.3",
"stylelint": "^15.11.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-config-standard-scss": "^11.0.0",
"stylelint-webpack-plugin": "^4.1.1",
"lint-staged": "^15.2.2",
"mini-css-extract-plugin": "^2.8.1",
"postcss": "^8.4.35",
"postcss-import": "^16.0.1",
"postcss-loader": "^8.1.1",
"prettier": "^3.2.5",
"sass": "^1.71.1",
"sass-loader": "^14.1.1",
"style-loader": "^3.3.4",
"stylelint": "^16.2.1",
"stylelint-config-standard": "^36.0.0",
"stylelint-config-standard-scss": "^13.0.0",
"stylelint-webpack-plugin": "^5.0.0",
"svg-spritemap-webpack-plugin": "^4.5.0",
"svg-transform-loader": "^2.0.13",
"svgo-loader": "^4.0.0",
"ts-loader": "^9.5.0",
"ts-node": "^10.9.1",
"ts-loader": "^9.5.1",
"ts-node": "^10.9.2",
"tsconfig-paths-jest": "^0.0.1",
"tsconfig-paths-webpack-plugin": "^4.1.0",
"typescript": "^5.2.2",
"webpack": "^5.89.0",
"webpack-bundle-analyzer": "^4.9.1",
"typescript": "^5.4.2",
"webpack": "^5.90.3",
"webpack-bundle-analyzer": "^4.10.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.1",
"webpack-dev-server": "^5.0.2",
"webpack-merge": "^5.10.0",
"workbox-webpack-plugin": "^7.0.0",
"yarn": "^1.22.19",
"yarn": "^1.22.21",
"yarn-upgrade-all": "^0.7.2"
},
"dependencies": {
"preact": "^10.18.1",
"preact-render-to-string": "^6.2.2",
"tailwindcss": "^3.3.5",
"web-vitals": "^3.5.0",
"wouter-preact": "^2.12.1"
"preact": "^10.19.6",
"preact-render-to-string": "^6.4.0",
"tailwindcss": "^3.4.1",
"web-vitals": "^3.5.2",
"wouter-preact": "^3.0.2"
},
"optionalDependencies": {
"fsevents": "^2.3.2"
},
"engines": {
"node": ">=18"
},
"packageManager": "yarn@4.0.0",
"packageManager": "yarn@4.1.0",
"scripts": {
"prebuild": "rm -rf ./dist && ts-node ./src/scripts/generateSitemap.ts",
"prebuild": "rm -rf ./dist && node --loader ts-node/esm ./src/scripts/generateSitemap.ts",
"build": "yarn prebuild && NODE_ENV=production yarn webpack --config webpack/webpack.prod.js",
"start:prod:server": "yarn http-server dist -p 4040",
"start:prod": "yarn build && yarn start:prod:server",
Expand All @@ -124,8 +124,8 @@
"tests:pw:update": "yarn build && yarn tests:pw:run yarn playwright test -u",
"tests": "yarn tests:jest && yarn tests:pw",
"tests:update": "yarn tests:jest:update && yarn tests:pw:update",
"prettify": "yarn prettier '**/*.{cjs,js,jsx,ts,tsx,css,scss,sass,yml,json}' --check",
"prettify:fix": "yarn prettify --write",
"prettify": "yarn prettier . --check",
"prettify:fix": "yarn prettier . --write",
"lint:ts": "tsc --noEmit && eslint . --ext .cjs,.js,.jsx,.ts,.tsx",
"lint:ts:fix": "yarn lint:ts --fix",
"lint:css": "stylelint ./src/**/*.{scss,sass,css}",
Expand Down

0 comments on commit 3777d27

Please sign in to comment.