From a84f2ea6a04143c41c4c737ee551e1b97c4161aa Mon Sep 17 00:00:00 2001 From: adueck Date: Thu, 6 Oct 2022 13:11:52 +0500 Subject: [PATCH] imperfective stem instead of present form --- account/package.json | 2 +- functions/package-lock.json | 91 +++++++++++++++++++---- functions/package.json | 2 +- functions/src/index.ts | 2 +- functions/tsconfig.json | 11 ++- package-lock.json | 16 ++-- package.json | 4 +- website/package.json | 4 +- website/src/components/ExtraEntryInfo.tsx | 2 +- website/yarn.lock | 8 +- yarn.lock | 8 +- 11 files changed, 107 insertions(+), 43 deletions(-) diff --git a/account/package.json b/account/package.json index be598cf..b06f85f 100644 --- a/account/package.json +++ b/account/package.json @@ -1,5 +1,5 @@ { - "name": "passport-b", + "name": "lingdocs-account", "version": "1.0.0", "description": "", "main": "index.js", diff --git a/functions/package-lock.json b/functions/package-lock.json index c231f64..8071410 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -13,7 +13,7 @@ "@types/react": "^18.0.21", "cors": "^2.8.5", "firebase-admin": "^9.2.0", - "firebase-functions": "^3.11.0", + "firebase-functions": "^3.24.1", "google-spreadsheet": "^3.1.15", "nano": "^9.0.3", "node-fetch": "^2.6.1", @@ -1533,20 +1533,25 @@ } }, "node_modules/firebase-functions": { - "version": "3.13.2", - "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.13.2.tgz", - "integrity": "sha512-XHgAQZqA62awr4l9mNlJv6qnv5MkMkLuo+hafdW0T7IJj1PgrZtuIo5x+ib2npAcB0XhX5Sg0QR1hMYPAlfbaA==", + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.24.1.tgz", + "integrity": "sha512-GYhoyOV0864HFMU1h/JNBXYNmDk2MlbvU7VO/5qliHX6u/6vhSjTJjlyCG4leDEI8ew8IvmkIC5QquQ1U8hAuA==", "dependencies": { + "@types/cors": "^2.8.5", "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", - "lodash": "^4.17.14" + "lodash": "^4.17.14", + "node-fetch": "^2.6.7" + }, + "bin": { + "firebase-functions": "lib/bin/firebase-functions.js" }, "engines": { "node": "^8.13.0 || >=10.10.0" }, "peerDependencies": { - "firebase-admin": "^8.0.0 || ^9.0.0" + "firebase-admin": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0" } }, "node_modules/firebase-functions-test": { @@ -2351,11 +2356,22 @@ } }, "node_modules/node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==", + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, "engines": { "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } } }, "node_modules/node-forge": { @@ -3107,6 +3123,11 @@ "node": ">=6" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "node_modules/tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -3223,6 +3244,11 @@ "loose-envify": "^1.0.0" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "node_modules/websocket-driver": { "version": "0.7.4", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", @@ -3244,6 +3270,15 @@ "node": ">=0.8.0" } }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -4547,14 +4582,16 @@ } }, "firebase-functions": { - "version": "3.13.2", - "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.13.2.tgz", - "integrity": "sha512-XHgAQZqA62awr4l9mNlJv6qnv5MkMkLuo+hafdW0T7IJj1PgrZtuIo5x+ib2npAcB0XhX5Sg0QR1hMYPAlfbaA==", + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/firebase-functions/-/firebase-functions-3.24.1.tgz", + "integrity": "sha512-GYhoyOV0864HFMU1h/JNBXYNmDk2MlbvU7VO/5qliHX6u/6vhSjTJjlyCG4leDEI8ew8IvmkIC5QquQ1U8hAuA==", "requires": { + "@types/cors": "^2.8.5", "@types/express": "4.17.3", "cors": "^2.8.5", "express": "^4.17.1", - "lodash": "^4.17.14" + "lodash": "^4.17.14", + "node-fetch": "^2.6.7" } }, "firebase-functions-test": { @@ -5169,9 +5206,12 @@ "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, "node-fetch": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", - "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } }, "node-forge": { "version": "0.10.0", @@ -5754,6 +5794,11 @@ "universalify": "^0.1.2" } }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "tslib": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", @@ -5839,6 +5884,11 @@ "loose-envify": "^1.0.0" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "websocket-driver": { "version": "0.7.4", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", @@ -5854,6 +5904,15 @@ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/functions/package.json b/functions/package.json index d1a0b7d..0037b20 100644 --- a/functions/package.json +++ b/functions/package.json @@ -20,7 +20,7 @@ "@types/react": "^18.0.21", "cors": "^2.8.5", "firebase-admin": "^9.2.0", - "firebase-functions": "^3.11.0", + "firebase-functions": "^3.24.1", "google-spreadsheet": "^3.1.15", "nano": "^9.0.3", "node-fetch": "^2.6.1", diff --git a/functions/src/index.ts b/functions/src/index.ts index 5525608..bf7b0d7 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -25,7 +25,7 @@ export const publishDictionary = functions.runWith({ export const submissions = functions.runWith({ timeoutSeconds: 30, - memory: "1GB" + memory: "1GB", }).https.onRequest(lingdocsAuth( async (req, res: functions.Response) => { if (!Array.isArray(req.body)) { diff --git a/functions/tsconfig.json b/functions/tsconfig.json index aa41d5d..1e09b6d 100644 --- a/functions/tsconfig.json +++ b/functions/tsconfig.json @@ -1,14 +1,19 @@ { "compilerOptions": { - "module": "commonjs", + "lib": [ + "ES2021" + ], + "module": "ES2020", + "moduleResolution": "node", + "target": "ES5", "noImplicitReturns": true, "noUnusedLocals": true, "outDir": "lib", "sourceMap": true, "strict": true, - "target": "es2017", "esModuleInterop": true, - "skipLibCheck": true + "skipLibCheck": true, + "allowJs": true }, "compileOnSave": true, "include": [ diff --git a/package-lock.json b/package-lock.json index 357da23..203512c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.3.3", "license": "MIT", "dependencies": { - "@lingdocs/pashto-inflector": "4.0.4", + "@lingdocs/pashto-inflector": "4.0.6", "lokijs": "^1.5.12", "nano": "^9.0.5", "passport-github2": "^0.1.12", @@ -29,7 +29,7 @@ "typescript": "^4.4.3" }, "peerDependencies": { - "@lingdocs/pashto-inflector": "4.0.4" + "@lingdocs/pashto-inflector": "4.0.6" } }, "node_modules/@babel/code-frame": { @@ -312,9 +312,9 @@ "dev": true }, "node_modules/@lingdocs/pashto-inflector": { - "version": "4.0.4", - "resolved": "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.4.tgz", - "integrity": "sha512-voVYFjYXs/cTve2DLi4u0LnPEeHJQ6ratLodke0+WdPPjghoas6XC9rx1crghNuwzgdb1SFnxEArVK1PXh6G3A==", + "version": "4.0.6", + "resolved": "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.6.tgz", + "integrity": "sha512-BOONl07zHcHzzmryi4Ju691kah155OJ37McTvaQ+EKq7M7SeOLFIdvlYpVoaO6URBmMsA0RO08avjcHmzyiTjw==", "license": "MIT", "dependencies": { "@formkit/auto-animate": "^1.0.0-beta.1", @@ -4213,9 +4213,9 @@ "dev": true }, "@lingdocs/pashto-inflector": { - "version": "4.0.4", - "resolved": "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.4.tgz", - "integrity": "sha512-voVYFjYXs/cTve2DLi4u0LnPEeHJQ6ratLodke0+WdPPjghoas6XC9rx1crghNuwzgdb1SFnxEArVK1PXh6G3A==", + "version": "4.0.6", + "resolved": "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.6.tgz", + "integrity": "sha512-BOONl07zHcHzzmryi4Ju691kah155OJ37McTvaQ+EKq7M7SeOLFIdvlYpVoaO6URBmMsA0RO08avjcHmzyiTjw==", "requires": { "@formkit/auto-animate": "^1.0.0-beta.1", "classnames": "^2.2.6", diff --git a/package.json b/package.json index 71004d4..4135694 100644 --- a/package.json +++ b/package.json @@ -17,12 +17,12 @@ "url": "git@github.com-lingdocs:lingdocs/lingdocs-main.git" }, "peerDependencies": { - "@lingdocs/pashto-inflector": "4.0.4" + "@lingdocs/pashto-inflector": "4.0.6" }, "author": "lingdocs.com", "license": "MIT", "dependencies": { - "@lingdocs/pashto-inflector": "4.0.4", + "@lingdocs/pashto-inflector": "4.0.6", "lokijs": "^1.5.12", "nano": "^9.0.5", "passport-github2": "^0.1.12", diff --git a/website/package.json b/website/package.json index a816fa0..6ae775e 100644 --- a/website/package.json +++ b/website/package.json @@ -7,7 +7,7 @@ "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", - "@lingdocs/pashto-inflector": "4.0.4", + "@lingdocs/pashto-inflector": "4.0.6", "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", @@ -111,6 +111,6 @@ "user-event": "^4.0.0" }, "peerDependencies": { - "@lingdocs/pashto-inflector": "4.0.4" + "@lingdocs/pashto-inflector": "4.0.6" } } diff --git a/website/src/components/ExtraEntryInfo.tsx b/website/src/components/ExtraEntryInfo.tsx index 310e931..3f18eb1 100644 --- a/website/src/components/ExtraEntryInfo.tsx +++ b/website/src/components/ExtraEntryInfo.tsx @@ -76,7 +76,7 @@ const PresentFormInfo = ({ entry, textOptions }: { } return (
- Present Form: {{ + Imperfective Stem: {{ p: `${entry.psp}ي`, f: `${entry.psf}ee`, }} diff --git a/website/yarn.lock b/website/yarn.lock index 6297ddc..d57266e 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2357,10 +2357,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@lingdocs/pashto-inflector@4.0.4": - version "4.0.4" - resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.4.tgz#e2bf7e026c838eb15e56a029f93c9714639d7ff3" - integrity sha512-voVYFjYXs/cTve2DLi4u0LnPEeHJQ6ratLodke0+WdPPjghoas6XC9rx1crghNuwzgdb1SFnxEArVK1PXh6G3A== +"@lingdocs/pashto-inflector@4.0.6": + version "4.0.6" + resolved "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.6.tgz#d9ca156f1f28440a861c54bd3f40c14aa48f6cb6" + integrity sha512-BOONl07zHcHzzmryi4Ju691kah155OJ37McTvaQ+EKq7M7SeOLFIdvlYpVoaO6URBmMsA0RO08avjcHmzyiTjw== dependencies: "@formkit/auto-animate" "^1.0.0-beta.1" classnames "^2.2.6" diff --git a/yarn.lock b/yarn.lock index 37b9da8..568f582 100644 --- a/yarn.lock +++ b/yarn.lock @@ -178,10 +178,10 @@ "resolved" "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.1.tgz" "version" "9.2.1" -"@lingdocs/pashto-inflector@4.0.4": - "integrity" "sha512-voVYFjYXs/cTve2DLi4u0LnPEeHJQ6ratLodke0+WdPPjghoas6XC9rx1crghNuwzgdb1SFnxEArVK1PXh6G3A==" - "resolved" "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.4.tgz" - "version" "4.0.4" +"@lingdocs/pashto-inflector@4.0.6": + "integrity" "sha512-BOONl07zHcHzzmryi4Ju691kah155OJ37McTvaQ+EKq7M7SeOLFIdvlYpVoaO6URBmMsA0RO08avjcHmzyiTjw==" + "resolved" "https://npm.lingdocs.com/@lingdocs%2fpashto-inflector/-/pashto-inflector-4.0.6.tgz" + "version" "4.0.6" dependencies: "@formkit/auto-animate" "^1.0.0-beta.1" "classnames" "^2.2.6"