Use '.' as rootDir

openrewrite · Sep 28, 2024 · 3b9e679 · 3b9e679
1 parent e9de42c
commit 3b9e679
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 31 deletions.
diff --git a/openrewrite/jest.config.js b/openrewrite/jest.config.js
@@ -4,7 +4,7 @@ module.exports = {
   testPathIgnorePatterns: ['/node_modules/', '/dist/'],
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   moduleNameMapper: {
-    '^@openrewrite/rewrite/(.*)$': '<rootDir>/dist/$1',
+    '^@openrewrite/rewrite/(.*)$': '<rootDir>/dist/src/$1',
     '^@openrewrite/rewrite-remote(.*)$': '<rootDir>/node_modules/@openrewrite/rewrite-remote/dist$1'
   },
   transform: {

diff --git a/openrewrite/package.json b/openrewrite/package.json
@@ -4,18 +4,18 @@
   "license": "Apache-2.0",
   "description": "OpenRewrite implementation for JavaScript.",
   "homepage": "https://github.com/openrewrite/rewrite-javascript",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "main": "./dist/src/index.js",
+  "types": "./dist/src/index.d.ts",
   "exports": {
-    ".": "./dist/index.js",
-    "./core": "./dist/core/index.js",
-    "./java": "./dist/java/index.js",
-    "./java/tree": "./dist/java/tree/index.js",
-    "./javascript": "./dist/javascript/index.js",
-    "./javascript/tree": "./dist/javascript/tree/index.js",
-    "./json": "./dist/json/index.js",
-    "./yaml": "./dist/yaml/index.js",
-    "./yaml/tree": "./dist/yaml/tree/index.js"
+    ".": "./dist/src/index.js",
+    "./core": "./dist/src/core/index.js",
+    "./java": "./dist/src/java/index.js",
+    "./java/tree": "./dist/src/java/tree/index.js",
+    "./javascript": "./dist/src/javascript/index.js",
+    "./javascript/tree": "./dist/src/javascript/tree/index.js",
+    "./json": "./dist/src/json/index.js",
+    "./yaml": "./dist/src/yaml/index.js",
+    "./yaml/tree": "./dist/src/yaml/tree/index.js"
   },
   "scripts": {
     "build": "tsc --build tsconfig.build.json",

diff --git a/openrewrite/test/javascript/parser/literal.test.ts b/openrewrite/test/javascript/parser/literal.test.ts
@@ -1,6 +1,6 @@
-import * as J from "../../../dist/java/tree";
-import {JavaType} from "../../../dist/java/tree";
-import * as JS from "../../../dist/javascript/tree";
+import * as J from "../../../dist/src/java/tree";
+import {JavaType} from "../../../dist/src/java";
+import * as JS from "../../../dist/src/javascript";
 import {connect, disconnect, rewriteRunWithOptions, typeScript} from '../testHarness';
 
 describe('identifier mapping', () => {

diff --git a/openrewrite/test/javascript/parser/object.test.ts b/openrewrite/test/javascript/parser/object.test.ts
@@ -24,7 +24,6 @@ describe('object literal mapping', () => {
           typeScript('const c = { foo: 1, bar: 2 }')
         );
     });
-
     test('trailing comma', () => {
         rewriteRun(
           //language=typescript

diff --git a/openrewrite/test/javascript/parser/parser.test.ts b/openrewrite/test/javascript/parser/parser.test.ts
@@ -1,6 +1,6 @@
-import {InMemoryExecutionContext, ParserInput} from '../../../dist/core';
-import {JavaScriptParser} from "../../../dist/javascript";
-import * as JS from "../../../dist/javascript/tree";
+import {InMemoryExecutionContext, ParserInput} from '../../../dist/src/core';
+import {JavaScriptParser} from "../../../dist/src/javascript";
+import * as JS from "../../../dist/src/javascript";
 
 describe('Parser API', () => {
     const parser = JavaScriptParser.builder().build();

diff --git a/openrewrite/test/javascript/parser/variableDeclarations.test.ts b/openrewrite/test/javascript/parser/variableDeclarations.test.ts
@@ -1,4 +1,4 @@
-import * as J from "../../../dist/java/tree";
+import * as J from "../../../dist/src/java";
 import {connect, disconnect, rewriteRun, typeScript} from '../testHarness';
 
 describe('variable declaration mapping', () => {

diff --git a/openrewrite/test/javascript/parser/void.test.ts b/openrewrite/test/javascript/parser/void.test.ts
@@ -1,6 +1,6 @@
 import {connect, disconnect, rewriteRun, typeScript} from '../testHarness';
-import * as JS from '../../../dist/javascript/tree';
-import {JavaType} from "../../../dist/java/tree";
+import * as JS from '../../../dist/src/javascript';
+import {JavaType} from "../../../dist/src/java";
 
 describe('void operator mapping', () => {
     beforeAll(() => connect());

diff --git a/openrewrite/test/javascript/testHarness.ts b/openrewrite/test/javascript/testHarness.ts
@@ -12,13 +12,13 @@ import {
     PrintOutputCapture,
     RecipeRunException,
     SourceFile
-} from '../../dist/core';
-import * as J from "../../dist/java/tree";
-import * as JS from "../../dist/javascript/tree";
+} from '../../dist/src/core';
+import * as J from "../../dist/src/java/tree";
+import * as JS from "../../dist/src/javascript/tree";
 import dedent from "dedent";
 import {RemotePrinterFactory, RemotingContext} from "@openrewrite/rewrite-remote";
 import net from "net";
-import {JavaScriptParser, JavaScriptVisitor} from "../../dist/javascript";
+import {JavaScriptParser, JavaScriptVisitor} from "../../dist/src/javascript";
 
 export interface RewriteTestOptions {
     normalizeIndent?: boolean

diff --git a/openrewrite/tsconfig.json b/openrewrite/tsconfig.json
@@ -7,10 +7,10 @@
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "skipLibCheck": true,
-    "rootDir": "./src",
+    "rootDir": ".",
     "outDir": "./dist",
     "experimentalDecorators": true,
     "moduleResolution": "node16"
   },
-  "include": ["src/**/*"],
+  "include": ["src/**/*", "test/**/*"],
 }
diff --git a/openrewrite/tsconfig.test.json b/openrewrite/tsconfig.test.json
@@ -1,7 +1,4 @@
 {
   "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./test"
-  },
   "include": ["test/**/*.ts"],
 }