Skip to content

FE-348: Update Next to 12.2 and use SWC instead of Babel #7291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markerikson merged 6 commits into from
Jun 28, 2022
Merged

FE-348: Update Next to 12.2 and use SWC instead of Babel #7291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91defcb
Add @next/bundle-analyzer
markerikson Jun 28, 2022
4dbbea3
Add next-compose-plugins
markerikson Jun 28, 2022
a0ff656
Add `@next/bundle-analyzer` to our Next config
markerikson Jun 28, 2022
9872857
Update Next to 12.2
markerikson Jun 28, 2022
2ef6a39
Fix TS issues with Next 12.2
markerikson Jun 28, 2022
a6a2be3
Switch from Babel to SWC with a custom `browserslist` target
markerikson Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .babelrc
View file
Open in desktop

This file was deleted.

11 changes: 9 additions & 2 deletions next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
const { patchWebpackConfig } = require("next-global-css");
const transpileModules = require("next-transpile-modules");
const { RetryChunkLoadPlugin } = require("webpack-retry-chunk-load-plugin");
const withPlugins = require("next-compose-plugins");

const withBundleAnalyzer = require("@next/bundle-analyzer")({
enabled: process.env.ANALYZE === "true",
});

const withTM = transpileModules(["bvaughn-architecture-demo"]);

const baseNextConfig = {
// bumping Next from 12.0.9 to 12.1.0 required this as a temp WAR
// (see https://github.com/vercel/next.js/pull/34500)
experimental: {},
experimental: {
browsersListForSwc: true,
},

eslint: {
// which folders to run ESLint on during production builds (next build)
Expand Down Expand Up @@ -149,4 +156,4 @@ const baseNextConfig = {
},
};

module.exports = withTM(baseNextConfig);
module.exports = withPlugins([withTM, withBundleAnalyzer], baseNextConfig);
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"logrocket": "^2.2.1",
"logrocket-react": "^5.0.1",
"mixpanel-browser": "^2.43.0",
"next": "^12.1.6",
"next": "^12.2",
"next-global-css": "^1.3.1",
"parse-script-tags": "^0.1.7",
"polished": "^4.2.2",
Expand Down Expand Up @@ -117,6 +117,7 @@
"@babel/preset-typescript": "^7.15.0",
"@babel/types": "^7.14.8",
"@jest/console": "^28.0.2",
"@next/bundle-analyzer": "^12.2.0",
"@recordreplay/playwright": "^1.18.3",
"@recordreplay/sourcemap-upload-cli": "^0.1.1",
"@replayio/playwright": "^0.2.1",
Expand Down Expand Up @@ -185,6 +186,7 @@
"jest-environment-jsdom": "^28.0.2",
"jest-in-case": "^1.0.2",
"mini-css-extract-plugin": "^2.6.0",
"next-compose-plugins": "^2.2.1",
"node-polyfill-webpack-plugin": "^1.1.4",
"postcss": "^8.4.12",
"postcss-loader": "^6.2.1",
Expand All @@ -206,7 +208,7 @@
"webpack-retry-chunk-load-plugin": "^3.0.0"
},
"browserslist": [
"defaults"
"chrome 95"
],
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion pages/api/browser/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ async function initAuthRequest(key: string) {
}

export default async (req: NextApiRequest, res: NextApiResponse) => {
const key = getQueryValue(req.query.key);
const key = getQueryValue(req.query.key!);
if (!key) {
res.statusCode = 400;
res.statusMessage = "Missing parameter";
Expand Down
6 changes: 3 additions & 3 deletions pages/api/browser/callback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ async function fetchToken(code: string, verifier: string): Promise<Token> {
}

function redirectToLogin(req: NextApiRequest, res: NextApiResponse) {
const message = getQueryValue(req.query.error_description);
const message = getQueryValue(req.query.error_description!);

res.redirect("/browser/error?type=auth&message=" + encodeURIComponent(message));
Comment on lines +87 to 89
Copy link

@semgrep-app semgrep-app bot Jun 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Untrusted user input in redirect() can result in Open Redirect vulnerability. (Lines 87-89)

⚪️ This finding does not block your pull request.
🙈 From ajinabraham.njsscan.open_redirect.express_open_redirect.

}

export default async (req: NextApiRequest, res: NextApiResponse) => {
const code = getQueryValue(req.query.code);
const state = getQueryValue(req.query.state);
const code = getQueryValue(req.query.code!);
const state = getQueryValue(req.query.state!);
const browserAuth = req.cookies["replay-browser-auth"];

if (!code || !state || !browserAuth) {
Expand Down
Loading