nitro-web 0.0.93 → 0.0.95

package/client/app.tsx

@@ -40,6 +40,10 @@ type RouteWithPolicies = Route & {
 
 export async function setupApp(config: Config, storeContainer: StoreContainer, layouts: React.FC<LayoutProps>[]) {
   if (!layouts) throw new Error('layouts are required')
+  if (!(window as unknown as { useTracked: unknown }).useTracked) {
+    throw new Error('useTracked is not defined globally before setupApp()')
+  }
+
   // Fetch state and init app
   const settings: Settings = {
     beforeApp: config.beforeApp || beforeApp,

package/client/globals.ts

@@ -1,13 +1,7 @@
 import { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
 import { Link, useLocation, useNavigate, useParams } from 'react-router-dom'
-import { onChange } from 'nitro-web'
 
 declare global {
-  // Common application globals
-  const onChange: typeof import('nitro-web').onChange
-
-  // Common aependency globals
-  /** The public API for rendering a history-aware `<a>`. */
   const Link: typeof import('react-router-dom').Link
   const useCallback: typeof import('react').useCallback
   const useEffect: typeof import('react').useEffect
@@ -21,9 +15,6 @@ declare global {
 }
 
 Object.assign(window, {
-  // application globals
-  onChange: onChange,
-  // dependency globals
   Link: Link,
   useCallback: useCallback,
   useEffect: useEffect,

package/client/index.ts

@@ -1,11 +1,12 @@
-// Required Global Types
-import '../types/required-globals.d.ts'
-
-// export const pi = parseFloat(3.142)
-// Utility functions
-export * from '../util.js'
-export * as util from '../util.js'
-export * from '../types'
+// const pi = parseFloat(3.142)
+import '../types/globals.d.ts'
+
+// Utility functions (use export path for js declarations to work in host projects)
+export * from 'nitro-web/util'
+export * as util from 'nitro-web/util'
+
+// Main types
+export * from 'types'
 
 // Main app functions
 export { setupApp, updateJwt } from './app'

package/components/auth/reset.tsx

@@ -1,4 +1,4 @@
-import { Topbar, Field, FormError, Button, request } from 'nitro-web'
+import { Topbar, Field, FormError, Button, request, onChange } from 'nitro-web'
 import { Errors } from 'nitro-web/types'
 
 export function ResetInstructions() {

package/components/auth/signin.tsx

@@ -1,4 +1,4 @@
-import { Topbar, Field, Button, FormError, request, queryObject, injectedConfig, updateJwt } from 'nitro-web'
+import { Topbar, Field, Button, FormError, request, queryObject, injectedConfig, updateJwt, onChange } from 'nitro-web'
 import { Errors } from 'nitro-web/types'
 
 export function Signin() {

package/components/auth/signup.tsx

@@ -1,4 +1,4 @@
-import { Button, Field, FormError, Topbar, request, injectedConfig } from 'nitro-web'
+import { Button, Field, FormError, Topbar, request, injectedConfig, onChange } from 'nitro-web'
 import { Errors } from 'nitro-web/types'
 
 export function Signup() {

package/components/partials/element/accordion.tsx

@@ -1,4 +1,3 @@
-
 import { css } from 'twin.macro'
 import { IsFirstRender } from 'nitro-web'
 

package/components/partials/styleguide.tsx

@@ -2,7 +2,7 @@ import {
   Drop, Dropdown, Field, Select, Button as ButtonNitro, Checkbox, GithubLink, Modal, Calendar, injectedConfig, 
   Filters, FiltersHandleType, FilterType,
 } from 'nitro-web'
-import { getCountryOptions, getCurrencyOptions, ucFirst } from 'nitro-web/util'
+import { getCountryOptions, getCurrencyOptions, onChange, ucFirst } from 'nitro-web/util'
 import { Check, FileEditIcon } from 'lucide-react'
 
 type StyleguideProps = {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "nitro-web",
-  "version": "0.0.93",
+  "version": "0.0.95",
   "repository": "github:boycce/nitro-web",
   "homepage": "https://boycce.github.io/nitro-web/",
   "description": "Nitro is a battle-tested, modular base project to turbocharge your projects, styled using Tailwind 🚀",
-  "main": "./client/index.ts",
   "type": "module",
+  "main": "./client/index.ts",
   "exports": {
     ".": "./client/index.ts",
     "./client/imgs/*": "./client/imgs/*",

package/tsconfig.json

@@ -29,10 +29,9 @@
     "target": "es2022"
   },
   "include": [
-    "client",
+    "client", // includes ./globals.ts
     "components",
-    "server/constants.js",
-    "types",
-    "./types/core-only-globals.d.ts"
+    "server",
+    "types/core-only-globals.d.ts"
   ]
 }

package/types/core-only-globals.d.ts

@@ -1,8 +1,8 @@
 import { Store } from 'nitro-web/types'
 import { Dispatch, SetStateAction } from 'react'
 
-// Core-only global, this global will be defined globally in the project (e.g. in ./client/index.ts)
-declare global { 
+declare global {
+  // useTracked global (normally defined in your project's /client/index.ts)
   const useTracked: () => [Store, Dispatch<SetStateAction<Store>>]
 }
 

package/types/{required-globals.d.ts → globals.d.ts}

@@ -1,24 +1,33 @@
-// Required global types
 import 'twin.macro'
 import { css as cssImport } from '@emotion/react'
 import styledImport from '@emotion/styled'
 import { CSSInterpolation } from '@emotion/serialize'
+import 'axios'
+import type { IAxiosRetry } from 'axios-retry'
 
 declare global {
   /** Webpack injected config variables */
   const INJECTED_CONFIG: Record<string, string|boolean|object>
   /** Webpack svg loader */
-  module '*.svg' {
+  declare module '*.svg' {
     const content: React.FC<React.SVGProps<SVGElement>>
     export default content
   }
+  
   /** Webpack image loader */
-  module '*.jpg' {
+  declare module '*.jpg' {
     const content: string
     export default content
   }
 }
 
+// Webpack: axios-retry augment (since axios-retry is not imported in host project)
+declare module 'axios' {
+  export interface AxiosRequestConfig {
+    'axios-retry'?: IAxiosRetry.IAxiosRetryConfigExtended
+  }
+}
+
 // Webpack: Twin.macro css extension
 // https://github.com/ben-rogerson/twin.examples/tree/master/react-emotion-typescript
 declare module 'twin.macro' {
@@ -37,3 +46,5 @@ declare module 'react' {
     for?: string | undefined
   }
 }
+
+export {}