diff --git a/api/package.json b/api/package.json
new file mode 100644
index 00000000..aead43de
--- /dev/null
+++ b/api/package.json
@@ -0,0 +1,3 @@
+{
+ "type": "module"
+}
\ No newline at end of file
diff --git a/api/resolvers/serial.js b/api/resolvers/serial.js
index 9971a3b9..1a4336bb 100644
--- a/api/resolvers/serial.js
+++ b/api/resolvers/serial.js
@@ -1,6 +1,6 @@
-const { GraphQLError } = require('graphql')
-const retry = require('async-retry')
-const Prisma = require('@prisma/client')
+import { GraphQLError } from 'graphql'
+import retry from 'async-retry'
+import Prisma from '@prisma/client'
async function serialize (models, ...calls) {
return await retry(async bail => {
@@ -56,4 +56,4 @@ async function serialize (models, ...calls) {
})
}
-module.exports = serialize
+export default serialize
diff --git a/api/search/index.js b/api/search/index.js
index f2ddacd6..d6d1deb4 100644
--- a/api/search/index.js
+++ b/api/search/index.js
@@ -1,4 +1,4 @@
-const os = require('@opensearch-project/opensearch')
+import os from '@opensearch-project/opensearch'
const options = process.env.NODE_ENV === 'development'
? { node: 'http://localhost:9200' }
@@ -12,4 +12,4 @@ const options = process.env.NODE_ENV === 'development'
global.os = global.os || new os.Client(options)
-module.exports = global.os
+export default global.os
diff --git a/lib/apollo.js b/lib/apollo.js
index 573d5e8e..6f996fad 100644
--- a/lib/apollo.js
+++ b/lib/apollo.js
@@ -20,8 +20,8 @@ export default function getApolloClient () {
if (SSR) {
return getClient(`${process.env.SELF_URL}/api/graphql`)
} else {
- global.apolloClient ||= getClient('/api/graphql')
- return global.apolloClient
+ window.apolloClient ||= getClient('/api/graphql')
+ return window.apolloClient
}
}
diff --git a/lib/constants.js b/lib/constants.js
index f6b9a036..4f325f63 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -1,57 +1,53 @@
// XXX this is temporary until we have so many subs they have
// to be loaded from the server
-const SUBS = ['bitcoin', 'nostr', 'tech', 'meta', 'jobs']
-const SUBS_NO_JOBS = SUBS.filter(s => s !== 'jobs')
+export const SUBS = ['bitcoin', 'nostr', 'tech', 'meta', 'jobs']
+export const SUBS_NO_JOBS = SUBS.filter(s => s !== 'jobs')
-module.exports = {
- NOFOLLOW_LIMIT: 100,
- BOOST_MIN: 5000,
- UPLOAD_SIZE_MAX: 2 * 1024 * 1024,
- IMAGE_PIXELS_MAX: 35000000,
- UPLOAD_TYPES_ALLOW: [
- 'image/gif',
- 'image/heic',
- 'image/png',
- 'image/jpeg',
- 'image/webp'
- ],
- COMMENT_DEPTH_LIMIT: 10,
- MAX_TITLE_LENGTH: 80,
- MAX_POLL_CHOICE_LENGTH: 30,
- ITEM_SPAM_INTERVAL: '10m',
- ANON_ITEM_SPAM_INTERVAL: '0',
- INV_PENDING_LIMIT: 10,
- BALANCE_LIMIT_MSATS: 1000000000, // 1m sats
- ANON_INV_PENDING_LIMIT: 100,
- ANON_BALANCE_LIMIT_MSATS: 0, // disable
- MAX_POLL_NUM_CHOICES: 10,
- MIN_POLL_NUM_CHOICES: 2,
- POLL_COST: 1,
- ITEM_FILTER_THRESHOLD: 1.2,
- DONT_LIKE_THIS_COST: 1,
- COMMENT_TYPE_QUERY: ['comments', 'freebies', 'outlawed', 'borderland', 'all', 'bookmarks'],
- SUBS,
- SUBS_NO_JOBS,
- USER_SORTS: ['stacked', 'spent', 'comments', 'posts', 'referrals'],
- ITEM_SORTS: ['zaprank', 'comments', 'sats'],
- WHENS: ['day', 'week', 'month', 'year', 'forever'],
- ITEM_TYPES: context => {
- const items = ['all', 'posts', 'comments', 'bounties', 'links', 'discussions', 'polls']
- if (!context) {
- items.push('bios', 'jobs')
- }
- items.push('freebies')
- if (context === 'user') {
- items.push('jobs', 'bookmarks')
- }
- return items
- },
- OLD_ITEM_DAYS: 3,
- ANON_USER_ID: 27,
- AD_USER_ID: 9,
- ANON_POST_FEE: 1000,
- ANON_COMMENT_FEE: 100,
- SSR: typeof window === 'undefined',
- MAX_FORWARDS: 5,
- LNURLP_COMMENT_MAX_LENGTH: 1000
+export const NOFOLLOW_LIMIT = 100
+export const BOOST_MIN = 5000
+export const UPLOAD_SIZE_MAX = 2 * 1024 * 1024
+export const IMAGE_PIXELS_MAX = 35000000
+export const UPLOAD_TYPES_ALLOW = [
+ 'image/gif',
+ 'image/heic',
+ 'image/png',
+ 'image/jpeg',
+ 'image/webp'
+]
+export const COMMENT_DEPTH_LIMIT = 10
+export const MAX_TITLE_LENGTH = 80
+export const MAX_POLL_CHOICE_LENGTH = 30
+export const ITEM_SPAM_INTERVAL = '10m'
+export const ANON_ITEM_SPAM_INTERVAL = '0'
+export const INV_PENDING_LIMIT = 10
+export const BALANCE_LIMIT_MSATS = 1000000000 // 1m sat
+export const ANON_INV_PENDING_LIMIT = 100
+export const ANON_BALANCE_LIMIT_MSATS = 0 // disabl
+export const MAX_POLL_NUM_CHOICES = 10
+export const MIN_POLL_NUM_CHOICES = 2
+export const POLL_COST = 1
+export const ITEM_FILTER_THRESHOLD = 1.2
+export const DONT_LIKE_THIS_COST = 1
+export const COMMENT_TYPE_QUERY = ['comments', 'freebies', 'outlawed', 'borderland', 'all', 'bookmarks']
+export const USER_SORTS = ['stacked', 'spent', 'comments', 'posts', 'referrals']
+export const ITEM_SORTS = ['zaprank', 'comments', 'sats']
+export const WHENS = ['day', 'week', 'month', 'year', 'forever']
+export const ITEM_TYPES = context => {
+ const items = ['all', 'posts', 'comments', 'bounties', 'links', 'discussions', 'polls']
+ if (!context) {
+ items.push('bios', 'jobs')
+ }
+ items.push('freebies')
+ if (context === 'user') {
+ items.push('jobs', 'bookmarks')
+ }
+ return items
}
+export const OLD_ITEM_DAYS = 3
+export const ANON_USER_ID = 27
+export const AD_USER_ID = 9
+export const ANON_POST_FEE = 1000
+export const ANON_COMMENT_FEE = 100
+export const SSR = typeof window === 'undefined'
+export const MAX_FORWARDS = 5
+export const LNURLP_COMMENT_MAX_LENGTH = 1000
diff --git a/lib/package.json b/lib/package.json
new file mode 100644
index 00000000..aead43de
--- /dev/null
+++ b/lib/package.json
@@ -0,0 +1,3 @@
+{
+ "type": "module"
+}
\ No newline at end of file
diff --git a/lib/time.js b/lib/time.js
index e1443b54..45f95985 100644
--- a/lib/time.js
+++ b/lib/time.js
@@ -1,4 +1,4 @@
-function timeSince (timeStamp) {
+export function timeSince (timeStamp) {
const now = new Date()
const secondsPast = (now.getTime() - timeStamp) / 1000
if (secondsPast < 60) {
@@ -20,7 +20,7 @@ function timeSince (timeStamp) {
return 'now'
}
-function datePivot (date,
+export function datePivot (date,
{ years = 0, months = 0, days = 0, hours = 0, minutes = 0, seconds = 0, milliseconds = 0 }) {
return new Date(
date.getFullYear() + years,
@@ -33,9 +33,9 @@ function datePivot (date,
)
}
-const dayMonthYear = when => new Date(when).toISOString().slice(0, 10)
+export const dayMonthYear = when => new Date(when).toISOString().slice(0, 10)
-function timeLeft (timeStamp) {
+export function timeLeft (timeStamp) {
const now = new Date()
const secondsPast = (timeStamp - now.getTime()) / 1000
@@ -57,6 +57,4 @@ function timeLeft (timeStamp) {
}
}
-const sleep = (ms) => new Promise((resolve, reject) => setTimeout(resolve, ms))
-
-module.exports = { timeSince, dayMonthYear, datePivot, timeLeft, sleep }
+export const sleep = (ms) => new Promise((resolve, reject) => setTimeout(resolve, ms))
diff --git a/next.config.js b/next.config.js
index 85b058f0..4e44b4a4 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,6 +1,6 @@
const { withPlausibleProxy } = require('next-plausible')
const { InjectManifest } = require('workbox-webpack-plugin')
-const { generatePrecacheManifest } = require('./sw/build')
+const { generatePrecacheManifest } = require('./sw/build.js')
const isProd = process.env.NODE_ENV === 'production'
const corsHeaders = [
diff --git a/package.json b/package.json
index 529a2b01..eb9646f9 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,10 @@
"next"
],
"ignore": [
- "**/spawn"
+ "**/spawn",
+ "**/worker",
+ "**/api",
+ "**/lib"
]
},
"devDependencies": {
@@ -114,4 +117,4 @@
"eslint": "^8.47.0",
"standard": "^17.1.0"
}
-}
+}
\ No newline at end of file
diff --git a/pages/_app.js b/pages/_app.js
index 7d15c2ac..e41b9c18 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -2,7 +2,7 @@ import '../styles/globals.scss'
import { ApolloProvider, gql } from '@apollo/client'
import { MeProvider } from '../components/me'
import PlausibleProvider from 'next-plausible'
-import getApolloClient from '../lib/apollo'
+import getApolloClient from '../lib/apollo.js'
import { PriceProvider } from '../components/price'
import { BlockHeightProvider } from '../components/block-height'
import Head from 'next/head'
@@ -34,7 +34,7 @@ function writeQuery (client, apollo, data) {
}
}
-function MyApp ({ Component, pageProps: { ...props } }) {
+export default function MyApp ({ Component, pageProps: { ...props } }) {
const client = getApolloClient()
const router = useRouter()
@@ -111,5 +111,3 @@ function MyApp ({ Component, pageProps: { ...props } }) {
)
}
-
-export default MyApp
diff --git a/pages/_document.js b/pages/_document.js
index 05234170..63a17a3e 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -1,18 +1,17 @@
-import Document, { Html, Head, Main, NextScript } from 'next/document'
+import { Html, Head, Main, NextScript } from 'next/document'
import Script from 'next/script'
-class MyDocument extends Document {
- render () {
- return (
-
-
-
-
-
-
-