Fix modules resolution

openrewrite/README.md

@@ -6,9 +6,7 @@ To be able to make changes to both these projects and make sure that they work t
 1. Start by cloning both `openrewrite/rewrite-javascript` (this repo) and `moderneinc/rewrite-remote`
 2. For both repos perform the following steps:
    1. Run the build using `npm run build`
-   2. Copy the `package.json` file to the `dist` folder
-   3. Go into the `dist` folder and run `npm link`
-   4. This last step only needs to be done once
+   2. Run `npm link`. This last step only needs to be done once
 3. Now `npm link` needs to be run in either project to link it into `node_modules`:
    1. For `openrewrite/rewrite-javascript` run `npm link @openrewrite/rewrite-remote`
    2. For `moderneinc/rewrite-remote` run `npm link @openrewrite/rewrite`

openrewrite/jest.config.js

@@ -5,7 +5,7 @@ module.exports = {
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
   moduleNameMapper: {
     '^@openrewrite/rewrite/(.*)$': '<rootDir>/dist/$1',
-    '^@openrewrite/rewrite-remote(.*)$': '<rootDir>/node_modules/@openrewrite/rewrite-remote$1'
+    '^@openrewrite/rewrite-remote(.*)$': '<rootDir>/node_modules/@openrewrite/rewrite-remote/dist$1'
   },
   transform: {
     '^.+\\.tsx?$': ['ts-jest', {

openrewrite/package.json

@@ -4,22 +4,21 @@
   "license": "Apache-2.0",
   "description": "OpenRewrite implementation for JavaScript.",
   "homepage": "https://github.com/openrewrite/rewrite-javascript",
-  "main": "index.js",
-  "types": "index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
-    ".": "./index.js",
-    "./core": "./core/index.js",
-    "./java": "./java/index.js",
-    "./java/tree": "./java/tree/index.js",
-    "./javascript": "./javascript/index.js",
-    "./javascript/tree": "./javascript/tree/index.js",
-    "./json": "./json/index.js",
-    "./yaml": "./yaml/index.js",
-    "./yaml/tree": "./yaml/tree/index.js"
+    ".": "./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"
   },
   "scripts": {
     "build": "tsc --build tsconfig.build.json",
-    "postbuild": "cp package.json dist",
     "dev": "tsc --watch -p tsconfig.json",
     "test": "jest"
   },

openrewrite/test/javascript/testHarness.ts

@@ -13,7 +13,7 @@ import * as J from "../../dist/java/tree";
 import * as JS from "../../dist/javascript/tree";
 import dedent from "dedent";
 import {ReceiverContext, RemotePrinterFactory, RemotingContext, SenderContext} from "@openrewrite/rewrite-remote";
-import * as deser from "@openrewrite/rewrite-remote/java/serializers";
+import * as deser from "@openrewrite/rewrite-remote/java";
 import {JavaScriptReceiver, JavaScriptSender} from "@openrewrite/rewrite-remote/javascript";
 import net from "net";
 import {JavaScriptParser, JavaScriptVisitor} from "../../dist/javascript";

openrewrite/tsconfig.json

@@ -1,15 +1,16 @@
 {
   "compilerOptions": {
     "target": "es2016",
-    "module": "commonjs",
+    "module": "Node16",
     "sourceMap": true,
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "strict": true,
     "skipLibCheck": true,
     "rootDir": "./src",
     "outDir": "./dist",
-    "experimentalDecorators": true
+    "experimentalDecorators": true,
+    "moduleResolution": "node16"
   },
   "include": ["src/**/*"],
 }