Merge pull request #320 from rescript-association/upgrade-deps

Upgrade deps

Author: ryyppy

.github/workflows/pull-request.yml

@@ -9,6 +9,6 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 14.x
-      - run: yarn --frozen-lockfile
-      - run: yarn run bs:build
-      - run: yarn test
+      - run: npm ci
+      - run: npx rescript
+      - run: npm test

README.md

@@ -15,28 +15,36 @@ This is the official documentation platform for the [ReScript](https://rescript-
 - Create an issue to let us know what you are missing
 - In case you want to contribute missing docs, please refer to our [Contribution section](#contributing)
 
+## System Requirements
+
+- `[email protected]` or higher (for ES6 module compat)
+- `npm@6` (package-lock v1)
+
 ## Setup
 
 ```sh
 # For first time clone / build (install dependencies)
-yarn
+npm i
+
+# Only needed for initial clone (or content H2 changes)
+npm run update-index
 
 # Initial build
-yarn bs:build
+npm run res:build
 
 # Build the index data
-yarn run update-index
+npm run update-index
 
 # In a new tab
-yarn dev
+npm run dev
 
 # then open localhost:3000
 ```
 
 In case you want to run ReScript in watchmode:
 
 ```sh
-yarn run bs:start
+npm run res:start
 ```
 
 ## Build Index Data
@@ -46,7 +54,7 @@ search terms we need for searching inside the `Belt` docs). You can create your
 index by running following command:
 
 ```sh
-yarn run update-index
+npm run update-index
 ```
 
 All the index data is stored in `index_data`, but will not be tracked by git.
@@ -149,7 +157,7 @@ posts](https://rescript-lang.org/blogpost-guide).
 **Quick-takeaways:**
 
 - Blogposts are located in `_blogposts`
-- Author metadata is located in `data/blog_authors.json`
+- Author metadata is located in `data/blog_authors.mjs`
 - Make sure to follow the file naming rules
 
 ### Contributing

bsconfig.json

@@ -8,7 +8,6 @@
   "refmt": 3,
   "bs-dependencies": [
     "@rescript/react",
-    "bs-fetch",
     "@glennsl/bs-json",
     "@ryyppy/rescript-promise"
   ],
@@ -31,7 +30,7 @@
   "warnings": {
     "error": "+8"
   },
-  "suffix": ".js",
+  "suffix": ".mjs",
   "bsc-flags": [
     "-bs-super-errors",
     "-bs-g"

data/blog_authors.json renamed to data/blog_authors.mjs

@@ -1,4 +1,4 @@
-[
+export default [
   {
     "username": "hongbo",
     "fullname": "Hongbo Zhang",

next.config.js

@@ -1,48 +1,78 @@
 const bsconfig = require("./bsconfig.json");
-const withCSS = require("@zeit/next-css");
-const withTM = require("next-transpile-modules");
-const path = require('path');
-const remarkSlug = require('remark-slug');
+const path = require("path");
+const remarkSlug = require("remark-slug");
+const fs = require("fs");
+
+const transpileModules = ["rescript"].concat(bsconfig["bs-dependencies"]);
+const withTM = require("next-transpile-modules")(transpileModules);
 
 const withMdx = require("./plugins/next-mdx")({
   extension: /\.mdx?$/,
   options: {
-    remarkPlugins: [remarkSlug]
-  }
+    remarkPlugins: [remarkSlug],
+  },
 });
 
+function patchResDeps() {
+  ["rescript"].concat(bsconfig["bs-dependencies"]).forEach((bsDep) => {
+    fs.writeFileSync(`./node_modules/${bsDep}/index.js`, "");
+    const json = require(`./node_modules/${bsDep}/package.json`);
+    json.main = "index.js";
+    fs.writeFileSync(
+      `./node_modules/${bsDep}/package.json`,
+      JSON.stringify(json, null, 2)
+    );
+  });
+}
+patchResDeps(); // update package.json and create empty `index.js` before transpiling
+
+const isWebpack5 = true;
 const config = {
   target: "serverless",
-  pageExtensions: ["jsx", "js", "bs.js", "mdx"],
-  transpileModules: ["bs-platform"].concat(bsconfig["bs-dependencies"]),
+  pageExtensions: ["jsx", "js", "bs.js", "mdx", "mjs"],
   env: {
     ENV: process.env.NODE_ENV,
   },
   webpack: (config, options) => {
     const { isServer } = options;
-    if (!isServer) {
-      // We shim fs for things like the blog slugs component
-      // where we need fs access in the server-side part
-      config.node = {
-        fs: 'empty'
+    if (isWebpack5) {
+      if (!isServer) {
+        // We shim fs for things like the blog slugs component
+        // where we need fs access in the server-side part
+        config.resolve.fallback = {
+          fs: false,
+          path: false,
+        };
       }
+      config.module.rules.push({
+        test: /\.m?js$/,
+        use: options.defaultLoaders.babel,
+        exclude: /node_modules/,
+        type: "javascript/auto",
+        resolve: {
+          fullySpecified: false,
+        }
+      });
     }
-    return config
+    return config;
   },
   async redirects() {
     return [
       {
-        source: '/community',
-        destination: '/community/overview',
+        source: "/community",
+        destination: "/community/overview",
         permanent: true,
       },
       {
-        source: '/bucklescript-rebranding',
-        destination: '/blog/bucklescript-is-rebranding',
+        source: "/bucklescript-rebranding",
+        destination: "/blog/bucklescript-is-rebranding",
         permanent: true,
-      }
-    ]
+      },
+    ];
+  },
+  future: {
+    webpack5: isWebpack5,
   },
 };
 
-module.exports = withMdx(withTM(withCSS(config)));
+module.exports = withMdx(withTM(config));