Skip to content

Commit 34f84e8

Browse files
TuvalSimhadotansimha
TuvalSimha
and
dotansimha
authored
Use new bob version (#2419)
* typescript Signed-off-by: Tuval <tuval.simha@gmail.com> * bob update + script Signed-off-by: Tuval <tuval.simha@gmail.com> * bob bootstrap Signed-off-by: Tuval <tuval.simha@gmail.com> * no bin in package.json Signed-off-by: Tuval <tuval.simha@gmail.com> * fix CI + docker Signed-off-by: Tuval <tuval.simha@gmail.com> * test fix: diff-command Signed-off-by: Tuval <tuval.simha@gmail.com> * fix docker Signed-off-by: Tuval <tuval.simha@gmail.com> * bob bootstrap again Signed-off-by: Tuval <tuval.simha@gmail.com> * some Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * "bob": { "check": false }, Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * pnpm bob bootstrap Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * fix on complate + rule + diff Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * added missing vitest alias * fix * fix lint * fix prettier * now? Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * all esm Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * all cjs Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * some Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * ? Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * chmod +x Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * ? Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * all esm Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * ? Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * ? Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * all cjs Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * package json Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * all node Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * remove bob check Signed-off-by: TuvalSimha <tuval.simha@gmail.com> * fix integration tests * fix * changeset patch Signed-off-by: TuvalSimha <tuval.simha@gmail.com> --------- Signed-off-by: Tuval <tuval.simha@gmail.com> Signed-off-by: TuvalSimha <tuval.simha@gmail.com> Co-authored-by: Dotan Simha <dotansimha@gmail.com>
1 parent 33a1eb9 commit 34f84e8

File tree

120 files changed

+1166
-1058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1166
-1058
lines changed

‎.changeset/eleven-knives-smell.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
'@graphql-inspector/introspect-command': patch
3+
'@graphql-inspector/commands': patch
4+
'@graphql-inspector/coverage-command': patch
5+
'@graphql-inspector/validate-command': patch
6+
'@graphql-inspector/similar-command': patch
7+
'@graphql-inspector/graphql-loader': patch
8+
'@graphql-inspector/loaders': patch
9+
'@graphql-inspector/audit-command': patch
10+
'@graphql-inspector/serve-command': patch
11+
'@graphql-inspector/github-loader': patch
12+
'@graphql-inspector/diff-command': patch
13+
'@graphql-inspector/docs-command': patch
14+
'@graphql-inspector/code-loader': patch
15+
'@graphql-inspector/json-loader': patch
16+
'@graphql-inspector/git-loader': patch
17+
'@graphql-inspector/url-loader': patch
18+
'@graphql-inspector/action': patch
19+
'@graphql-inspector/config': patch
20+
'@graphql-inspector/github': patch
21+
'@graphql-inspector/logger': patch
22+
'@graphql-inspector/core': patch
23+
'@graphql-inspector/cli': patch
24+
'@graphql-inspector/ci': patch
25+
---
26+
27+
Update `bob` version -> change the way we build the packages (Dist folder build now esm and cjs
28+
versions)

‎.eslintrc.cjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ module.exports = {
1010
{
1111
files: ['**'],
1212
rules: {
13+
'logical-assignment-operators': 'off',
1314
'prefer-object-has-own': 'off', // enable in next major
1415
// TODO: enable following rules
1516
'@typescript-eslint/no-explicit-any': 'off',

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,26 +59,26 @@ jobs:
5959

6060
- name: Integration tests
6161
run: |
62-
chmod +x ./packages/cli/dist/index.js
62+
chmod +x ./packages/cli/dist/cjs/index.js
6363
6464
echo 2001
65-
./packages/cli/dist/index.js validate './integration_tests/2001/operations/**/*.graphql' './integration_tests/2001/schema.graphql'
65+
node ./packages/cli/dist/cjs/index.js validate './integration_tests/2001/operations/**/*.graphql' './integration_tests/2001/schema.graphql'
6666
6767
echo 1991
68-
./packages/cli/dist/index.js validate './integration_tests/1991/two-operations.js' './integration_tests/1991/schema.graphql'
68+
node ./packages/cli/dist/cjs/index.js validate './integration_tests/1991/two-operations.js' './integration_tests/1991/schema.graphql'
6969
7070
echo 1985
71-
./packages/cli/dist/index.js introspect ./integration_tests/1985/schema.js || echo 'TODO'
71+
node ./packages/cli/dist/cjs/index.js introspect ./integration_tests/1985/schema.js || echo 'TODO'
7272
7373
echo 2108
74-
./packages/cli/dist/index.js introspect './integration_tests/2108/**/!(excluded)/*.graphql' --write ./2108.graphql
74+
node ./packages/cli/dist/cjs/index.js introspect './integration_tests/2108/**/!(excluded)/*.graphql' --write ./2108.graphql
7575
if grep -ic "bar" ./2108.graphql
7676
then echo "Broken" && exit 1
7777
else echo "Works"
7878
fi
7979
8080
echo 2027
81-
./packages/cli/dist/index.js diff ./integration_tests/2027/schema-before.graphql ./integration_tests/2027/schema-after.graphql --rule considerUsage --onUsage ./integration_tests/2027/unused-hotels.js
81+
node ./packages/cli/dist/cjs/index.js diff ./integration_tests/2027/schema-before.graphql ./integration_tests/2027/schema-after.graphql --rule considerUsage --onUsage ./integration_tests/2027/unused-hotels.js
8282
8383
echo 2088
84-
./packages/cli/dist/index.js diff ./integration_tests/2088/old.graphql ./integration_tests/2088/new.graphql --rule suppressRemovalOfDeprecatedField
84+
node ./packages/cli/dist/cjs/index.js diff ./integration_tests/2088/old.graphql ./integration_tests/2088/new.graphql --rule suppressRemovalOfDeprecatedField

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ RUN npm install -g pnpm
2424
RUN cd ${DISTDIR} \
2525
&& pnpm install \
2626
&& pnpm cache clean \
27-
&& ln -s "${DISTDIR}"/packages/cli/dist/index.js /usr/local/bin/graphql-inspector \
27+
&& ln -s "${DISTDIR}"/packages/cli/dist/cjs/index.js /usr/local/bin/graphql-inspector \
2828
&& chmod +x /usr/local/bin/graphql-inspector

‎package.json‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
],
2222
"scripts": {
2323
"action": "ncc build packages/action/src/action.ts --out action --minify --transpile-only",
24-
"build": "tsc && bob build",
24+
"build": "bob build",
2525
"bundle": "webpack",
2626
"lint": "eslint --cache --ignore-path .gitignore .",
2727
"lint:prettier": "prettier --cache --check .",
@@ -47,6 +47,23 @@
4747
"devDependencies": {
4848
"@changesets/changelog-github": "0.4.8",
4949
"@changesets/cli": "2.26.1",
50+
"@graphql-inspector/audit-command": "workspace:*",
51+
"@graphql-inspector/code-loader": "workspace:*",
52+
"@graphql-inspector/commands": "workspace:*",
53+
"@graphql-inspector/config": "workspace:*",
54+
"@graphql-inspector/coverage-command": "workspace:*",
55+
"@graphql-inspector/diff-command": "workspace:*",
56+
"@graphql-inspector/docs-command": "workspace:*",
57+
"@graphql-inspector/git-loader": "workspace:*",
58+
"@graphql-inspector/github-loader": "workspace:*",
59+
"@graphql-inspector/graphql-loader": "workspace:*",
60+
"@graphql-inspector/introspect-command": "workspace:*",
61+
"@graphql-inspector/json-loader": "workspace:*",
62+
"@graphql-inspector/loaders": "workspace:*",
63+
"@graphql-inspector/serve-command": "workspace:*",
64+
"@graphql-inspector/similar-command": "workspace:*",
65+
"@graphql-inspector/url-loader": "workspace:*",
66+
"@graphql-inspector/validate-command": "workspace:*",
5067
"@theguild/eslint-config": "0.8.0",
5168
"@theguild/prettier-config": "1.1.2",
5269
"@types/body-parser": "1.19.2",
@@ -55,7 +72,7 @@
5572
"@types/node": "18.15.5",
5673
"@types/yargs": "17.0.3",
5774
"@zeit/ncc": "0.22.3",
58-
"bob-the-bundler": "1.7.3",
75+
"bob-the-bundler": "6.0.0",
5976
"eslint": "8.35.0",
6077
"graphql": "16.6.0",
6178
"graphql-config": "4.5.0",
@@ -67,7 +84,7 @@
6784
"rimraf": "4.3.1",
6885
"smee-client": "1.2.3",
6986
"strip-ansi": "6.0.1",
70-
"typescript": "4.2.4",
87+
"typescript": "5.0.2",
7188
"vitest": "0.29.7"
7289
},
7390
"sideEffects": false,

‎packages/action/__tests__/run.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as core from '@actions/core';
22
import * as github from '@actions/github';
33
import { CheckConclusion } from '@graphql-inspector/github';
4-
import { updateCheckRun } from '../src/checks';
5-
import { fileLoader } from '../src/files';
6-
import { getAssociatedPullRequest } from '../src/git';
7-
import { run } from '../src/run';
4+
import { updateCheckRun } from '../src/checks.js';
5+
import { fileLoader } from '../src/files.js';
6+
import { getAssociatedPullRequest } from '../src/git.js';
7+
import { run } from '../src/run.js';
88

99
vi.mock('../src/checks');
1010
vi.mock('../src/git');

‎packages/action/package.json‎

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "@graphql-inspector/action",
33
"version": "3.4.8",
4+
"type": "module",
45
"description": "GraphQL Inspector functionality for GitHub Actions",
56
"repository": {
67
"type": "git",
@@ -13,22 +14,40 @@
1314
"url": "https://github.com/kamilkisiela"
1415
},
1516
"license": "MIT",
16-
"bin": {
17-
"graphql-inspector-github": "./dist/index.js"
18-
},
19-
"main": "dist/index.js",
20-
"module": "dist/index.mjs",
17+
"main": "dist/cjs/index.js",
18+
"module": "dist/esm/index.js",
2119
"exports": {
2220
".": {
23-
"require": "./dist/index.js",
24-
"import": "./dist/index.mjs"
21+
"require": {
22+
"types": "./dist/typings/index.d.cts",
23+
"default": "./dist/cjs/index.js"
24+
},
25+
"import": {
26+
"types": "./dist/typings/index.d.ts",
27+
"default": "./dist/esm/index.js"
28+
},
29+
"default": {
30+
"types": "./dist/typings/index.d.ts",
31+
"default": "./dist/esm/index.js"
32+
}
2533
},
2634
"./*": {
27-
"require": "./dist/*.js",
28-
"import": "./dist/*.mjs"
29-
}
35+
"require": {
36+
"types": "./dist/typings/*.d.cts",
37+
"default": "./dist/cjs/*.js"
38+
},
39+
"import": {
40+
"types": "./dist/typings/*.d.ts",
41+
"default": "./dist/esm/*.js"
42+
},
43+
"default": {
44+
"types": "./dist/typings/*.d.ts",
45+
"default": "./dist/esm/*.js"
46+
}
47+
},
48+
"./package.json": "./package.json"
3049
},
31-
"typings": "dist/index.d.ts",
50+
"typings": "dist/typings/index.d.ts",
3251
"keywords": [
3352
"graphql",
3453
"graphql-inspector",
@@ -38,7 +57,7 @@
3857
"github"
3958
],
4059
"scripts": {
41-
"build": "tsc",
60+
"build": "bob build",
4261
"clean": "rm -rf dist/",
4362
"deploy": "now --docker",
4463
"prebuild": "pnpm clean",
@@ -64,6 +83,6 @@
6483
},
6584
"sideEffects": false,
6685
"typescript": {
67-
"definition": "dist/index.d.ts"
86+
"definition": "dist/typings/index.d.ts"
6887
}
6988
}

‎packages/action/src/action.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as core from '@actions/core';
2-
import { run } from './run';
2+
import { run } from './run.js';
33

44
(global as any).navigator = {
55
userAgent: 'node.js',

‎packages/action/src/checks.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import * as core from '@actions/core';
22
import * as github from '@actions/github';
33
import { CheckConclusion } from '@graphql-inspector/github';
4-
import { OctokitInstance } from './types';
5-
import { batch } from './utils';
4+
import { OctokitInstance } from './types.js';
5+
import { batch } from './utils.js';
66

77
type UpdateCheckRunOptions = Required<
88
Pick<NonNullable<Parameters<OctokitInstance['checks']['update']>[0]>, 'conclusion' | 'output'>

‎packages/action/src/files.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { readFileSync } from 'fs';
22
import { resolve } from 'path';
33
import * as core from '@actions/core';
4-
import { OctokitInstance } from './types';
4+
import { OctokitInstance } from './types.js';
55

66
export function fileLoader({
77
octokit,

0 commit comments

Comments
 (0)