Skip to content

Commit 18c6930

Browse files
committed
Use pnpm patch instead of patch-package
1 parent 95ffe20 commit 18c6930

File tree

9 files changed

+106
-184
lines changed

9 files changed

+106
-184
lines changed

app/package.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,16 @@
1616
"initialize:type": "mkdir -p generated/ && pnpm initialize:type:go-api && pnpm initialize:type:risk-api",
1717
"initialize:type:go-api": "test -f ./generated/types.ts && true || cp types.stub.ts ./generated/types.ts",
1818
"initialize:type:risk-api": "test -f ./generated/riskTypes.ts && true || cp types.stub.ts ./generated/riskTypes.ts",
19-
"prestart": "pnpm initialize:type",
20-
"pretypecheck": "pnpm initialize:type",
21-
"prelint:js": "pnpm initialize:type",
22-
"prebuild": "pnpm initialize:type",
23-
"start": "vite",
24-
"build": "vite build",
25-
"preview": "vite preview",
2619
"generate:type": "pnpm generate:type:go-api && pnpm generate:type:risk-api",
2720
"generate:type:go-api": "dotenv -- cross-var openapi-typescript \"%APP_API_ENDPOINT%api-docs/\" -o ./generated/types.ts --alphabetize",
2821
"generate:type:risk-api": "dotenv -- cross-var openapi-typescript \"%APP_RISK_API_ENDPOINT%api-docs/\" -o ./generated/riskTypes.ts --alphabetize",
22+
"prestart": "pnpm initialize:type",
23+
"start": "vite",
24+
"prebuild": "pnpm initialize:type",
25+
"build": "vite build",
26+
"pretypecheck": "pnpm initialize:type",
2927
"typecheck": "tsc",
28+
"prelint:js": "pnpm initialize:type",
3029
"lint:js": "eslint src",
3130
"lint:css": "stylelint \"./src/**/*.css\"",
3231
"lint:translation": "pnpm translatte:lint",
@@ -35,8 +34,7 @@
3534
"test": "vitest",
3635
"test:coverage": "vitest run --coverage",
3736
"surge:deploy": "branch=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD); branch=$(echo $branch | tr ./ -); cp ../build/index.html ../build/200.html; surge -p ../build/ -d https://ifrc-go-$branch.surge.sh",
38-
"surge:teardown": "branch=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD); branch=$(echo $branch | tr ./ -); surge teardown https://ifrc-go-$branch.surge.sh",
39-
"postinstall": "patch-package"
37+
"surge:teardown": "branch=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD); branch=$(echo $branch | tr ./ -); surge teardown https://ifrc-go-$branch.surge.sh"
4038
},
4139
"dependencies": {
4240
"@ifrc-go/icons": "^2.0.1",
@@ -94,7 +92,6 @@
9492
"fast-glob": "^3.3.2",
9593
"happy-dom": "^9.18.3",
9694
"openapi-typescript": "6.5.5",
97-
"patch-package": "^7.0.0",
9895
"postcss": "^8.3.0",
9996
"postcss-nested": "^6.0.1",
10097
"postcss-normalize": "^10.0.1",

app/src/views/DrefApplicationForm/DrefImportButton/DrefImportModal/index.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ function getValueFromCellValue(cellValue: CellValue) {
6969
return cellValue.hyperlink;
7070
}
7171

72+
if (isNotDefined(cellValue.result)) {
73+
return undefined;
74+
}
75+
76+
if (typeof cellValue.result === 'object' && 'error' in cellValue.result) {
77+
return undefined;
78+
}
79+
7280
// Formula result
7381
return getValueFromCellValue(cellValue.result);
7482
}

