Skip to content

Commit 1c0b702

Browse files
committed
fix: Fix unit test
1 parent 7911591 commit 1c0b702

File tree

5 files changed

+44
-12
lines changed

5 files changed

+44
-12
lines changed

jest.config.base.js

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module.exports = (dir, env = 'dom') => {
2222
'\\.(css|less)$': 'identity-obj-proxy',
2323
'^graphql-language-([^/]+)': `${__dirname}/packages/graphql-language-$1/src`,
2424
'^@graphiql-plugins\\/([^/]+)': `${__dirname}/plugins/$1/src`,
25+
'^codemirror-graphql\\/esm\\/([^]+)': `${__dirname}/packages/codemirror-graphql/src/$1`,
2526
'^codemirror-graphql\\/([^]+)': `${__dirname}/packages/codemirror-graphql/src/$1`,
2627
'^example-([^/]+)': `${__dirname}/examples/$1/src`,
2728
},

packages/graphiql/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"analyze-bundle": "cross-env NODE_ENV=production CDN=1 ANALYZE=1 yarn webpack -p",
3131
"build": "yarn build-cjs && yarn build-esm",
3232
"build-bundles": "yarn build-bundles-clean && yarn build-bundles-dev && yarn build-bundles-min",
33-
"build-bundles-clean": "rimraf 'graphiql.*{js,css}' *.html",
33+
"build-bundles-clean": "rimraf 'graphiql.*{js,css}'",
3434
"build-bundles-dev": "cross-env NODE_ENV=development CDN=1 yarn vite build --mode dev",
3535
"build-bundles-min": "cross-env ANALYZE=1 NODE_ENV=production CDN=1 vite build",
3636
"build-cjs": "tsc",

packages/graphiql/src/main.tsx

+38-9
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,28 @@ import './css/doc-explorer.css';
2626
import './css/history.css';
2727

2828
// Parse the search string to get url parameters.
29-
var search = window.location.search;
30-
var parameters = {};
29+
const search = window.location.search;
30+
const parameters = {};
3131
search
3232
.substr(1)
3333
.split('&')
3434
.forEach(function (entry) {
35-
var eq = entry.indexOf('=');
35+
const eq = entry.indexOf('=');
3636
if (eq >= 0) {
37+
// @ts-expect-error
3738
parameters[decodeURIComponent(entry.slice(0, eq))] = decodeURIComponent(
3839
entry.slice(eq + 1),
3940
);
4041
}
4142
});
4243

