Skip to content

Commit

Permalink
fix: upgrade dependencies (#836)
Browse files Browse the repository at this point in the history
  • Loading branch information
exKAZUu committed Feb 27, 2023
1 parent 9439a52 commit 64dad4d
Show file tree
Hide file tree
Showing 42 changed files with 611 additions and 520 deletions.
8 changes: 8 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Project-specific settings (head)


# Generated by wbfy

**/*.sqlite3*

# Project-specific settings (tail)
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{cjs,cpp,dart,htm,html,js,json,json5,jsx,mjs,pu,puml,rb,ts,tsx,vue,yaml,yml}]
[*.{cjs,cpp,cts,dart,htm,html,js,json,json5,jsx,mjs,mts,pu,puml,rb,ts,tsx,vue,yaml,yml}]
indent_size = 2
indent_style = space

Expand Down
18 changes: 6 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Project-specific settings
# Project-specific settings (head)


# Generated by @willbooster/willboosterify
Expand All @@ -10,20 +10,18 @@ android/
ios/
no-format/
test-fixtures/
*.config.js
*.config.*js
*.d.ts
*.min.js
*.min.*js
.yarn/
.pnp.js

dist.zip

.devcontainer/
dist/
temp/
Icon[]
*.sqlite3
*.sqlite3-journal
!.keep
# Created by https://www.toptal.com/developers/gitignore/api/windows
# Edit at https://www.toptal.com/developers/gitignore?templates=windows

Expand Down Expand Up @@ -252,12 +250,6 @@ fabric.properties
.history
.ionide

# Support for Project snippet scope
.vscode/*.code-snippets

# Ignore code-workspaces
*.code-workspace

# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode

# Created by https://www.toptal.com/developers/gitignore/api/emacs
Expand Down Expand Up @@ -507,3 +499,5 @@ dist
.svelte-kit

# End of https://www.toptal.com/developers/gitignore/api/node

# Project-specific settings (tail)
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

*.cjs text eol=lf
*.cpp text eol=lf
*.cts text eol=lf
*.dart text eol=lf
*.htm text eol=lf
*.html text eol=lf
Expand All @@ -12,6 +13,7 @@
*.json5 text eol=lf
*.jsx text eol=lf
*.mjs text eol=lf
*.mts text eol=lf
*.pu text eol=lf
*.puml text eol=lf
*.rb text eol=lf
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/add-issue-to-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: Add issue to github project
on:
issues:
types:
- labeled
jobs:
add-issue-to-project:
uses: WillBooster/reusable-workflows/.github/workflows/add-issue-to-project.yml@main
secrets:
GH_PROJECT_URL: ${{ secrets.GH_PROJECT_URL }}
GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
8 changes: 8 additions & 0 deletions .github/workflows/close-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: Add close comment
on:
pull_request:
types:
- opened
jobs:
close-comment:
uses: WillBooster/reusable-workflows/.github/workflows/close-comment.yml@main
10 changes: 10 additions & 0 deletions .github/workflows/notify-ready.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Notify ready
on:
issues:
types:
- labeled
jobs:
notify-ready:
uses: WillBooster/reusable-workflows/.github/workflows/notify-ready.yml@main
secrets:
DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL_FOR_READY }}
5 changes: 4 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ name: Release
on:
schedule:
- cron: 0 5 * * 0
concurrency:
group: ${{ github.workflow }}
cancel-in-progress: false
jobs:
release:
uses: WillBooster/reusable-workflows/.github/workflows/release.yml@main
with:
dot_env_path: .env
github_hosted_runner: true
secrets:
DOT_ENV: ${{ secrets.DOT_ENV }}
GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
12 changes: 10 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
name: Test
on:
pull_request:
paths-ignore:
- '**.md'
- '**/docs/**'
push:
branches:
- main
- wbfy
- renovate/**
paths-ignore:
- '**.md'
- '**/docs/**'
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
jobs:
test:
uses: WillBooster/reusable-workflows/.github/workflows/test.yml@main
with:
dot_env_path: .env
github_hosted_runner: true
secrets:
DOT_ENV: ${{ secrets.DOT_ENV }}
GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
4 changes: 3 additions & 1 deletion .github/workflows/wbfy-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: Merge wbfy
on:
workflow_dispatch:
schedule:
- cron: 8 15 * * *
- cron: 9 16 * * *
jobs:
wbfy-merge:
uses: WillBooster/reusable-workflows/.github/workflows/wbfy-merge.yml@main
with:
github_hosted_runner: true
secrets:
GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
4 changes: 3 additions & 1 deletion .github/workflows/wbfy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: Willboosterify
on:
workflow_dispatch:
schedule:
- cron: 15 13 * * *
- cron: 7 14 * * *
jobs:
wbfy:
uses: WillBooster/reusable-workflows/.github/workflows/wbfy.yml@main
with:
github_hosted_runner: true
secrets:
GH_TOKEN: ${{ secrets.PUBLIC_GH_BOT_PAT }}
13 changes: 4 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Project-specific settings
# Project-specific settings (head)

dist.zip

Expand All @@ -8,8 +8,7 @@ dist.zip
dist/
temp/
Icon[]
*.sqlite3
*.sqlite3-journal
!.keep
# Created by https://www.toptal.com/developers/gitignore/api/windows
# Edit at https://www.toptal.com/developers/gitignore?templates=windows

Expand Down Expand Up @@ -238,12 +237,6 @@ fabric.properties
.history
.ionide

# Support for Project snippet scope
.vscode/*.code-snippets

# Ignore code-workspaces
*.code-workspace

# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode

# Created by https://www.toptal.com/developers/gitignore/api/emacs
Expand Down Expand Up @@ -494,3 +487,5 @@ dist
.svelte-kit

# End of https://www.toptal.com/developers/gitignore/api/node

# Project-specific settings (tail)
Expand Down
12 changes: 11 additions & 1 deletion .husky/post-merge
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn
changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"

run_if_changed() {
if echo "$changed_files" | grep --quiet -E "$1"; then
eval "$2"
fi
}

run_if_changed "\..+-version" "asdf plugin update --all"
run_if_changed "\..+-version" "asdf install"
run_if_changed "package\.json" "yarn"
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint-staged
node node_modules/.bin/lint-staged
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn typecheck
node node_modules/.bin/tsc --noEmit --Pretty
12 changes: 6 additions & 6 deletions .idea/watcherTasks.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions .lintstagedrc.cjs
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
const micromatch = require('micromatch');

module.exports = {
'./{src,__tests__,scripts}/**/*.{cjs,js,jsx,mjs,ts,tsx}': ['eslint --fix', 'prettier --write'],
'./**/*.{cjs,css,htm,html,js,json,json5,jsx,md,mjs,scss,ts,tsx,vue,yaml,yml}': (files) => {
files = micromatch.not(files, './{src,__tests__,scripts}/**/*.{cjs,js,jsx,mjs,ts,tsx}');
'./{scripts,src,tests}/**/*.{cjs,cts,js,jsx,mjs,mts,ts,tsx}': [
'node node_modules/.bin/eslint --fix',
'node node_modules/.bin/prettier --cache --write',
],
'./**/*.{cjs,css,cts,htm,html,js,json,json5,jsx,md,mjs,mts,scss,ts,tsx,vue,yaml,yml}': (files) => {
files = micromatch.not(files, './{scripts,src,tests}/**/*.{cjs,cts,js,jsx,mjs,mts,ts,tsx}');
const filteredFiles = files.filter((file) => !file.includes('/test-fixtures/') && !file.includes('/packages/'));
if (filteredFiles.length === 0) return [];
const commands = [`prettier --write ${filteredFiles.join(' ')}`];
const commands = [`node node_modules/.bin/prettier --cache --write ${filteredFiles.join(' ')}`];
if (filteredFiles.some((file) => file.endsWith('package.json'))) {
commands.push('yarn sort-package-json');
commands.push('node node_modules/.bin/sort-package-json');
}
return commands;
},
Expand Down
1 change: 0 additions & 1 deletion .node-version

This file was deleted.

14 changes: 4 additions & 10 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Project-specific settings
# Project-specific settings (head)


# Generated by @willbooster/willboosterify
Expand All @@ -12,15 +12,13 @@ test-fixtures/
*.min.js
.yarn/
.pnp.js

dist.zip

.devcontainer/
dist/
temp/
Icon[]
*.sqlite3
*.sqlite3-journal
!.keep
# Created by https://www.toptal.com/developers/gitignore/api/windows
# Edit at https://www.toptal.com/developers/gitignore?templates=windows

Expand Down Expand Up @@ -249,12 +247,6 @@ fabric.properties
.history
.ionide

# Support for Project snippet scope
.vscode/*.code-snippets

# Ignore code-workspaces
*.code-workspace

# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode

# Created by https://www.toptal.com/developers/gitignore/api/emacs
Expand Down Expand Up @@ -504,3 +496,5 @@ dist
.svelte-kit

# End of https://www.toptal.com/developers/gitignore/api/node

# Project-specific settings (tail)
Expand Down
5 changes: 4 additions & 1 deletion .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
"plugins": [
["@semantic-release/commit-analyzer", { "preset": "conventionalcommits" }],
"@semantic-release/release-notes-generator",
"@semantic-release/github",
[
"@semantic-release/github",
{ "successComment": false, "labels": ["r: semantic-release"], "releasedLabels": ["released :bookmark:"] }
],
[
"semantic-release-firefox-add-on",
{ "extensionId": "{d324f64b-b423-4c2b-a9b4-d415705c26a9}", "targetXpi": "dist.xpi", "channel": "listed" }
Expand Down
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodejs 18.14.1
yarn 1.22.19
5 changes: 2 additions & 3 deletions .yarn/plugins/plugin-auto-install.cjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
module.exports={name:"plugin-auto-install",factory:r=>{let p=r("child_process"),S=r("crypto"),a=r("fs"),o=r("path"),l="plugin-auto-install v1.8.1",d=!1,g="",j={validateProject(n){d=!0;let t=h(n);t&&t===u(n)||f(t,n)},afterAllInstalled(n){d=!1;let t=h(n);t&&t===u(n)||f(t,n)},async wrapScriptExecution(n,t,s,w,c){if(d)return n;try{let e=h(t);if(e&&e===u(t)||!f(e,t))return n;console.info(`${l} is running 'yarn install' due to dependency changes.`),p.spawnSync("yarn",["install"],{cwd:c.cwd,env:c.env}),console.info(`${l} finished 'yarn install'.`);let i=p.spawnSync("yarn",[w,...c.args],{cwd:c.cwd,env:c.env,stdio:"inherit",shell:!0});return async()=>i.status||0}catch{}return n}};function h(n){try{let t=S.createHash("sha256"),s=o.join(n.cwd,"yarn.lock");a.statSync(s,{throwIfNoEntry:!1})&&t.update(a.readFileSync(s,"utf-8"));for(let c of n.workspaces.map(e=>e.cwd).sort()){let e=o.join(c,"package.json"),i=JSON.parse(a.readFileSync(e,"utf-8")),m=Object.keys(i).filter(y=>y.endsWith("ependencies")),P=[];for(let y of m)P.push(...Object.entries(i[y]).map(([v,H])=>`${v}: ${H}`));t.update(P.sort().join(","))}return t.digest("hex")}catch{}}function u(n){try{let t=k(n);return a.readFileSync(o.join(t,"hash"),"utf-8")}catch{}}function f(n,t){if(!n||n===g)return!1;try{let s=k(t);a.mkdirSync(s,{recursive:!0}),a.writeFileSync(o.join(s,"hash"),n),a.writeFileSync(o.join(s,".gitignore"),`.gitignore
hash`),console.info(`${l} updated dependency hash: ${n}`),g=n}catch{}return!0}function k(n){return o.join(n.cwd,".yarn","plugins","plugin-auto-install")}return{hooks:j}}};
//# sourceMappingURL=index.cjs.map
"use strict";var n={name:"plugin-auto-install",factory:n=>{const t=n("child_process"),e=n("crypto"),r=n("fs"),c=n("path"),s="plugin-auto-install v1.8.7";let i=!1,o="";function a(n){try{const t=e.createHash("sha256"),s=c.join(n.cwd,"yarn.lock");r.statSync(s,{throwIfNoEntry:!1})&&t.update(r.readFileSync(s,"utf8"));for(const e of n.workspaces.map((n=>n.cwd)).sort()){const n=c.join(e,"package.json"),s=JSON.parse(r.readFileSync(n,"utf8")),i=Object.keys(s).filter((n=>n.endsWith("ependencies"))),o=[];for(const n of i)o.push(...Object.entries(s[n]).map((([n,t])=>`${n}: ${t}`)));t.update(o.sort().join(","))}return t.digest("hex")}catch{}}function l(n){try{const t=d(n);return r.readFileSync(c.join(t,"hash"),"utf8")}catch{}}function u(n,t){if(!n||n===o)return!1;try{const e=d(t);r.mkdirSync(e,{recursive:!0}),r.writeFileSync(c.join(e,"hash"),n),r.writeFileSync(c.join(e,".gitignore"),".gitignore\nhash"),console.info(`${s} updated dependency hash: ${n}`),o=n}catch{}return!0}function d(n){return c.join(n.cwd,".yarn","plugins","plugin-auto-install")}return{hooks:{validateProject(n){i=!0;const t=a(n);t&&t===l(n)||u(t,n)},afterAllInstalled(n){i=!1;const t=a(n);t&&t===l(n)||u(t,n)},async wrapScriptExecution(n,e,r,c,o){if(i)return n;try{const r=a(e);if(r&&r===l(e))return n;if(!u(r,e))return n;console.info(`${s} is running 'yarn install' due to dependency changes.`),t.spawnSync("yarn",["install"],{cwd:o.cwd,env:o.env}),console.info(`${s} finished 'yarn install'.`);const i=t.spawnSync("yarn",[c,...o.args],{cwd:o.cwd,env:o.env,stdio:"inherit",shell:!0});return async()=>i.status||0}catch{}return n}}}}};module.exports=n;
//# sourceMappingURL=index.min.cjs.map
Loading

0 comments on commit 64dad4d

Please sign in to comment.