diff options
| -rw-r--r-- | package.json | 9 | ||||
| -rw-r--r-- | src/index.tsx | 8 | ||||
| -rw-r--r-- | webpack.config.js | 4 | ||||
| -rw-r--r-- | yarn.lock | 9 |
4 files changed, 11 insertions, 19 deletions
diff --git a/package.json b/package.json index 67277dc..eb5970a 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "@swc/core": "1.2.47", "axios": "0.21.1", "copy-webpack-plugin": "7.0.0", - "cross-env": "7.0.3", "fs-extra": "9.1.0", "html-webpack-plugin": "4.5.1", "identity-obj-proxy": "3.0.0", @@ -32,10 +31,10 @@ "workbox-webpack-plugin": "6.1.0" }, "scripts": { - "start": "cross-env NODE_ENV=development webpack serve", - "build": "cross-env REACT_APP_SHA=$COMMIT_REF REACT_APP_BRANCH=$BRANCH webpack", - "test": "cross-env jest", - "lint": "cross-env eslint --cache src/" + "start": "webpack serve --node-env=development", + "build": "webpack", + "test": "jest", + "lint": "eslint --cache src/" }, "eslintConfig": { "extends": "react-app" diff --git a/src/index.tsx b/src/index.tsx index 9eea4ce..4bce5a4 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -11,12 +11,12 @@ if (process.env.NODE_ENV === "production") { Sentry.init({ dsn: process.env.REACT_APP_SENTRY_DSN, tracesSampleRate: 0.25, - release: `forms-frontend@${process.env.REACT_APP_SHA}`, + release: `forms-frontend@${process.env.COMMIT_REF}`, environment: process.env.CONTEXT }); // Set tag as PR number, "main", or if unavailable, "unknown" - const branch = process.env.REACT_APP_BRANCH ?? "unknown"; + const branch = process.env.BRANCH ?? "unknown"; const branch_name = branch.replace(RegExp("pull/|/head", "g"), ""); Sentry.setTag(branch_name === "main" ? "branch" : "pull_request", branch_name); } @@ -28,8 +28,8 @@ console.log(` Environment: %c ${process.env.NODE_ENV} `, `padding: 2px; border console.log(` Context: %c ${process.env.CONTEXT} `, `padding: 2px; border-radius: 5px; background-color: ${process.env.CONTEXT === "production" ? colors.success : colors.error}`); console.log(` Location: %c ${document.location.pathname + document.location.search + document.location.hash} `, `padding: 2px; border-radius: 5px; background-color: ${colors.success}`); console.log(` User Agent: %c ${navigator.userAgent} `, `padding: 2px; border-radius: 5px; background-color: ${colors.success}`); -console.log(` Branch: %c ${process.env.REACT_APP_BRANCH} `, `padding: 2px; border-radius: 5px; background-color: ${process.env.REACT_APP_BRANCH === "main" ? colors.success : colors.error}`); -console.log(` SHA: %c ${process.env.REACT_APP_SHA} `, `padding: 2px; border-radius: 5px; background-color: ${colors.success}`); +console.log(` Branch: %c ${process.env.BRANCH} `, `padding: 2px; border-radius: 5px; background-color: ${process.env.BRANCH === "main" ? colors.success : colors.error}`); +console.log(` SHA: %c ${process.env.COMMIT_REF} `, `padding: 2px; border-radius: 5px; background-color: ${colors.success}`); console.log("%cCome join us on Discord! https://discord.gg/python", `font-size: 1.5em; font-family: "Hind", "Arial"; color: ${colors.blurple}`); diff --git a/webpack.config.js b/webpack.config.js index e24c8f1..1cb543e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -83,9 +83,9 @@ module.exports = { }, ], }), new webpack.EnvironmentPlugin({ NODE_ENV: "production", - REACT_APP_SHA: "development", + BRANCH: "development", + COMMIT_REF: "development", REACT_APP_SENTRY_DSN: "https://[email protected]/1234", - REACT_APP_BRANCH: "development", REACT_APP_OAUTH2_CLIENT_ID: "0", BACKEND_URL: "https://forms-api.pythondiscord.com/", CONTEXT: "development" @@ -3426,13 +3426,6 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" - integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== - dependencies: - cross-spawn "^7.0.1" - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -3444,7 +3437,7 @@ cross-spawn@^6.0.0: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== |