@reykjavik/webtools 0.1.0 → 0.1.2

package/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - ... <!-- Add new lines here. -->
 
-## 0.1.0
+## 0.1.0 – 0.1.2
 
 _2023-03-24_
 

package/esm/http.d.ts

@@ -44,12 +44,12 @@ export declare const HTTP_500_InternalServerError = 500;
 export type HTTP_SUCCESS = typeof HTTP_200_OK | typeof HTTP_201_Created | typeof HTTP_202_Accepted;
 export type HTTP_REDIRECTION = typeof HTTP_301_MovedPermanently | typeof HTTP_302_Found | typeof HTTP_303_SeeOther | typeof HTTP_304_NotModified | typeof HTTP_307_TemporaryRedirect | typeof HTTP_308_PermanentRedirect;
 export type HTTP_NOTMODIFIED = typeof HTTP_304_NotModified;
-export type HTTP_CLIENT_ERROR = typeof HTTP_400_BadRequest | typeof HTTP_401_Unauthorized | typeof HTTP_403_Forbidden | typeof HTTP_404_NotFound | typeof HTTP_410_Gone | typeof HTTP_418_ImATeapot;
+export type HTTP_CLIENT_ERROR = typeof HTTP_400_BadRequest | typeof HTTP_401_Unauthorized | typeof HTTP_403_Forbidden | typeof HTTP_404_NotFound | typeof HTTP_410_Gone;
 export type HTTP_NOT_FOUND = typeof HTTP_400_BadRequest | typeof HTTP_404_NotFound | typeof HTTP_410_Gone;
 export type HTTP_BANNED = typeof HTTP_401_Unauthorized | typeof HTTP_403_Forbidden;
 export type HTTP_SERVER_ERROR = typeof HTTP_500_InternalServerError;
 export type HTTP_ERROR = HTTP_CLIENT_ERROR | HTTP_SERVER_ERROR;
-export type HTTP_STATUS = HTTP_SUCCESS | HTTP_REDIRECTION | HTTP_CLIENT_ERROR | HTTP_SERVER_ERROR;
+export type HTTP_STATUS = HTTP_SUCCESS | HTTP_REDIRECTION | HTTP_CLIENT_ERROR | typeof HTTP_418_ImATeapot | HTTP_SERVER_ERROR;
 type TimeUnit = 's' | 'm' | 'h' | 'd' | 'w';
 type TTL = number | `${number}${TimeUnit}`;
 type TTLKeywords = 'permanent' | 'unset' | 'no-cache';

package/esm/next/SiteImprove.js

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { Router } from 'next/router';
 import Script from 'next/script';
-import { useCookieHubConsent } from '../CookieHubConsent';
+import { useCookieHubConsent } from '../CookieHubConsent.js';
 // END: Mock typing of SiteImprove's event tracking API
 // --------------------------------------------------------------------------
 //

package/esm/next/http.d.ts

@@ -3,20 +3,20 @@ import React, { FunctionComponent } from 'react';
 import { Cleanup } from '@reykjavik/hanna-utils';
 import { ServerResponse } from 'http';
 import type { AppType } from 'next/app';
-import type { HTTP_ERROR, TTLConfig } from '../http';
-export * from '../http';
+import type { HTTP_418_ImATeapot, HTTP_ERROR, TTLConfig } from '../http.js';
+type HTTP_ERROR_all = HTTP_ERROR | typeof HTTP_418_ImATeapot;
+export * from '../http.js';
 type NextContextLike = {
     res: ServerResponse;
 };
 export type ErrorProps = {
-    statusCode: HTTP_ERROR;
-    /** If a HTTP_ERROR code is passed, a default error message is displayed */
+    statusCode: HTTP_ERROR_all;
     message?: string;
 };
 type ErrorizedPageProps<EP extends ErrorProps = ErrorProps> = {
     __error: ErrorProps;
 } & Omit<EP, keyof ErrorProps>;