4344
// If variables was provided, try to format it.
45+
// @ts-expect-error
4446
if (parameters.variables) {
4547
try {
48+
// @ts-expect-error
4649
parameters.variables = JSON.stringify(
50+
// @ts-expect-error
4751
JSON.parse(parameters.variables),
4852
null,
4953
2,
@@ -55,9 +59,12 @@ if (parameters.variables) {
5559
}
5660

5761
// If headers was provided, try to format it.
62+
// @ts-expect-error
5863
if (parameters.headers) {
5964
try {
65+
// @ts-expect-error
6066
parameters.headers = JSON.stringify(
67+
// @ts-expect-error
6168
JSON.parse(parameters.headers),
6269
null,
6370
2,
@@ -70,48 +77,64 @@ if (parameters.headers) {
7077

7178
// When the query and variables string is edited, update the URL bar so
7279
// that it can be easily shared.
80+
// @ts-expect-error
7381
function onEditQuery(newQuery) {
82+
// @ts-expect-error
7483
parameters.query = newQuery;
7584
updateURL();
7685
}
7786

87+
// @ts-expect-error
7888
function onEditVariables(newVariables) {
89+
// @ts-expect-error
7990
parameters.variables = newVariables;
8091
updateURL();
8192
}
8293

94+
// @ts-expect-error
8395
function onEditHeaders(newHeaders) {
96+
// @ts-expect-error
8497
parameters.headers = newHeaders;
8598
updateURL();
8699
}
87100

101+
// @ts-expect-error
88102
function onEditOperationName(newOperationName) {
103+
// @ts-expect-error
89104
parameters.operationName = newOperationName;
90105
updateURL();
91106
}
92107

108+
// @ts-expect-error
93109
function onTabChange(tabsState) {
94110
const activeTab = tabsState.tabs[tabsState.activeTabIndex];
111+
// @ts-expect-error
95112
parameters.query = activeTab.query;
113+
// @ts-expect-error
96114
parameters.variables = activeTab.variables;
115+
// @ts-expect-error
97116
parameters.headers = activeTab.headers;
117+
// @ts-expect-error
98118
parameters.operationName = activeTab.operationName;
99119
updateURL();
100120
}
101121

102122
function updateURL() {
103-
var newSearch =
123+
const newSearch =
104124
'?' +
105125
Object.keys(parameters)
106126
.filter(function (key) {
127+
// @ts-expect-error
107128
return Boolean(parameters[key]);
108129
})
109130
.map(function (key) {
110131
return (
132+
// @ts-expect-error
111133
encodeURIComponent(key) + '=' + encodeURIComponent(parameters[key])
112134
);
113135
})
114136
.join('&');
137+
// @ts-expect-error
115138
history.replaceState(null, null, newSearch);
116139
}
117140

@@ -120,6 +143,7 @@ function getSchemaUrl() {
120143

121144
if (isDev) {
122145
// This supports an e2e test which ensures that invalid schemas do not load.
146+
// @ts-expect-error
123147
if (parameters.bad && parameters.bad === 'true') {
124148
return '/bad/graphql';
125149
} else {
@@ -135,24 +159,29 @@ function getSchemaUrl() {
135159
// additional child elements.
136160
ReactDOM.render(
137161
React.createElement(GraphiQL, {
162+
// @ts-expect-error
138163
fetcher: GraphiQL.createFetcher({
139164
url: getSchemaUrl(),
140165
subscriptionUrl: 'ws://localhost:8081/subscriptions',
141166
}),
167+
// @ts-expect-error
142168
query: parameters.query,
169+
// @ts-expect-error
143170
variables: parameters.variables,
171+
// @ts-expect-error
144172
headers: parameters.headers,
173+
// @ts-expect-error
145174
operationName: parameters.operationName,
146-
onEditQuery: onEditQuery,
147-
onEditVariables: onEditVariables,
148-
onEditHeaders: onEditHeaders,
175+
onEditQuery,
176+
onEditVariables,
177+
onEditHeaders,
149178
defaultSecondaryEditorOpen: true,
150-
onEditOperationName: onEditOperationName,
179+
onEditOperationName,
151180
headerEditorEnabled: true,
152181
shouldPersistHeaders: true,
153182
inputValueDeprecation: true,
154183
tabs: {
155-
onTabChange: onTabChange,
184+
onTabChange,
156185
},
157186
}),
158187
document.getElementById('graphiql'),

packages/graphiql/tsconfig.json

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"composite": true,
77
"jsx": "react",
88
"target": "ESNext",
9+
"skipDefaultLibCheck": true,
10+
"skipLibCheck": true,
911
"strictPropertyInitialization": false
1012
},
1113
"include": ["src"],

resources/tsconfig.build.esm.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"path": "../packages/graphiql-toolkit/tsconfig.esm.json"
1010
},
1111
{
12-
"path": "../packages/graphiql/tsconfig.esm.json"
12+
"path": "../packages/codemirror-graphql/tsconfig.esm.json"
1313
},
1414
{
15-
"path": "../packages/codemirror-graphql/tsconfig.esm.json"
15+
"path": "../packages/graphiql/tsconfig.esm.json"
1616
},
1717
{
1818
"path": "../packages/monaco-graphql/tsconfig.esm.json"

0 commit comments

Comments
 (0)