Scan Package: Fix Build (#40299)

Automattic · Nov 26, 2024 · 70a19bc · 70a19bc
1 parent f55374c
commit 70a19bc
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 36 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/js-packages/scan/changelog/fix-scan-build b/projects/js-packages/scan/changelog/fix-scan-build
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Fix package build.
diff --git a/projects/js-packages/scan/jest.config.cjs b/projects/js-packages/scan/jest.config.cjs
@@ -2,10 +2,4 @@ const baseConfig = require( 'jetpack-js-tools/jest/config.base.js' );
 
 module.exports = {
 	...baseConfig,
-	transform: {
-		...baseConfig.transform,
-		'\\.[jt]sx?$': require( 'jetpack-js-tools/jest/babel-jest-config-factory.js' )(
-			require.resolve
-		),
-	},
 };
diff --git a/projects/js-packages/scan/package.json b/projects/js-packages/scan/package.json
@@ -23,9 +23,6 @@
 	},
 	"type": "module",
 	"devDependencies": {
-		"@automattic/jetpack-webpack-config": "workspace:*",
-		"@babel/core": "7.26.0",
-		"@babel/plugin-transform-react-jsx": "7.25.9",
 		"@jest/globals": "29.7.0",
 		"@storybook/addon-actions": "8.3.5",
 		"@storybook/blocks": "8.3.5",
@@ -34,8 +31,6 @@
 		"@testing-library/react": "16.0.1",
 		"@types/jest": "29.5.12",
 		"@types/react": "18.3.12",
-		"@wordpress/babel-plugin-import-jsx-pragma": "5.12.0",
-		"babel-jest": "29.7.0",
 		"jest": "^29.7.0",
 		"jest-environment-jsdom": "29.7.0",
 		"storybook": "8.3.5",

diff --git a/projects/js-packages/scan/src/index.ts b/projects/js-packages/scan/src/index.ts
@@ -1,3 +1,3 @@
-export * from './types';
-export * from './constants';
-export * from './utils';
+export * from './types/index.js';
+export * from './constants/index.js';
+export * from './utils/index.js';
diff --git a/projects/js-packages/scan/src/types/index.ts b/projects/js-packages/scan/src/types/index.ts
@@ -1,2 +1,2 @@
-export * from './fixers';
-export * from './threats';
+export * from './fixers.js';
+export * from './threats.js';
diff --git a/projects/js-packages/scan/src/types/threats.ts b/projects/js-packages/scan/src/types/threats.ts
@@ -1,4 +1,4 @@
-import { ThreatFixStatus } from '..';
+import { ThreatFixStatus } from './fixers.js';
 
 export type ThreatStatus = 'fixed' | 'ignored' | 'current';
 

diff --git a/projects/js-packages/scan/src/utils/index.ts b/projects/js-packages/scan/src/utils/index.ts
@@ -1,5 +1,7 @@
 import { __, sprintf } from '@wordpress/i18n';
-import { Threat, ThreatFixStatus, FIXER_IS_STALE_THRESHOLD } from '..';
+import { FIXER_IS_STALE_THRESHOLD } from '../constants/index.js';
+import { type ThreatFixStatus } from '../types/fixers.js';
+import { type Threat } from '../types/threats.js';
 
 export const getThreatType = ( threat: Threat ) => {
 	if ( threat.signature === 'Vulnerable.WP.Core' ) {

diff --git a/projects/js-packages/scan/tsconfig.json b/projects/js-packages/scan/tsconfig.json
@@ -1,4 +1,9 @@
 {
-	"extends": "jetpack-js-tools/tsconfig.base.json",
-	"include": [ "./src/**/*" ]
+	"extends": "jetpack-js-tools/tsconfig.tsc.json",
+	"include": [ "./src/**/*" ],
+	"compilerOptions": {
+		"typeRoots": [ "./node_modules/@types/", "src/*" ],
+		"sourceMap": false,
+		"outDir": "./build/"
+	}
 }
diff --git a/tools/js-tools/jest/jest-resolver.js b/tools/js-tools/jest/jest-resolver.js
@@ -1,3 +1,5 @@
+const tsJestResolver = require( 'ts-jest-resolver' );
+
 // Some packages assume that a "browser" environment is esm or otherwise break in node.
 // List them here and the resolver will adjust the conditions to resolve them as "node" instead.
 // cf. https://github.com/microsoft/accessibility-insights-web/pull/5421#issuecomment-1109168149
@@ -20,7 +22,7 @@ module.exports = ( path, options ) => {
 		conditions.add( 'node' );
 	}
 
-	return options.defaultResolver( path, {
+	return tsJestResolver( path, {
 		...options,
 		basedir,
 		conditions,

diff --git a/tools/js-tools/package.json b/tools/js-tools/package.json
@@ -56,6 +56,7 @@
 		"sort-package-json": "1.50.0",
 		"svelte": "4.2.19",
 		"svelte-eslint-parser": "0.39.2",
+		"ts-jest-resolver": "2.0.1",
 		"typescript": "5.0.4",
 		"yaml": "2.2.2"
 	}