chore(release): correct merge of PR #481 and reverts recent "correcti…

…ons" when reapplying #472
ithaka · Mar 14, 2024 · a64691f · a64691f
1 parent 29d9acc
commit a64691f
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/packages/pharos-site/initComponents.tsx b/packages/pharos-site/initComponents.tsx
@@ -1,4 +1,4 @@
-const pharos = typeof window !== `undefined` ? require('@ithaka/pharos') : null;
+const pharos = typeof window !== `undefined` ? require('@ithaka/pharos/lib/index') : null;
 const registerComponents =
   typeof window !== `undefined` ? require('@ithaka/pharos/lib/utils/registerComponents') : null;
 

diff --git a/packages/pharos-site/package.json b/packages/pharos-site/package.json
@@ -53,8 +53,5 @@
     "type": "git",
     "url": "git+https://github.com/ithaka/pharos.git",
     "directory": "site"
-  },
-  "exports": {
-    "./lib/utils/scss/mixins.scss": "./lib/utils/scss/mixins.scss"
   }
 }
diff --git a/packages/pharos-site/src/components/statics/color/ColorCombos.tsx b/packages/pharos-site/src/components/statics/color/ColorCombos.tsx
@@ -1,6 +1,6 @@
 import type { FC, CSSProperties } from 'react';
 import { colorBox } from './ColorCombos.module.css';
-import tokens from '@ithaka/pharos/lib/styles/tokens';
+import tokens from '@ithaka/pharos/lib/styles/tokens.js';
 import CrossOut from '../CrossOut';
 import { toTitleCase } from '../../../utils/textConvert';
 

diff --git a/packages/pharos-site/src/components/statics/color/ColorGradients.tsx b/packages/pharos-site/src/components/statics/color/ColorGradients.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import type { FC, ReactElement } from 'react';
-import tokens from '@ithaka/pharos/lib/styles/tokens';
+import tokens from '@ithaka/pharos/lib/styles/tokens.js';
 import { colorGradient, gradientLabel, gradientContainer } from './ColorGradients.module.css';
 
 interface Gradient {

diff --git a/packages/pharos-site/src/components/statics/color/ColorSwatches.tsx b/packages/pharos-site/src/components/statics/color/ColorSwatches.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import type { FC, ReactElement, CSSProperties } from 'react';
-import tokens from '@ithaka/pharos/lib/styles/tokens';
+import tokens from '@ithaka/pharos/lib/styles/tokens.js';
 import {
   figure,
   colorSwatch,

diff --git a/packages/pharos-site/src/components/statics/color/ColorTextSquares.tsx b/packages/pharos-site/src/components/statics/color/ColorTextSquares.tsx
@@ -1,6 +1,6 @@
 import type { FC, CSSProperties } from 'react';
 import { container, container_text } from './ColorTextSquares.module.css';
-import tokens from '@ithaka/pharos/lib/styles/tokens';
+import tokens from '@ithaka/pharos/lib/styles/tokens.js';
 import { toTitleCase } from '../../../utils/textConvert';
 
 interface ColorTextSquaresProps {