package.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
},
1010
"private": true,
1111
"scripts": {
12-
"postinstall": "patch-package",
1312
"lint:unused": "knip --tags=-knipignore",
1413
"build:ui": "pnpm -F @ifrc-go/ui build",
1514
"start:ui": "pnpm -F @ifrc-go/ui start",
@@ -22,8 +21,16 @@
2221
"chromatic": "pnpm -F go-ui-storybook chromatic"
2322
},
2423
"devDependencies": {
25-
"knip": "^5.36.3",
26-
"patch-package": "^8.0.0"
24+
"knip": "^5.36.3"
2725
},
28-
"packageManager": "[email protected]+sha1.71f9126a20cd3d00fa47c188f956918858180e54"
26+
"packageManager": "[email protected]+sha1.71f9126a20cd3d00fa47c188f956918858180e54",
27+
"pnpm": {
28+
"patchedDependencies": {
29+
"@togglecorp/[email protected]": "patches/@[email protected]",
30+
31+
32+
33+
34+
}
35+
}
2936
}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/node_modules/@togglecorp/re-map/build/esm/MapImage.js b/node_modules/@togglecorp/re-map/build/esm/MapImage.js
2-
index cb8fa49..6638e25 100644
3-
--- a/node_modules/@togglecorp/re-map/build/esm/MapImage.js
4-
+++ b/node_modules/@togglecorp/re-map/build/esm/MapImage.js
1+
diff --git a/build/esm/MapImage.js b/build/esm/MapImage.js
2+
index cb8fa497e2873bda36fcfd3c4f9600fb14cc2838..6638e250a389f5d5240239eed4f3666919594012 100644
3+
--- a/build/esm/MapImage.js
4+
+++ b/build/esm/MapImage.js
55
@@ -29,11 +29,6 @@ function MapImage(props) {
66
if (!map || !mapStyle || !initialUrl && !initialImage) {
77
return undefined;
@@ -23,4 +23,4 @@ index cb8fa49..6638e25 100644
2323
+ }
2424
map.addImage(initialName, loadedImage, initialImageOptions);
2525
if (onLoad) {
26-
onLoad(true, initialName);
26+
onLoad(true, initialName);
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/node_modules/@turf/bbox/package.json b/node_modules/@turf/bbox/package.json
2-
index 667487d..609ad20 100644
3-
--- a/node_modules/@turf/bbox/package.json
4-
+++ b/node_modules/@turf/bbox/package.json
1+
diff --git a/package.json b/package.json
2+
index 667487dc0803e78f1aa6c8686173fffdb75eb2a0..609ad207542e5fd76fc5538646bb3689ea7e1bab 100644
3+
--- a/package.json
4+
+++ b/package.json
55
@@ -29,11 +29,11 @@
66
"exports": {
77
"./package.json": "./package.json",
@@ -14,4 +14,4 @@ index 667487d..609ad20 100644
1414
- "types": "dist/js/index.d.ts",
1515
"sideEffects": false,
1616
"files": [
17-
"dist"
17+
"dist"
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/node_modules/@turf/buffer/package.json b/node_modules/@turf/buffer/package.json
2-
index f350d3e..8fe4032 100644
3-
--- a/node_modules/@turf/buffer/package.json
4-
+++ b/node_modules/@turf/buffer/package.json
1+
diff --git a/package.json b/package.json
2+
index f350d3e54b0a2e5c0bdc82955cb69af22f150657..8fe403202e7e7a53e6ff39c8abbe7b8f725408eb 100644
3+
--- a/package.json
4+
+++ b/package.json
55
@@ -35,11 +35,11 @@
66
"exports": {
77
"./package.json": "./package.json",
@@ -14,4 +14,4 @@ index f350d3e..8fe4032 100644
1414
- "types": "index.d.ts",
1515
"sideEffects": false,
1616
"files": [
17-
"dist",
17+
"dist",
Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/node_modules/openapi-typescript/dist/index.js b/node_modules/openapi-typescript/dist/index.js
2-
index 716afaa..497d0ac 100644
3-
--- a/node_modules/openapi-typescript/dist/index.js
4-
+++ b/node_modules/openapi-typescript/dist/index.js
1+
diff --git a/dist/index.js b/dist/index.js
2+
index 716afaa50ea30a433178843def931d6d1c4fbe33..28c9250a19081e0569b1de30662510eef90cd8e9 100644
3+
--- a/dist/index.js
4+
+++ b/dist/index.js
55
@@ -89,9 +89,19 @@ async function openapiTS(schema, options = {}) {
66
if (options.inject)
77
output.push(options.inject);
@@ -41,10 +41,10 @@ index 716afaa..497d0ac 100644
4141
}
4242
if (output.join("\n").includes("OneOf")) {
4343
output.splice(1, 0, "/** OneOf type helpers */", "type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };", "type XOR<T, U> = (T | U) extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;", "type OneOf<T extends any[]> = T extends [infer Only] ? Only : T extends [infer A, infer B, ...infer Rest] ? OneOf<[XOR<A, B>, ...Rest]> : never;", "");
44-
diff --git a/node_modules/openapi-typescript/dist/load.js b/node_modules/openapi-typescript/dist/load.js
45-
index aea4fe0..426fdd8 100644
46-
--- a/node_modules/openapi-typescript/dist/load.js
47-
+++ b/node_modules/openapi-typescript/dist/load.js
44+
diff --git a/dist/load.js b/dist/load.js
45+
index aea4fe09436722e0c2d1fb272b1e067c17a9af60..69bb601d8d6bcf022acad9f5e9b0221b230d376b 100644
46+
--- a/dist/load.js
47+
+++ b/dist/load.js
4848
@@ -67,8 +67,7 @@ export default async function load(schema, options) {
4949
return options.schemas;
5050
}
@@ -78,10 +78,10 @@ index aea4fe0..426fdd8 100644
7878
const contents = fs.readFileSync(schema, "utf8");
7979
if (ext === ".yaml" || ext === ".yml") {
8080
options.schemas[schemaID] = {
81-
diff --git a/node_modules/openapi-typescript/dist/transform/request-body-object.js b/node_modules/openapi-typescript/dist/transform/request-body-object.js
82-
index 33c24be..453a060 100644
83-
--- a/node_modules/openapi-typescript/dist/transform/request-body-object.js
84-
+++ b/node_modules/openapi-typescript/dist/transform/request-body-object.js
81+
diff --git a/dist/transform/request-body-object.js b/dist/transform/request-body-object.js
82+
index 33c24bea962dfa595dc0aa474d7826f5e3cfb7c8..5645d67d675a18a44d5565c360a5ac4f846d1b12 100644
83+
--- a/dist/transform/request-body-object.js
84+
+++ b/dist/transform/request-body-object.js
8585
@@ -20,13 +20,13 @@ export default function transformRequestBodyObject(requestBodyObject, { path, ct
8686
if ("$ref" in mediaTypeObject) {
8787
output.push(indent(`${key}: ${transformSchemaObject(mediaTypeObject, {
@@ -98,10 +98,10 @@ index 33c24be..453a060 100644
9898
});
9999
output.push(indent(`${key}: ${mediaType};`, indentLv));
100100
}
101-
diff --git a/node_modules/openapi-typescript/dist/transform/response-object.js b/node_modules/openapi-typescript/dist/transform/response-object.js
102-
index b0e1c20..1f739a8 100644
103-
--- a/node_modules/openapi-typescript/dist/transform/response-object.js
104-
+++ b/node_modules/openapi-typescript/dist/transform/response-object.js
101+
diff --git a/dist/transform/response-object.js b/dist/transform/response-object.js
102+
index b0e1c203a3d2030dd40b5435419dfc6a360dc546..a4fb5b6b226618efc707568c028abe3558a57800 100644
103+
--- a/dist/transform/response-object.js
104+
+++ b/dist/transform/response-object.js
105105
@@ -23,7 +23,7 @@ export default function transformResponseObject(responseObject, { path, ctx }) {
106106
key = tsOptionalProperty(key);
107107
output.push(indent(`${key}: ${transformHeaderObject(headerObject, {
@@ -120,10 +120,10 @@ index b0e1c20..1f739a8 100644
120120
})};`, indentLv));
121121
}
122122
indentLv--;
123-
diff --git a/node_modules/openapi-typescript/dist/transform/schema-object.js b/node_modules/openapi-typescript/dist/transform/schema-object.js
124-
index 15f144c..25e853c 100644
125-
--- a/node_modules/openapi-typescript/dist/transform/schema-object.js
126-
+++ b/node_modules/openapi-typescript/dist/transform/schema-object.js
123+
diff --git a/dist/transform/schema-object.js b/dist/transform/schema-object.js
124+
index 15f144cc7258250559139582ff57f4bb5816aae3..9597ee66f76071a292327abd1f004410e0ea620a 100644
125+
--- a/dist/transform/schema-object.js
126+
+++ b/dist/transform/schema-object.js
127127
@@ -21,13 +21,29 @@ export function defaultSchemaObjectTransform(schemaObject, { path, ctx }) {
128128
return ctx.immutableTypes ? tsReadonly(finalType) : finalType;
129129
}
@@ -155,15 +155,15 @@ index 15f144c..25e853c 100644
155155
if (schemaObject.const !== null && schemaObject.const !== undefined) {
156156
return transformSchemaObject(escStr(schemaObject.const), {
157157
path,
158-
diff --git a/node_modules/openapi-typescript/dist/types.d.ts b/node_modules/openapi-typescript/dist/types.d.ts
159-
index 9b28fc0..732a789 100644
160-
--- a/node_modules/openapi-typescript/dist/types.d.ts
161-
+++ b/node_modules/openapi-typescript/dist/types.d.ts
158+
diff --git a/dist/types.d.ts b/dist/types.d.ts
159+
index 9b28fc0323dae76ae04f5fcfb1e2529650d3444e..732a78968f75de19b914f9cf6015d6e9676f5073 100644
160+
--- a/dist/types.d.ts
161+
+++ b/dist/types.d.ts
162162
@@ -380,6 +380,7 @@ export interface GlobalContext {
163163
silent: boolean;
164164
supportArrayLength: boolean;
165165
excludeDeprecated: boolean;
166166
+ mode?: "read" | "write";
167167
}
168168
export type $defs = Record<string, SchemaObject>;
169-
export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>;
169+
export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>;
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/node_modules/vite-plugin-webfont-dl/dist/index.js b/node_modules/vite-plugin-webfont-dl/dist/index.js
2-
index b70ccbf..9177d9d 100644
3-
--- a/node_modules/vite-plugin-webfont-dl/dist/index.js
4-
+++ b/node_modules/vite-plugin-webfont-dl/dist/index.js
1+
diff --git a/dist/index.js b/dist/index.js
2+
index b70ccbf6e16a69a56c1ebb77455d0f50dfcbd2e8..9177d9d63e474843a12be8702d6d08d653f25864 100644
3+
--- a/dist/index.js
4+
+++ b/dist/index.js
55
@@ -6,7 +6,7 @@ $1</head>`)}injectAsync(e,t,s){return e.replace(/([ \t]*)<\/head>/,`$1$1<link re
66
$1$1<link rel="stylesheet" media="print" onload="this.onload=null;this.removeAttribute('media');" href="${t}${s}">
77
$1</head>`)}injectSync(e,t,s){return e.replace(/([ \t]*)<\/head>/,`$1$1<link rel="preload" as="style" href="${t}${s}">
@@ -10,4 +10,4 @@ index b70ccbf..9177d9d 100644
1010
+$1</head>`)}};var de=(l=>(l.woff2="font/woff2",l.woff="font/woff",l.ttf="font/ttf",l.otf="font/otf",l.svg="image/svg+xml",l.eot="application/vnd.ms-fontobject",l))(de||{}),I=class{constructor(e){this.options=e}transform(e,t){return t.forEach(s=>{if(!this.options.embedFonts||!s.binary)e=e.replaceAll(s.url,s.localPath);else if(s.binary){let n=s.url.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"),a=new RegExp(`url\\(['"]?\\b${n}\\b['"]?\\)`,"gi");e=e.replaceAll(a,`url(data:${this.getFontMime(s)};base64,${s.binary.toString("base64")})`)}}),e}getFontMime(e){let t=e.filename.replace(/^.+\.(.+)$/,"$1");return de[t]}};var K=require("axios"),me=require("http"),ue=require("https"),P=E(require("picocolors"));var U=class{constructor(e,t){this.options=e;this.logger=t;this.userAgentWoff2="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.0.0 Safari/537.36";this.maxTries=3;this.timeout=5000;this.waitBeforeRetry=[25,2500];this.axios=new K.Axios({timeout:this.timeout,proxy:this.options.proxy,httpAgent:new me.Agent({keepAlive:!0,family:4}),httpsAgent:new ue.Agent({keepAlive:!0,family:4})})}download(e,t,s=1){return u(this,null,function*(){try{let n=yield this.toRequest(e,t);return s>1&&this.logger.info(P.default.green(`\u2713 ${e}`)+" "+P.default.dim(`(try #${s})`)),n}catch(n){if(this.logger.error(P.default.red(`\u2717 ${e}`)+" "+P.default.dim(`(try #${s})`)+": "+((0,K.isAxiosError)(n)?n.message:n)),s<this.maxTries)return yield new Promise(a=>setTimeout(a,this.randomWaitInterval())),this.download(e,t,s+1);throw n}})}toRequest(e,t){return this.axios.get(e,{headers:{"User-Agent":this.userAgentWoff2},responseType:t!=null?t:"arraybuffer"})}randomWaitInterval(){return Math.floor(Math.random()*(this.waitBeforeRetry[0]-this.waitBeforeRetry[1]+1)+this.waitBeforeRetry[1])}};var _=class{constructor(e,t,s){this.logger=e;this.downloader=t;this.fileCache=s}load(e){return u(this,null,function*(){let t=this.fileCache.get("font",e);if(t)return t;this.logger.flashLine(e);let s=yield this.downloader.download(e);return this.fileCache.save("font",e,s.data),s.data})}};var j=E(require("flat-cache"));var D="3.9.4";var q=class{constructor(e){this.enabled=!0;this.hits={css:0,font:0};e.cache===!1&&(this.enabled=!1),this.storeCss=j.default.create(`vite-plugin-webfont-dl__${D}__css`),this.storeFont=j.default.create(`vite-plugin-webfont-dl__${D}__font`),this.enabled||this.clear()}get(e,t){if(!this.enabled)return;let s=e==="css"?this.storeCss.getKey(t):this.storeFont.getKey(t);if(s)return e==="css"?this.hits.css++:this.hits.font++,s.type!==void 0?Buffer.from(s.data):s}save(e,t,s){this.enabled&&(e==="css"?(this.storeCss.setKey(t,s),this.storeCss.save(!0)):(this.storeFont.setKey(t,s),this.storeFont.save(!0)))}clear(){j.default.clearCacheById(`vite-plugin-webfont-dl__${D}__css`),j.default.clearCacheById(`vite-plugin-webfont-dl__${D}__font`)}};var V=class{constructor(){this.webfontRegexes=[new RegExp(`(<!--.*?)?<link[^>]+rel=['"]?stylesheet['"]?[^>]+href=['"]?(https:\\/\\/fonts\\.googleapis\\.com[^'">]+)['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+href=['"]?(https:\\/\\/fonts\\.googleapis\\.com[^'">]+)['"]?[^>]+rel=['"]?stylesheet['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+rel=['"]?stylesheet['"]?[^>]+href=['"]?(https:\\/\\/fonts\\.bunny\\.net[^'">]+)['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+href=['"]?(https:\\/\\/fonts\\.bunny\\.net[^'">]+)['"]?[^>]+rel=['"]?stylesheet['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+rel=['"]?stylesheet['"]?[^>]+href=['"]?(https:\\/\\/api\\.fontshare\\.com[^'">]+)['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+href=['"]?(https:\\/\\/api\\.fontshare\\.com[^'">]+)['"]?[^>]+rel=['"]?stylesheet['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+rel=['"]?stylesheet['"]?[^>]+href=['"]?(https:\\/\\/cdn\\.jsdelivr\\.net[^'">]+\\.css)['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+href=['"]?(https:\\/\\/cdn\\.jsdelivr\\.net[^'">]+\\.css)['"]?[^>]+rel=['"]?stylesheet['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+rel=['"]?stylesheet['"]?[^>]+href=['"]?(https:\\/\\/rsms\\.me[^'">]+)['"]?[^>]*>`,"gs"),new RegExp(`(<!--.*?)?<link[^>]+href=['"]?(https:\\/\\/rsms\\.me[^'">]+)['"]?[^>]+rel=['"]?stylesheet['"]?[^>]*>`,"gs")];this.preconnectRegexes=[/<link[^>]+rel=['"]?preconnect['"]?[^>]+href=['"]?https:\/\/fonts\.googleapis\.com['"]?[^>]*>/,/<link[^>]+href=['"]?https:\/\/fonts\.googleapis\.com['"]?[^>]+rel=['"]?preconnect['"]?[^>]*>/,/<link[^>]+rel=['"]?preconnect['"]?[^>]+href=['"]?https:\/\/fonts\.gstatic\.com['"]?[^>]*>/,/<link[^>]+href=['"]?https:\/\/fonts\.gstatic\.com['"]?[^>]+rel=['"]?preconnect['"]?[^>]*>/,/<link[^>]+rel=['"]?preconnect['"]?[^>]+href=['"]?https:\/\/fonts\.bunny\.net['"]?[^>]*>/,/<link[^>]+href=['"]?https:\/\/fonts\.bunny\.net['"]?[^>]+rel=['"]?preconnect['"]?[^>]*>/,/<link[^>]+rel=['"]?preconnect['"]?[^>]+href=['"]?https:\/\/api\.fontshare\.com['"]?[^>]*>/,/<link[^>]+href=['"]?https:\/\/api\.fontshare\.com['"]?[^>]+rel=['"]?preconnect['"]?[^>]*>/,/<link[^>]+rel=['"]?preconnect['"]?[^>]+href=['"]?https:\/\/rsms\.me['"]?[^>]*>/,/<link[^>]+href=['"]?https:\/\/rsms\.me['"]?[^>]+rel=['"]?preconnect['"]?[^>]*>/]}parse(e){let t=new Set;for(let s of this.webfontRegexes){let n=e.matchAll(s);if(n)for(let a of n)(!a[1]||a[1].includes("-->"))&&t.add(a[2])}return t}removeTags(e){return e=this.removePreconnectTags(e),e=this.removeWebfontTags(e),e}removePreconnectTags(e){for(let t of this.preconnectRegexes){let s=new RegExp("[ ]*"+t.source+`(\r
1111
|\r|
1212
)?`,"g");e=e.replace(s,"")}return e}removeWebfontTags(e){for(let t of this.webfontRegexes){let s=new RegExp("[ ]*"+t.source+`(\r
13-
|\r|
13+
|\r|

0 commit comments

Comments
 (0)