Skip to content

Commit bccbbb1

Browse files
committed
config: remove jest config fluff & .js extensions from local imports
The current tests are working without the .js extension usually required by es modules. Without adding more tests, I have withdrawn the added extensions until deemed necessary.
1 parent 2fa110e commit bccbbb1

9 files changed

+20
-30
lines changed

jest.config.cjs

-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@
33

44
module.exports = {
55
// ESM config
6-
// extensionsToTreatAsEsm: ['.ts'],
7-
// moduleNameMapper: {
8-
// '^(\\.{1,2}/.*)\\.js$': '$1',
9-
// },
106
transform: {
11-
'^.+\\.[tj]sx?$': 'ts-jest', // to process js/ts with `ts-jest`
12-
// '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
137
'^.+\\.tsx?$': [
148
'ts-jest',
159
{

src/Html.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
2-
import renderHtml, { HtmlRenderers } from './render.js';
3-
import { HtmlStyle, HtmlStyles } from './styles.js';
2+
import renderHtml, { HtmlRenderers } from './render';
3+
import { HtmlStyle, HtmlStyles } from './styles';
44

55
export type HtmlProps = {
66
collapse?: boolean;

src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export { default, default as Html } from './Html.js';
2-
export { default as renderHtml } from './render.js';
3-
export { HtmlStyle, HtmlStyles } from './styles.js';
1+
export { default, default as Html } from './Html';
2+
export { default as renderHtml } from './render';
3+
export { HtmlStyle, HtmlStyles } from './styles';

src/parse.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import parseHtml, {
22
convertElementStyle,
33
convertStylesheet,
44
HtmlElement,
5-
} from './parse.js';
5+
} from './parse';
66

77
describe('parse', () => {
88
describe('convertStylesheet', () => {

src/parse.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import {
55
parse,
66
TextNode,
77
} from 'node-html-parser';
8-
import { Tag } from './tags.js';
8+
import { Tag } from './tags';
99
import cssTree, { Block, Declaration, List, Rule, StyleSheet } from 'css-tree';
10-
import supportedStyles from './supportedStyles.js';
11-
import { HtmlStyle, HtmlStyles } from './styles.js';
12-
import remoteCss from './resolveCssFile.js';
10+
import supportedStyles from './supportedStyles';
11+
import { HtmlStyle, HtmlStyles } from './styles';
12+
import remoteCss from './resolveCssFile';
1313
import camelize from 'camelize';
1414

1515
export type HtmlContent = (HtmlElement | string)[];

src/render.test.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import React, { ReactElement, ReactNode } from 'react';
22
// const stringify = require('json-stringify-safe');
3-
import { HtmlContent, HtmlElement } from './parse.js';
3+
import { HtmlContent, HtmlElement } from './parse';
44
import renderHtml, {
55
bucketElements,
66
collapseWhitespace,
77
hasBlockContent,
8-
} from './render.js';
8+
} from './render';
99

1010
const scrub = (object: any) => {
1111
if (Array.isArray(object)) {

src/render.tsx

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
import React, { ReactElement } from 'react';
2-
import renderers, {
3-
renderBlock,
4-
renderInline,
5-
renderNoop,
6-
} from './renderers.js';
2+
import renderers, { renderBlock, renderInline, renderNoop } from './renderers';
73
import { Text, View } from '@react-pdf/renderer';
8-
import parseHtml, { HtmlContent, HtmlElement } from './parse.js';
9-
import { createHtmlStylesheet, HtmlStyle, HtmlStyles } from './styles.js';
4+
import parseHtml, { HtmlContent, HtmlElement } from './parse';
5+
import { createHtmlStylesheet, HtmlStyle, HtmlStyles } from './styles';
106
import { Style } from '@react-pdf/types';
11-
import { isText, Tag } from './tags.js';
7+
import { isText, Tag } from './tags';
128

139
export type HtmlRendererProps = {
1410
element: HtmlElement;

src/renderers.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import {
2020
Tspan,
2121
View,
2222
} from '@react-pdf/renderer';
23-
import { HtmlRenderer, HtmlRenderers, WrapperRenderer } from './render.js';
24-
import { HtmlElement } from './parse.js';
25-
import { HtmlStyle } from './styles.js';
23+
import { HtmlRenderer, HtmlRenderers, WrapperRenderer } from './render';
24+
import { HtmlElement } from './parse';
25+
import { HtmlStyle } from './styles';
2626
import { lowerAlpha, orderedAlpha, upperAlpha } from './ordered.type';
2727
import { Style } from '@react-pdf/types';
2828
import camelize from 'camelize';

src/styles.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { StyleSheet } from '@react-pdf/renderer';
22
import { Style } from '@react-pdf/types';
3-
import { Tag } from './tags.js';
3+
import { Tag } from './tags';
44

55
export type HtmlStyle =
66
| (Style & {

0 commit comments

Comments
 (0)