Skip to content

Commit

Permalink
Merge pull request #70 from oSTEM/rem-next12-upgrade
Browse files Browse the repository at this point in the history
Merge tech upgrade + 2024 partnership page
(should be fine... it's been poked at quite a bit already by other volunteers...)
  • Loading branch information
remzh authored Mar 20, 2024
2 parents c928eab + 8268459 commit d08c6fc
Show file tree
Hide file tree
Showing 15 changed files with 16,979 additions and 18,816 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG-rem.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## 0.2.0 - Tech Stack Upgrades
Major Breaking Changes:
- Upgraded `next` from 10.2.3 to 12.3.4
- Completely removed `styled-jsx`. Converted components that were previously using it to use native CSS modules
- Migrated `next.config.js` to CommonJS based `next.config.mjs`
- This also allowed upgrading `remark-gfm` from 1.0.0 to 3.0.1
- Removed `_reset.css`
- Was causing trouble overwriting our CSS, didn't see it really being used so I took it out alltogether

Minor Changes:
- Upgraded `typescript` from 4.1.5 to 4.9.5
- Bumped `react` and `react-dom` from 17.0.1 to 17.0.2
- Removed Noto Sans as the default font (it no longer works, the font is no longer on Google Fonts) and replaced it with system default fonts
29 changes: 0 additions & 29 deletions next.config.js

This file was deleted.

57 changes: 57 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
// NOTE:
// We currently use remark-gfm@^1.0.0 since version 2.0.0 requires being
// loaded as an ESM module (which we can't do in next.config.js).
// This plugin provides support for tables, to-do lists, and auto-linking.
// const remarkGfm = require("remark-gfm");
// import remarkGfm from 'remark-gfm';
// const withImages = require('next-images');
// const { publicDecrypt } = require("crypto");

import remarkGfm from "remark-gfm";
import createMDX from "@next/mdx";

/** @type {import('next').NextConfig} */
const nextConfig = {
// reactStrictMode: true,
pageExtensions: ["js", "jsx", "ts", "tsx", "md", "mdx"],
// target: 'serverless',
webpack: (config) => {
config.module.rules.push({
test: /.svg$/,
use: "@svgr/webpack",
});
return config;
},
};

const withMDX = createMDX({
extension: /\.mdx?$/,
options: {
remarkPlugins: [remarkGfm],
rehypePlugins: [],
},
});

export default withMDX(nextConfig);

// const withMDX = require("@next/mdx")({
// options: {
// remarkPlugins: [remarkGfm],
// rehypePlugins: [],
// },
// });

// module.exports = withImages();

// module.exports = withMDX({
// pageExtensions: ["js", "jsx", "tsx", "mdx"],
// target: "serverless",
// webpack(config) {
// config.module.rules.push({
// test: /.svg$/,
// use: "@svgr/webpack",
// });
// return config;
// },
// });

Loading

0 comments on commit d08c6fc

Please sign in to comment.