Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions graphile/graphile-cache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
},
"dependencies": {
"@launchql/logger": "workspace:^",
"lru-cache": "^11.1.0",
"pg": "^8.16.0",
"lru-cache": "^11.2.4",
"pg": "^8.16.3",
"pg-cache": "workspace:^",
"postgraphile": "^4.14.1"
},
"devDependencies": {
"@types/pg": "^8.15.2",
"@types/pg": "^8.16.0",
"makage": "^0.1.8",
"nodemon": "^3.1.10",
"ts-node": "^10.9.2"
Expand Down
4 changes: 2 additions & 2 deletions graphile/graphile-i18n/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@types/accept-language-parser": "^1.5.4",
"@types/pg": "^8.15.2",
"@types/pg": "^8.16.0",
"graphile-test": "workspace:^",
"makage": "^0.1.8",
"pgsql-test": "workspace:^"
Expand All @@ -53,6 +53,6 @@
"graphile-utils": "^4.14.1",
"graphql": "15.10.1",
"graphql-tag": "2.12.6",
"pg": "^8.16.0"
"pg": "^8.16.3"
}
}
1 change: 1 addition & 0 deletions graphile/graphile-many-to-many/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"plugin"
],
"dependencies": {
"find-and-require-package-json": "^0.8.0",
"graphile-build": "^4.14.1",
"graphile-build-pg": "^4.14.1"
},
Expand Down
4 changes: 3 additions & 1 deletion graphile/graphile-many-to-many/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { findAndRequirePackageJson } from 'find-and-require-package-json';
import type { Plugin } from 'graphile-build';

import pkg from '../package.json';
import PgManyToManyRelationEdgeColumnsPlugin from './PgManyToManyRelationEdgeColumnsPlugin';
import PgManyToManyRelationEdgeTablePlugin from './PgManyToManyRelationEdgeTablePlugin';
import PgManyToManyRelationInflectionPlugin from './PgManyToManyRelationInflectionPlugin';
import PgManyToManyRelationPlugin from './PgManyToManyRelationPlugin';
import type { PgManyToManyOptions } from './types';

const pkg = findAndRequirePackageJson(__dirname);

