Skip to content

Commit

Permalink
chore/update yarn (#81)
Browse files Browse the repository at this point in the history
* Update npm non-major dependencies
* Add missing peer deps, downgrade eslint to v8
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
bdb-dd authored Jun 28, 2024
1 parent f10b7b7 commit ba61aa2
Show file tree
Hide file tree
Showing 14 changed files with 725 additions and 598 deletions.
346 changes: 196 additions & 150 deletions .pnp.cjs

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions .pnp.loader.mjs

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

Binary file modified .yarn/install-state.gz
Binary file not shown.
626 changes: 313 additions & 313 deletions .yarn/releases/yarn-4.2.2.cjs → .yarn/releases/yarn-4.3.1.cjs

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
nodeLinker: pnp
enableGlobalCache: false
yarnPath: .yarn/releases/yarn-4.2.2.cjs

nodeLinker: pnp

yarnPath: .yarn/releases/yarn-4.3.1.cjs
7 changes: 3 additions & 4 deletions apps/admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "assistants-admin",
"packageManager": "yarn@4.2.2",
"packageManager": "yarn@4.3.1",
"private": true,
"version": "0.0.0",
"type": "module",
Expand Down Expand Up @@ -34,18 +34,17 @@
"react-markdown": "^9.0.1",
"react-router-dom": "^6.24.0",
"react-syntax-highlighter": "^15.5.0",
"zod": "^3.23.8"
"zod": "^3.22.4"
},
"devDependencies": {
"@types/node": "^20.14.9",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@types/react-syntax-highlighter": "^15.5.13",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^9.5.0",
"eslint": "^8.57.0",
"eslint-plugin-react": "^7.34.3",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7",
"typescript": "^5.4.3",
"vite": "^5.3.2"
}
Expand Down
8 changes: 4 additions & 4 deletions apps/slack-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@digdir/assistant-slack-app",
"packageManager": "yarn@4.2.2",
"packageManager": "yarn@4.3.1",
"private": true,
"version": "1.0.0",
"description": "Slack app implementation of Altinn Assistant",
Expand Down Expand Up @@ -37,15 +37,15 @@
"ramda": "^0.30.1",
"remeda": "^2.2.1",
"typesense": "^1.8.2",
"zod": "^3.23.8",
"zod-to-json-schema": "^3.23.1"
"zod": "^3.22.4",
"zod-to-json-schema": "^3.22.4"
},
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/node": "^20.14.9",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"eslint": "^9.5.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"nodemon": "^3.1.4",
"ts-node": "^10.9.2",
Expand Down
5 changes: 3 additions & 2 deletions cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "assistants-cli",
"packageManager": "yarn@4.2.2",
"packageManager": "yarn@4.3.1",
"version": "1.0.0",
"description": "CLI interface to run tasks and configure Altinn Assistant",
"main": "main.ts",
Expand All @@ -17,6 +17,7 @@
"run:listAllDocs": "ts-node src/functions/listAllDocs.js"
},
"dependencies": {
"@babel/runtime": "^7.24.7",
"@digdir/assistant-lib": "1.0.0",
"@instructor-ai/instructor": "^1.5.0",
"@types/node": "^20.14.9",
Expand All @@ -30,7 +31,7 @@
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"typesense": "^1.8.2",
"zod": "^3.23.8"
"zod": "^3.22.4"
},
"prettier": {
"endOfLine": "auto",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@digdir/assistants",
"packageManager": "yarn@4.2.2",
"packageManager": "yarn@4.3.1",
"private": true,
"workspaces": [
"packages/assistant-lib",
Expand Down
7 changes: 4 additions & 3 deletions packages/assistant-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@digdir/assistant-lib",
"packageManager": "yarn@4.2.2",
"packageManager": "yarn@4.3.1",
"private": true,
"version": "1.0.0",
"description": "Core assistant library",
Expand All @@ -14,6 +14,7 @@
},
"dependencies": {
"@azure/openai": "^1.0.0-beta.12",
"@babel/runtime": "^7.24.7",
"@instructor-ai/instructor": "1.5.0",
"@supabase/supabase-js": "^2.44.1",
"@types/js-yaml": "^4.0.9",
Expand All @@ -27,8 +28,8 @@
"remeda": "^2.2.1",
"tiktoken": "^1.0.15",
"typesense": "^1.8.2",
"zod": "^3.23.8",
"zod-to-json-schema": "^3.23.1"
"zod": "^3.22.4",
"zod-to-json-schema": "^3.22.4"
},
"devDependencies": {
"typescript": "^5.3.3"
Expand Down
5 changes: 3 additions & 2 deletions services/crawler/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "assistant-crawler",
"packageManager": "yarn@4.2.2",
"packageManager": "yarn@4.3.1",
"version": "1.0.0",
"private": true,
"type": "module",
"description": "Altinn Assistant crawler",
"dependencies": {
"@babel/runtime": "^7.24.7",
"@crawlee/browser": "*",
"@crawlee/core": "*",
"@crawlee/playwright": "*",
Expand All @@ -27,7 +28,7 @@
"@types/turndown": "^5.0.4",
"rimraf": "^5.0.7",
"tsx": "^4.15.7",
"typescript": "^5.4.5"
"typescript": "5.4.5"
},
"scripts": {
"clean": "rimraf ./dist/",
Expand Down
8 changes: 3 additions & 5 deletions services/crawler/src/infoportal.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// For more information, see https://crawlee.dev/
import { Sitemap } from '@crawlee/utils';
import { Sitemap } from 'crawlee';
import { PlaywrightCrawler } from '@crawlee/playwright';
import { createDocsCollectionIfNotExists } from '@digdir/assistant-lib';
import { createRouter } from './routes.ts';
Expand All @@ -12,13 +12,12 @@ async function main() {
.description('Crawl the Altinn Infoportal site')
.version('0.1.0');

program
.requiredOption('-c, --collection <string>', 'collection to update ');
program.requiredOption('-c, --collection <string>', 'collection to update ');

program.parse(process.argv);
const opts = program.opts();
let collectionName = opts.collection;

// make sure we have a target collection to update
await createDocsCollectionIfNotExists(collectionName);

Expand Down Expand Up @@ -63,7 +62,6 @@ async function main() {

// Run the crawler
await crawler.run();

}

await main();
5 changes: 1 addition & 4 deletions services/crawler/src/studio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ import { createDocsCollectionIfNotExists, retrieveAllUrls } from '@digdir/assist
import { createRouter, failedRequestHandler } from './routes.ts';
import { Command } from 'commander';


async function main() {
const program = new Command();
program
.name('crawl-studio-docs')
.description('Crawl the Altinn Studio documentation site')
.version('0.1.0');

program
.requiredOption('-c, --collection <string>', 'collection to update ');
program.requiredOption('-c, --collection <string>', 'collection to update ');

program.parse(process.argv);
const opts = program.opts();
Expand Down Expand Up @@ -167,7 +165,6 @@ async function main() {

// console.log(`Urls to remove: ${urlsToRemove.size}`);
// console.log(Array.from(urlsToRemove));

}

await main();
Loading

0 comments on commit ba61aa2

Please sign in to comment.