From 512ebb02494213e1614afbe9d827f567679d8f27 Mon Sep 17 00:00:00 2001 From: Claas Augner <495429+caugner@users.noreply.github.com> Date: Tue, 9 Apr 2024 11:25:46 +0200 Subject: [PATCH] fix(cloud-function): use ts-node via NODE_OPTIONS (#10873) * fix(cloud-function): use ts-node via NODE_OPTIONS * fix(cloud-function): use cross-env to set NODE_OPTIONS --- cloud-function/package-lock.json | 78 ++++++++++++++++++++++++++++++++ cloud-function/package.json | 5 +- 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/cloud-function/package-lock.json b/cloud-function/package-lock.json index 09bacd17cfe8..9a023237b036 100644 --- a/cloud-function/package-lock.json +++ b/cloud-function/package-lock.json @@ -28,6 +28,7 @@ "@types/accept-language-parser": "^1.5.3", "@types/http-proxy": "^1.17.10", "@types/http-server": "^0.12.1", + "cross-env": "^7.0.3", "http-proxy": "^1.18.1", "http-server": "^14.1.1", "nodemon": "^2.0.22", @@ -1038,6 +1039,83 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, + "node_modules/cross-env": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", + "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", + "dev": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "bin": { + "cross-env": "src/bin/cross-env.js", + "cross-env-shell": "src/bin/cross-env-shell.js" + }, + "engines": { + "node": ">=10.14", + "npm": ">=6", + "yarn": ">=1" + } + }, + "node_modules/cross-env/node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/cross-env/node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cross-env/node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cross-env/node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/cross-env/node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", diff --git a/cloud-function/package.json b/cloud-function/package.json index 5f3a99a7e20b..975390caab15 100644 --- a/cloud-function/package.json +++ b/cloud-function/package.json @@ -9,11 +9,11 @@ "main": "src/index.js", "scripts": { "build": "tsc -b", - "build-redirects": "ts-node src/build-redirects.ts", + "build-redirects": "cross-env NODE_OPTIONS='--no-warnings=ExperimentalWarning --loader ts-node/esm' node src/build-redirects.ts", "copy-internal": "rm -rf ./src/internal && cp -R ../libs ./src/internal", "gcp-build": "npm run build", "prepare": "([ ! -e ../libs ] || npm run copy-internal)", - "proxy": "ts-node src/proxy.ts", + "proxy": "cross-env NODE_OPTIONS='--no-warnings=ExperimentalWarning --loader ts-node/esm' node src/proxy.ts", "server": "npm run build && functions-framework --target=mdnHandler", "server:watch": "nodemon --exec npm run server", "start": "nf start" @@ -45,6 +45,7 @@ "@types/accept-language-parser": "^1.5.3", "@types/http-proxy": "^1.17.10", "@types/http-server": "^0.12.1", + "cross-env": "^7.0.3", "http-proxy": "^1.18.1", "http-server": "^14.1.1", "nodemon": "^2.0.22",