Merge branch 'main' into main

API.md

@@ -22,7 +22,7 @@
 }
 ```
 * After the pull request is merged, you will see a 404 error on `your-domain.is-a.dev`. To fix this go to your github page repo's `Settings > Github pages > Custom domain` and add `your-domain.is-a.dev` in the given field
-* If you have added the `URL` record for forced https, check the `Enforce HTTPS` checkbox too
+* Check the `Enforce HTTPS` checkbox below the custom domain input
 
 
 

domains/picklerick.json

@@ -0,0 +1,12 @@
+{
+  "description": "cool stuff",
+  "repo": "https://github.com/ticklerick/ticklerick.github.io",
+  "owner": {
+    "username": "ticklerick",
+    "email": "pickle@anonemail.net"
+  },
+  "record": {
+    "CNAME": "ticklerick.github.io",
+    "URL": "https://picklerick.is-a.dev"
+  }
+}

domains/tokyo.json

@@ -0,0 +1,12 @@
+{
+  "description": "A-Tokyo's website",
+  "repo": "https://github.com/a-tokyo/tokyo",
+  "owner": {
+    "username": "a-tokyo",
+    "email": "ahmed.tokyo1@gmail.com"
+  },
+  "record": {
+    "CNAME": "a-tokyo.github.io",
+    "URL": "https://tokyo.is-a.dev"
+  }
+}

scripts/migrate.js

@@ -0,0 +1,30 @@
+const fs = require('fs');
+const path = require('path');
+const R = require('ramda');
+const { DOMAINS_PATH } = require('./utils/constants');
+
+const migrate = ([file, domain]) => [
+  file,
+  {
+    ...domain,
+    record: /\.github\.io$/.test(domain.record.CNAME || '')
+      ? R.dissoc('URL', domain.record)
+      : domain.record,
+  }
+];
+
+const main = async () => {
+  const domains = await fs.promises.readdir(DOMAINS_PATH).then(R.map(async file => [
+    file,
+    JSON.parse(await fs.promises.readFile(path.join(DOMAINS_PATH, file), 'utf-8')),
+  ])).then(ps => Promise.all(ps));
+
+  const newDomains = domains.map(migrate);
+
+  await Promise.all(newDomains.map(([file, json]) => {
+    return fs.promises.writeFile(path.join(DOMAINS_PATH, file), JSON.stringify(json, null, 2));
+  }));
+};
+
+main();
+

scripts/reply.js

@@ -11,7 +11,7 @@ If your domain points to a server you own, add \`domain-name.is-a.dev\` to your
 * Open up the **settings** tab
 * Scroll down to the **Github pages** section
 * In the **Custom domain** text input, enter the domain you registered (\`domain-name.is-a.dev\`)
-* Check the 'Enforce HTTPS' check box if you added the URL record for forced https redirection
+* Check the 'Enforce HTTPS' checkbox below the input
 * Give it some time to reflect and you should be good to go
 
 

utils/domain-service.js

@@ -9,7 +9,7 @@ const recordToRedirection = ({ name, address }) => ({
   redirect: address,
   type: 'permanent',
   redirect_wildcard: 1,
-  redirect_www: 0,
+  redirect_www: 1,
 });
 const recordToZone = ({ name, type, address, ...rec }) => ({
   ...rec, //line