const PgManyToManyPlugin: Plugin = (builder: any, options: PgManyToManyOptions = {}) => {
builder.hook('build', (build: any) => {
// Check dependencies
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"launchql"
],
"dependencies": {
"find-and-require-package-json": "^0.8.0",
"graphile-build": "^4.14.1",
"graphile-build-pg": "^4.14.1",
"graphile-plugin-connection-filter": "workspace:^",
Expand All @@ -51,12 +52,12 @@
"postgraphile": "^4.14.1"
},
"devDependencies": {
"@types/pg": "^8.15.6",
"@types/pg": "^8.16.0",
"graphile-plugin-connection-filter": "workspace:^",
"graphile-test": "workspace:^",
"graphql": "15.10.1",
"makage": "^0.1.6",
"pg": "^8.16.0",
"pg": "^8.16.3",
"pgsql-test": "workspace:^",
"postgraphile": "^4.14.1"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { findAndRequirePackageJson } from 'find-and-require-package-json';
import type { Plugin } from "graphile-build";

import PostgisOperatorsPlugin from "./PgConnectionArgFilterPostgisOperatorsPlugin";
import pkg from "../package.json";

const pkg = findAndRequirePackageJson(__dirname);

const PostGraphileConnectionFilterPostgisPlugin: Plugin = (
builder,
Expand Down
5 changes: 3 additions & 2 deletions graphile/graphile-plugin-connection-filter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"url": "https://github.com/constructive-io/constructive/issues"
},
"dependencies": {
"find-and-require-package-json": "^0.8.0",
"graphile-build": "^4.14.1",
"graphile-build-pg": "^4.14.1",
"graphql": "15.10.1"
Expand All @@ -48,10 +49,10 @@
},
"devDependencies": {
"@graphile-contrib/pg-simplify-inflector": "^6.1.0",
"@types/pg": "^8.15.6",
"@types/pg": "^8.16.0",
"graphile-test": "workspace:^",
"makage": "^0.1.6",
"pg": "^8.16.0",
"pg": "^8.16.3",
"pgsql-test": "workspace:^"
}
}
4 changes: 3 additions & 1 deletion graphile/graphile-plugin-connection-filter/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { findAndRequirePackageJson } from 'find-and-require-package-json';
import type { Plugin } from 'graphile-build';

import ConnectionArgFilterPlugin from './ConnectionArgFilterPlugin';
Expand All @@ -11,7 +12,8 @@ import PgConnectionArgFilterOperatorsPlugin from './PgConnectionArgFilterOperato
import PgConnectionArgFilterPlugin from './PgConnectionArgFilterPlugin';
import PgConnectionArgFilterRecordFunctionsPlugin from './PgConnectionArgFilterRecordFunctionsPlugin';
import type { ConnectionFilterConfig, ConnectionFilterOptions } from './types';
import pkg from '../package.json';

const pkg = findAndRequirePackageJson(__dirname);

const defaultOptions: ConnectionFilterConfig = {
connectionFilterArrays: true,
Expand Down
3 changes: 2 additions & 1 deletion graphile/graphile-postgis/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@
"pgsql-test": "workspace:^"
},
"dependencies": {
"find-and-require-package-json": "^0.8.0",
"graphile-build": "^4.14.1",
"graphile-build-pg": "^4.14.1",
"graphile-utils": "^4.14.1",
"graphql": "15.10.1",
"pg": "^8.16.0"
"pg": "^8.16.3"
}
}
4 changes: 3 additions & 1 deletion graphile/graphile-postgis/src/PostgisVersionPlugin.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { findAndRequirePackageJson } from 'find-and-require-package-json';
import type { Plugin } from 'graphile-build';

const pkg = findAndRequirePackageJson(__dirname);

const plugin: Plugin = (builder) => {
builder.hook('build', (build) => {
const pkg = require('../package.json');

// Check dependencies
if (!build.versions) {
Expand Down
4 changes: 2 additions & 2 deletions graphile/graphile-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
},
"dependencies": {
"graphql": "15.10.1",
"pg": "^8.16.0",
"pg": "^8.16.3",
"postgraphile": "^4.14.1"
},
"devDependencies": {
"@types/pg": "^8.15.2",
"@types/pg": "^8.16.0",
"makage": "^0.1.8"
},
"keywords": [
Expand Down
8 changes: 4 additions & 4 deletions graphile/graphile-settings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@
"graphql": "15.10.1",
"graphql-tag": "2.12.6",
"graphql-upload": "^13.0.0",
"lru-cache": "^11.1.0",
"pg": "^8.16.0",
"lru-cache": "^11.2.4",
"pg": "^8.16.3",
"postgraphile": "^4.14.1",
"request-ip": "^3.3.0"
},
"devDependencies": {
"@types/cors": "^2.8.17",
"@types/express": "^5.0.1",
"@types/pg": "^8.15.2",
"@types/express": "^5.0.6",
"@types/pg": "^8.16.0",
"@types/request-ip": "^0.0.41",
"makage": "^0.1.8",
"nodemon": "^3.1.10",
Expand Down
4 changes: 2 additions & 2 deletions graphile/graphile-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
"test:watch": "jest --watch"
},
"devDependencies": {
"@types/pg": "^8.15.2",
"@types/pg": "^8.16.0",
"graphql-tag": "2.12.6",
"makage": "^0.1.8"
},
"dependencies": {
"@launchql/types": "workspace:^",
"graphql": "15.10.1",
"mock-req": "^0.2.0",
"pg": "^8.16.0",
"pg": "^8.16.3",
"pgsql-test": "workspace:^",
"postgraphile": "^4.14.1"
},
Expand Down
6 changes: 3 additions & 3 deletions graphile/graphile-upload-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
"url": "https://github.com/constructive-io/constructive/issues"
},
"devDependencies": {
"@aws-sdk/client-s3": "^3.0.0",
"@aws-sdk/client-s3": "^3.948.0",
"@launchql/env": "workspace:^",
"@launchql/s3-utils": "workspace:^",
"@types/pg": "^8.15.2",
"@types/pg": "^8.16.0",
"graphile-test": "workspace:^",
"graphql-tag": "^2.12.6",
"makage": "^0.1.6",
"pgsql-test": "workspace:^",
"ts-jest": "^29.1.0"
"ts-jest": "^29.4.6"
},
"dependencies": {
"@launchql/s3-streamer": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion jobs/job-pg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
},
"dependencies": {
"envalid": "6.0.2",
"pg": "8.3.3"
"pg": "8.16.3"
}
}
2 changes: 1 addition & 1 deletion jobs/job-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
"dependencies": {
"@launchql/job-utils": "workspace:^",
"envalid": "6.0.2",
"pg": "8.3.3"
"pg": "8.16.3"
}
}
2 changes: 1 addition & 1 deletion jobs/knative-job-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
"body-parser": "1.19.0",
"envalid": "6.0.2",
"express": "4.17.1",
"pg": "8.3.3"
"pg": "8.16.3"
}
}
2 changes: 1 addition & 1 deletion jobs/knative-job-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
"@launchql/knative-job-worker": "workspace:^",
"async-retry": "1.3.1",
"envalid": "6.0.2",
"pg": "8.3.3"
"pg": "8.16.3"
}
}
2 changes: 1 addition & 1 deletion jobs/knative-job-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@launchql/job-pg": "workspace:^",
"@launchql/job-utils": "workspace:^",
"envalid": "6.0.2",
"pg": "8.3.3",
"pg": "8.16.3",
"request": "2.88.2"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"@jest/test-sequencer": "^30.2.0",
"@types/jest": "^30.0.0",
"@types/jest-in-case": "^1.0.9",
"@types/pg": "^8.15.2",
"@types/node": "^20.12.7",
"@types/pg": "^8.16.0",
"@typescript-eslint/eslint-plugin": "^8.48.0",
"@typescript-eslint/parser": "^8.48.0",
"eslint": "^9.39.1",
Expand All @@ -44,7 +44,7 @@
"lerna": "^8.2.3",
"makage": "^0.1.8",
"prettier": "^3.0.2",
"ts-jest": "^29.1.1",
"ts-jest": "^29.4.6",
"ts-node": "^10.9.2",
"typescript": "^5.1.6"
},
Expand Down
9 changes: 5 additions & 4 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"@types/js-yaml": "^4.0.9",
"@types/minimist": "^1.2.5",
"@types/node": "^20.12.7",
"@types/pg": "^8.15.2",
"@types/pg": "^8.16.0",
"@types/shelljs": "^0.8.16",
"clean-ansi": "0.1.1",
"clean-ansi": "0.1.3",
"glob": "^13.0.0",
"makage": "^0.1.8",
"pg": "^8.16.0",
"pg": "^8.16.3",
"ts-node": "^10.9.2"
},
"dependencies": {
Expand All @@ -54,7 +54,8 @@
"@launchql/server": "workspace:^",
"@launchql/server-utils": "workspace:^",
"@launchql/types": "workspace:^",
"inquirerer": "^2.1.8",
"find-and-require-package-json": "^0.8.0",
"inquirerer": "^2.1.11",
"js-yaml": "^4.1.0",
"minimist": "^1.2.8",
"pg-cache": "workspace:^",
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { findAndRequirePackageJson } from 'find-and-require-package-json';
import { CLIOptions, Inquirerer } from 'inquirerer';
import { ParsedArgs } from 'minimist';
import { checkForUpdates, createInitUsageText, createPgpmCommandMap } from 'pgpm';

import codegen from './commands/codegen';
import explorer from './commands/explorer';
import server from './commands/server';
import getGraphqlSchema from './commands/get-graphql-schema';
import codegen from './commands/codegen';
import { readAndParsePackageJson } from './package';
import server from './commands/server';
import { cliExitWithError, extractFirst, usageText } from './utils';

const createCommandMap = (skipPgTeardown: boolean = false): Record<string, Function> => {
Expand All @@ -26,7 +26,7 @@ export const commands = async (argv: Partial<ParsedArgs>, prompter: Inquirerer,

// Run update check early so it shows on help/version paths too
try {
const pkg = readAndParsePackageJson();
const pkg = findAndRequirePackageJson(__dirname);
await checkForUpdates({
command: command || 'help',
pkgName: pkg.name,
Expand All @@ -40,7 +40,7 @@ export const commands = async (argv: Partial<ParsedArgs>, prompter: Inquirerer,
}

if (argv.version || argv.v) {
const pkg = readAndParsePackageJson();
const pkg = findAndRequirePackageJson(__dirname);
console.log(pkg.version);
process.exit(0);
}
Expand Down
33 changes: 0 additions & 33 deletions packages/cli/src/package.ts

This file was deleted.

5 changes: 2 additions & 3 deletions packages/cli/src/utils/display.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { findAndRequirePackageJson } from 'find-and-require-package-json';
import yanse from 'yanse';

import { readAndParsePackageJson } from '../package';

// Function to display the version information
export function displayVersion() {
const pkg = readAndParsePackageJson();
const pkg = findAndRequirePackageJson(__dirname);
console.log(yanse.green(`Name: ${pkg.name}`));
console.log(yanse.blue(`Version: ${pkg.version}`));
}
Expand Down
Loading