-type ShowErrorPageFn<EP extends ErrorProps = ErrorProps> = (response: ServerResponse | NextContextLike, error: (ErrorProps extends EP ? HTTP_ERROR : never) | EP, 
+type ShowErrorPageFn<EP extends ErrorProps = ErrorProps> = (response: ServerResponse | NextContextLike, error: (ErrorProps extends EP ? HTTP_ERROR_all : never) | EP, 
 /** Defaults to `"2s"`. Gets forwarded on to the `cacheControl` helper from `@reykjavik/webtools/http` */
 ttl?: TTLConfig) => {
     props: ErrorizedPageProps<EP>;
@@ -33,10 +33,10 @@ export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorP
     <P extends {
         [key: string]: unknown;
         __error?: undefined;
-    }>(App: AppType<P>): React.FunctionComponent<import("next/dist/shared/lib/utils").AppPropsType<any, P | ({
+    }>(App: AppType<P>): React.FunctionComponent<import("next/dist/shared/lib/utils.js").AppPropsType<any, P | ({
         __error: ErrorProps;
     } & Omit<ErrorProps & EP, keyof ErrorProps>)>> & {
-        getInitialProps?(context: import("next/dist/shared/lib/utils").AppContextType<import("next/router").NextRouter>): P | ({
+        getInitialProps?(context: import("next/dist/shared/lib/utils.js").AppContextType<import("next/router.js").NextRouter>): P | ({
             __error: ErrorProps;
         } & Omit<ErrorProps & EP, keyof ErrorProps>) | Promise<P | ({
             __error: ErrorProps;

package/esm/next/http.js

@@ -10,12 +10,12 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import React from 'react';
-import { cacheControl, HTTP_304_NotModified } from '../http';
+import { cacheControl, HTTP_304_NotModified } from '../http.js';
 /*
   Re-export all of the base [http module](#reykjavikwebtoolshttp)'s exports,
   purely for convenience.
 */
-export * from '../http';
+export * from '../http.js';
 /**
  * Use this method inside a `getServerSideProps` method (or API route)
  * to return an error page with proper HTTP status code and all the shit.

package/http.d.ts

@@ -44,12 +44,12 @@ export declare const HTTP_500_InternalServerError = 500;
 export type HTTP_SUCCESS = typeof HTTP_200_OK | typeof HTTP_201_Created | typeof HTTP_202_Accepted;
 export type HTTP_REDIRECTION = typeof HTTP_301_MovedPermanently | typeof HTTP_302_Found | typeof HTTP_303_SeeOther | typeof HTTP_304_NotModified | typeof HTTP_307_TemporaryRedirect | typeof HTTP_308_PermanentRedirect;
 export type HTTP_NOTMODIFIED = typeof HTTP_304_NotModified;
-export type HTTP_CLIENT_ERROR = typeof HTTP_400_BadRequest | typeof HTTP_401_Unauthorized | typeof HTTP_403_Forbidden | typeof HTTP_404_NotFound | typeof HTTP_410_Gone | typeof HTTP_418_ImATeapot;
+export type HTTP_CLIENT_ERROR = typeof HTTP_400_BadRequest | typeof HTTP_401_Unauthorized | typeof HTTP_403_Forbidden | typeof HTTP_404_NotFound | typeof HTTP_410_Gone;
 export type HTTP_NOT_FOUND = typeof HTTP_400_BadRequest | typeof HTTP_404_NotFound | typeof HTTP_410_Gone;
 export type HTTP_BANNED = typeof HTTP_401_Unauthorized | typeof HTTP_403_Forbidden;
 export type HTTP_SERVER_ERROR = typeof HTTP_500_InternalServerError;
 export type HTTP_ERROR = HTTP_CLIENT_ERROR | HTTP_SERVER_ERROR;
-export type HTTP_STATUS = HTTP_SUCCESS | HTTP_REDIRECTION | HTTP_CLIENT_ERROR | HTTP_SERVER_ERROR;
+export type HTTP_STATUS = HTTP_SUCCESS | HTTP_REDIRECTION | HTTP_CLIENT_ERROR | typeof HTTP_418_ImATeapot | HTTP_SERVER_ERROR;
 type TimeUnit = 's' | 'm' | 'h' | 'd' | 'w';
 type TTL = number | `${number}${TimeUnit}`;
 type TTLKeywords = 'permanent' | 'unset' | 'no-cache';

package/next/SiteImprove.js

@@ -30,7 +30,7 @@ exports.pingSiteImprove = exports.SiteImprove = void 0;
 const react_1 = __importStar(require("react"));
 const router_1 = require("next/router");
 const script_1 = __importDefault(require("next/script"));
-const CookieHubConsent_1 = require("../CookieHubConsent");
+const CookieHubConsent_js_1 = require("../CookieHubConsent.js");
 // END: Mock typing of SiteImprove's event tracking API
 // --------------------------------------------------------------------------
 //
@@ -83,7 +83,7 @@ const scriptUrlTemplate = `https://siteimproveanalytics.com/js/siteanalyze_${idT
  * @see https://github.com/reykjavikcity/webtools/tree/v0.1##siteimprove-component
  */
 const SiteImprove = (props) => {
-    const { analytics } = (0, CookieHubConsent_1.useCookieHubConsent)();
+    const { analytics } = (0, CookieHubConsent_js_1.useCookieHubConsent)();
     const consented = (analytics && props.hasConstented !== false) ||
         (analytics === undefined && props.hasConstented);
     (0, react_1.useEffect)(() => {

package/next/http.d.ts

@@ -3,20 +3,20 @@ import React, { FunctionComponent } from 'react';
 import { Cleanup } from '@reykjavik/hanna-utils';
 import { ServerResponse } from 'http';
 import type { AppType } from 'next/app';
-import type { HTTP_ERROR, TTLConfig } from '../http';
-export * from '../http';
+import type { HTTP_418_ImATeapot, HTTP_ERROR, TTLConfig } from '../http.js';
+type HTTP_ERROR_all = HTTP_ERROR | typeof HTTP_418_ImATeapot;
+export * from '../http.js';
 type NextContextLike = {
     res: ServerResponse;
 };
 export type ErrorProps = {
-    statusCode: HTTP_ERROR;
-    /** If a HTTP_ERROR code is passed, a default error message is displayed */
+    statusCode: HTTP_ERROR_all;
     message?: string;
 };
 type ErrorizedPageProps<EP extends ErrorProps = ErrorProps> = {
     __error: ErrorProps;
 } & Omit<EP, keyof ErrorProps>;
-type ShowErrorPageFn<EP extends ErrorProps = ErrorProps> = (response: ServerResponse | NextContextLike, error: (ErrorProps extends EP ? HTTP_ERROR : never) | EP, 
+type ShowErrorPageFn<EP extends ErrorProps = ErrorProps> = (response: ServerResponse | NextContextLike, error: (ErrorProps extends EP ? HTTP_ERROR_all : never) | EP, 
 /** Defaults to `"2s"`. Gets forwarded on to the `cacheControl` helper from `@reykjavik/webtools/http` */
 ttl?: TTLConfig) => {
     props: ErrorizedPageProps<EP>;
@@ -33,10 +33,10 @@ export declare const makeErrorizeAppHOC: <EP extends Partial<ErrorProps>>(ErrorP
     <P extends {
         [key: string]: unknown;
         __error?: undefined;
-    }>(App: AppType<P>): React.FunctionComponent<import("next/dist/shared/lib/utils").AppPropsType<any, P | ({
+    }>(App: AppType<P>): React.FunctionComponent<import("next/dist/shared/lib/utils.js").AppPropsType<any, P | ({
         __error: ErrorProps;
     } & Omit<ErrorProps & EP, keyof ErrorProps>)>> & {
-        getInitialProps?(context: import("next/dist/shared/lib/utils").AppContextType<import("next/router").NextRouter>): P | ({
+        getInitialProps?(context: import("next/dist/shared/lib/utils.js").AppContextType<import("next/router.js").NextRouter>): P | ({
             __error: ErrorProps;
         } & Omit<ErrorProps & EP, keyof ErrorProps>) | Promise<P | ({
             __error: ErrorProps;

package/next/http.js

@@ -30,12 +30,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notModified304 = exports.makeErrorizeAppHOC = void 0;
 const react_1 = __importDefault(require("react"));
-const http_1 = require("../http");
+const http_js_1 = require("../http.js");
 /*
   Re-export all of the base [http module](#reykjavikwebtoolshttp)'s exports,
   purely for convenience.
 */
-__exportStar(require("../http"), exports);
+__exportStar(require("../http.js"), exports);
 /**
  * Use this method inside a `getServerSideProps` method (or API route)
  * to return an error page with proper HTTP status code and all the shit.
@@ -50,7 +50,7 @@ const showErrorPage = (response, error, ttl = '2s') => {
     const { statusCode, message } = error, otherProps = __rest(error, ["statusCode", "message"]);
     response = 'res' in response ? response.res : response;
     response.statusCode = error.statusCode;
-    (0, http_1.cacheControl)(response, ttl);
+    (0, http_js_1.cacheControl)(response, ttl);
     return {
         props: Object.assign(Object.assign({}, otherProps), { __error: { statusCode, message } }),
     };
@@ -92,7 +92,7 @@ exports.makeErrorizeAppHOC = makeErrorizeAppHOC;
  */
 const notModified304 = (response) => {
     response = 'res' in response ? response.res : response;
-    response.statusCode = http_1.HTTP_304_NotModified;
+    response.statusCode = http_js_1.HTTP_304_NotModified;
     return {
         props: 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/webtools",
-	"version": "0.1.0",
+	"version": "0.1.2",
 	"description": "Misc. JS/TS helpers used by Reykjavík City's web dev teams.",
 	"main": "index.js",
 	"repository": "ssh://git@github.com:reykjavikcity/webtools.git",
@@ -23,9 +23,9 @@
 	},
 	"sideEffects": false,
 	"exports": {
-		"./CookieHubConsent.tsx": {
-			"import": "./esm/CookieHubConsent.tsx.js",
-			"require": "./CookieHubConsent.tsx.js"
+		"./CookieHubConsent": {
+			"import": "./esm/CookieHubConsent.js",
+			"require": "./CookieHubConsent.js"
 		},
 		"./http": {
 			"import": "./esm/http.js",
@@ -35,13 +35,13 @@
 			"import": "./esm/index.js",
 			"require": "./index.js"
 		},
-		"./next/http.tsx": {
-			"import": "./esm/next/http.tsx.js",
-			"require": "./next/http.tsx.js"
+		"./next/http": {
+			"import": "./esm/next/http.js",
+			"require": "./next/http.js"
 		},
-		"./next/SiteImprove.tsx": {
-			"import": "./esm/next/SiteImprove.tsx.js",
-			"require": "./next/SiteImprove.tsx.js"
+		"./next/SiteImprove": {
+			"import": "./esm/next/SiteImprove.js",
+			"require": "./next/SiteImprove.js"
 		}
 	}
 }