From 6de319027322a13a8426f11ea4ca9ac1095589cc Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Thu, 9 Nov 2023 16:52:21 +0330 Subject: [PATCH 1/3] lint: make eslint happy --- demo/tsconfig.json | 6 +----- packages/fsm/tsconfig.json | 4 +--- packages/server-context/tsconfig.json | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/demo/tsconfig.json b/demo/tsconfig.json index 38bd8c7b..9749fc2f 100644 --- a/demo/tsconfig.json +++ b/demo/tsconfig.json @@ -9,9 +9,5 @@ "include": ["**/*.ts"], "exclude": ["*.d.ts", "node_modules"], - "references": [ - {"path": "../packages/signal"}, - {"path": "../packages/fsm"}, - {"path": "../packages/server-context"} - ] + "references": [{"path": "../packages/signal"}, {"path": "../packages/fsm"}, {"path": "../packages/server-context"}] } diff --git a/packages/fsm/tsconfig.json b/packages/fsm/tsconfig.json index 8c98fda6..dad58793 100644 --- a/packages/fsm/tsconfig.json +++ b/packages/fsm/tsconfig.json @@ -9,7 +9,5 @@ "include": ["src/**/*.ts"], "exclude": [], - "references": [ - {"path": "../signal"} - ] + "references": [{"path": "../signal"}] } diff --git a/packages/server-context/tsconfig.json b/packages/server-context/tsconfig.json index e5e99c0b..349e9d7f 100644 --- a/packages/server-context/tsconfig.json +++ b/packages/server-context/tsconfig.json @@ -9,8 +9,5 @@ "include": ["src/**/*.ts"], "exclude": [], - "references": [ - {"path": "../signal"}, - {"path": "../fsm"}, - ] + "references": [{"path": "../signal"}, {"path": "../fsm"}] } From 02bd4064e381c483e31a8acbe7c72e7aed3e62b3 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Thu, 9 Nov 2023 16:56:05 +0330 Subject: [PATCH 2/3] chore(yarn): pnp mode --- .vscode/extensions.json | 3 ++- .vscode/settings.json | 11 +++++++++-- .yarn/sdks/eslint/package.json | 14 ++++++++++++++ .yarn/sdks/integrations.yml | 5 +++++ .yarn/sdks/prettier/bin/prettier.cjs | 20 ++++++++++++++++++++ .yarn/sdks/prettier/index.cjs | 20 ++++++++++++++++++++ .yarn/sdks/prettier/package.json | 7 +++++++ .yarn/sdks/typescript/bin/tsc | 20 ++++++++++++++++++++ .yarn/sdks/typescript/bin/tsserver | 20 ++++++++++++++++++++ .yarn/sdks/typescript/package.json | 10 ++++++++++ .yarnrc.yml | 1 - packages/fsm/CHANGELOG.md | 2 +- packages/server-context/CHANGELOG.md | 2 +- packages/signal/CHANGELOG.md | 2 +- 14 files changed, 130 insertions(+), 7 deletions(-) create mode 100644 .yarn/sdks/eslint/package.json create mode 100644 .yarn/sdks/integrations.yml create mode 100755 .yarn/sdks/prettier/bin/prettier.cjs create mode 100644 .yarn/sdks/prettier/index.cjs create mode 100644 .yarn/sdks/prettier/package.json create mode 100755 .yarn/sdks/typescript/bin/tsc create mode 100755 .yarn/sdks/typescript/bin/tsserver create mode 100644 .yarn/sdks/typescript/package.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json index b07cba59..22dcbf67 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -7,6 +7,7 @@ "esbenp.prettier-vscode", "jgclark.vscode-todo-highlight", "streetsidesoftware.code-spell-checker-persian", - "streetsidesoftware.code-spell-checker" + "streetsidesoftware.code-spell-checker", + "arcanis.vscode-zipfs" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index efcf9c60..8d3460fe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,8 +23,15 @@ "markdownlint.ignore": ["**/CHANGELOG.md"], "cSpell.language": "en,fa,fa-IR", "cSpell.words": ["Alwatr"], - "typescript.tsdk": "node_modules/typescript/lib", + "typescript.tsdk": ".yarn/sdks/typescript/lib", "git.autoStash": true, "git.branchProtection": ["main", "next"], - "githubPullRequests.ignoredPullRequestBranches": ["main", "next"] + "githubPullRequests.ignoredPullRequestBranches": ["main", "next"], + "search.exclude": { + "**/.yarn": true, + "**/.pnp.*": true + }, + "eslint.nodePath": ".yarn/sdks", + "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs", + "typescript.enablePromptUseWorkspaceTsdk": true } diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json new file mode 100644 index 00000000..d65ecf38 --- /dev/null +++ b/.yarn/sdks/eslint/package.json @@ -0,0 +1,14 @@ +{ + "name": "eslint", + "version": "8.53.0-sdk", + "main": "./lib/api.js", + "type": "commonjs", + "bin": { + "eslint": "./bin/eslint.js" + }, + "exports": { + "./package.json": "./package.json", + ".": "./lib/api.js", + "./use-at-your-own-risk": "./lib/unsupported-api.js" + } +} diff --git a/.yarn/sdks/integrations.yml b/.yarn/sdks/integrations.yml new file mode 100644 index 00000000..aa9d0d0a --- /dev/null +++ b/.yarn/sdks/integrations.yml @@ -0,0 +1,5 @@ +# This file is automatically generated by @yarnpkg/sdks. +# Manual changes might be lost! + +integrations: + - vscode diff --git a/.yarn/sdks/prettier/bin/prettier.cjs b/.yarn/sdks/prettier/bin/prettier.cjs new file mode 100755 index 00000000..2ab31a70 --- /dev/null +++ b/.yarn/sdks/prettier/bin/prettier.cjs @@ -0,0 +1,20 @@ +#!/usr/bin/env node + +const {existsSync} = require(`fs`); +const {createRequire} = require(`module`); +const {resolve} = require(`path`); + +const relPnpApiPath = '../../../../.pnp.cjs'; + +const absPnpApiPath = resolve(__dirname, relPnpApiPath); +const absRequire = createRequire(absPnpApiPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require prettier/bin/prettier.cjs + require(absPnpApiPath).setup(); + } +} + +// Defer to the real prettier/bin/prettier.cjs your application uses +module.exports = absRequire(`prettier/bin/prettier.cjs`); diff --git a/.yarn/sdks/prettier/index.cjs b/.yarn/sdks/prettier/index.cjs new file mode 100644 index 00000000..31206a7f --- /dev/null +++ b/.yarn/sdks/prettier/index.cjs @@ -0,0 +1,20 @@ +#!/usr/bin/env node + +const {existsSync} = require(`fs`); +const {createRequire} = require(`module`); +const {resolve} = require(`path`); + +const relPnpApiPath = '../../../.pnp.cjs'; + +const absPnpApiPath = resolve(__dirname, relPnpApiPath); +const absRequire = createRequire(absPnpApiPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require prettier + require(absPnpApiPath).setup(); + } +} + +// Defer to the real prettier your application uses +module.exports = absRequire(`prettier`); diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json new file mode 100644 index 00000000..48cd959f --- /dev/null +++ b/.yarn/sdks/prettier/package.json @@ -0,0 +1,7 @@ +{ + "name": "prettier", + "version": "3.0.3-sdk", + "main": "./index.cjs", + "type": "commonjs", + "bin": "./bin/prettier.cjs" +} diff --git a/.yarn/sdks/typescript/bin/tsc b/.yarn/sdks/typescript/bin/tsc new file mode 100755 index 00000000..454b950b --- /dev/null +++ b/.yarn/sdks/typescript/bin/tsc @@ -0,0 +1,20 @@ +#!/usr/bin/env node + +const {existsSync} = require(`fs`); +const {createRequire} = require(`module`); +const {resolve} = require(`path`); + +const relPnpApiPath = "../../../../.pnp.cjs"; + +const absPnpApiPath = resolve(__dirname, relPnpApiPath); +const absRequire = createRequire(absPnpApiPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require typescript/bin/tsc + require(absPnpApiPath).setup(); + } +} + +// Defer to the real typescript/bin/tsc your application uses +module.exports = absRequire(`typescript/bin/tsc`); diff --git a/.yarn/sdks/typescript/bin/tsserver b/.yarn/sdks/typescript/bin/tsserver new file mode 100755 index 00000000..d7a60568 --- /dev/null +++ b/.yarn/sdks/typescript/bin/tsserver @@ -0,0 +1,20 @@ +#!/usr/bin/env node + +const {existsSync} = require(`fs`); +const {createRequire} = require(`module`); +const {resolve} = require(`path`); + +const relPnpApiPath = "../../../../.pnp.cjs"; + +const absPnpApiPath = resolve(__dirname, relPnpApiPath); +const absRequire = createRequire(absPnpApiPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require typescript/bin/tsserver + require(absPnpApiPath).setup(); + } +} + +// Defer to the real typescript/bin/tsserver your application uses +module.exports = absRequire(`typescript/bin/tsserver`); diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json new file mode 100644 index 00000000..d32f3913 --- /dev/null +++ b/.yarn/sdks/typescript/package.json @@ -0,0 +1,10 @@ +{ + "name": "typescript", + "version": "5.2.2-sdk", + "main": "./lib/typescript.js", + "type": "commonjs", + "bin": { + "tsc": "./bin/tsc", + "tsserver": "./bin/tsserver" + } +} diff --git a/.yarnrc.yml b/.yarnrc.yml index 3aa4b5a1..199a7790 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,2 +1 @@ -nodeLinker: node-modules enableTelemetry: false diff --git a/packages/fsm/CHANGELOG.md b/packages/fsm/CHANGELOG.md index edd231da..d4cb7338 100644 --- a/packages/fsm/CHANGELOG.md +++ b/packages/fsm/CHANGELOG.md @@ -11,7 +11,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes -* **fsm:** compatible with new logger api ([77db656](https://github.com/AliMD/alwatr-signal/commit/77db656d8b261da29376cf6dba7b9d4c35deeae8)) by @ +- **fsm:** compatible with new logger api ([77db656](https://github.com/AliMD/alwatr-signal/commit/77db656d8b261da29376cf6dba7b9d4c35deeae8)) by @ # 2.0.0 (2023-09-19) diff --git a/packages/server-context/CHANGELOG.md b/packages/server-context/CHANGELOG.md index 535da4d6..eb97eb27 100644 --- a/packages/server-context/CHANGELOG.md +++ b/packages/server-context/CHANGELOG.md @@ -11,7 +11,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes -* **server-context:** compatible with new logger api ([916db77](https://github.com/AliMD/alwatr-signal/commit/916db775c4e352d7ca663507f80539eef38b4738)) by @ +- **server-context:** compatible with new logger api ([916db77](https://github.com/AliMD/alwatr-signal/commit/916db775c4e352d7ca663507f80539eef38b4738)) by @ ## [1.2.1](https://github.com/AliMD/alwatr-signal/compare/@alwatr/server-context@1.2.0...@alwatr/server-context@1.2.1) (2023-10-16) diff --git a/packages/signal/CHANGELOG.md b/packages/signal/CHANGELOG.md index 6cc14567..921effc3 100644 --- a/packages/signal/CHANGELOG.md +++ b/packages/signal/CHANGELOG.md @@ -11,7 +11,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Bug Fixes -* **signal:** compatible with new logger api ([0a3b1c0](https://github.com/AliMD/alwatr-signal/commit/0a3b1c02b285daa66491104a14596e6a19895e11)) by @ +- **signal:** compatible with new logger api ([0a3b1c0](https://github.com/AliMD/alwatr-signal/commit/0a3b1c02b285daa66491104a14596e6a19895e11)) by @ # 2.0.0 (2023-09-19) From 7e25b7c58f60e71ec689d45dc029c36464265397 Mon Sep 17 00:00:00 2001 From: "S. Amir Mohammad Najafi" Date: Thu, 9 Nov 2023 16:56:48 +0330 Subject: [PATCH 3/3] chore: org url --- .github/ISSUE_TEMPLATE/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index fb027d79..5b93c841 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: true contact_links: - name: Discussions - url: https://github.com/AliMD/alwatr/discussions + url: https://github.com/Alwatr/alwatr/discussions about: Please ask and answer questions here. - name: Contact up