Remove AMD and CJS build, but keep monaco-converter(/cjs)

README.md

@@ -50,7 +50,7 @@ Or you use a fresh dev environment in [Gitpod](https://www.gitpod.io) which is a
 
 ### Scripts Overview
 
-The main [package.json](./package.json) contains script entries applicable to the whole workspace like `clean` amd `compile`, but it also has entries for launching script from the packages (lib and examples).
+The main [package.json](./package.json) contains script entries applicable to the whole workspace like `clean` and `compile`, but it also has entries for launching script from the packages (lib and examples).
 
 For example if you want to rebuild the library you can do it in different ways. From CLI run one of:
 ```bash

package.json

@@ -27,7 +27,7 @@
     "npm": "8.11.0"
   },
   "scripts": {
-    "clean": "npm run clean --workspaces && npm run clean:amd --workspace packages/client && npm run webpack:clean --workspace packages/examples/client",
+    "clean": "npm run clean --workspaces && npm run webpack:clean --workspace packages/examples/client",
     "compile": "npm run compile --workspaces",
     "lint": "npm run lint --workspaces",
     "dev": "vite --debug --force",

packages/client/package.json

@@ -27,33 +27,18 @@
       "types": "./lib/monaco-converter.d.ts",
       "default": "./lib/monaco-converter.js"
     },
-    "./cjs": {
-      "types": "./dist/cjs/index.d.ts",
-      "default": "./dist/cjs/index.js"
-    },
     "./cjs/monaco-converter": {
       "types": "./dist/cjs/monaco-converter.d.ts",
       "default": "./dist/cjs/monaco-converter.js"
-    },
-    "./amd": {
-      "types": "./dist/amd/index.d.ts",
-      "default": "./dist/amd/index.js"
-    },
-    "./amd/monaco-converter": {
-      "types": "./dist/amd/monaco-converter.d.ts",
-      "default": "./dist/amd/monaco-converter.js"
     }
   },
   "typesVersions": {
     "*": {
-      "cjs": [ "dist/cjs/index" ],
-      "amd": [ "dist/amd/index" ],
       "monaco-converter": [ "lib/monaco-converter" ],
       "monaco-converter/cjs": [ "dist/cjs/monaco-converter" ]
     }
   },
   "files": [
-    "dist/amd",
     "dist/cjs",
     "lib",
     "src",
@@ -76,13 +61,11 @@
   },
   "scripts": {
     "clean": "npx shx rm -fr lib tsconfig.tsbuildinfo",
-    "clean:amd": "npx shx rm -fr dist/amd dist/tsconfig.tsbuildinfo",
-    "clean:cjs": "npx shx rm -fr dist/cjs dist/tsconfig.tsbuildinfo",
+    "clean:cjs": "npx shx rm -fr dist",
     "lint": "eslint src --ext .ts",
     "compile": "tsc",
     "watch": "tsc -w",
-    "build:amd": "npm run clean:amd && tsc --outDir dist/amd --module amd --declarationDir dist/amd --declaration",
-    "build:cjs": "npm run clean:cjs && tsc --outDir dist/cjs --module commonjs --declarationDir dist/cjs --declaration",
-    "build": "npm run clean && npm run compile && npm run build:amd && npm run build:cjs"
+    "build:cjs": "npm run clean:cjs && tsc -p ./tsconfig.cjs.json",
+    "build": "npm run clean && npm run compile && npm run build:cjs"
   }
 }

packages/client/tsconfig.cjs.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../tsconfig",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist/cjs",
+    "declarationDir": "dist/cjs",
+    "noUnusedParameters": false,
+    "module": "CommonJS"
+  },
+  "include": [
+    "src/monaco-converter.ts",
+  ],
+  "exclude": [
+    "dist",
+    "lib",
+    "node_modules"
+  ]
+}

packages/vscode-ws-jsonrpc/CHANGELOG.md

@@ -2,13 +2,25 @@
 
 All notable changes to this npm module are documented in this file.
 
+## 1.x.x BREAKING CHANGES
+
+The default export now provides esm code. If you require CommonJS modules you can use the additional exports.
+The npm packages exports the following:
+
+- `vscode-ws-jsonrpc`
+- `vscode-ws-jsonrpc/server`
+- `vscode-ws-jsonrpc/socket`
+- `vscode-ws-jsonrpc/cjs`
+- `vscode-ws-jsonrpc/cjs/server`
+- `vscode-ws-jsonrpc/cjs/socket`
+
 ## [1.0.1] - 2022-06-22
 
-* Library ships as src, esm and cjs builds. Use `typesVersions` in **package.json** for proper TypeScript import support
+- Library ships as src, esm and cjs builds. Use `typesVersions` in **package.json** for proper TypeScript import support
 
 ## [1.0.0] - 2022-06-21
 
-* Merged npm packages `@codingame/monaco-jsonrpc` and `vscode-ws-jsonrpc` into this package.
-* Integrate eslint with eslint-config-standard #[385](https://github.com/TypeFox/monaco-languageclient/pull/385)
+- Merged npm packages `@codingame/monaco-jsonrpc` and `vscode-ws-jsonrpc` into this package.
+- Integrate eslint with eslint-config-standard #[385](https://github.com/TypeFox/monaco-languageclient/pull/385)
 
 There was no CHANGELOG available in the previous repositories.

packages/vscode-ws-jsonrpc/package.json

@@ -69,11 +69,11 @@
   },
   "scripts": {
     "clean": "npx shx rm -fr lib tsconfig.tsbuildinfo",
-    "clean:cjs": "npx shx rm -fr dist/cjs dist/tsconfig.tsbuildinfo",
+    "clean:cjs": "npx shx rm -fr dist",
     "lint": "eslint src --ext .ts",
     "compile": "tsc",
     "watch": "tsc -w",
-    "build:cjs": "npm run clean:cjs && tsc --outDir dist/cjs --module commonjs --declarationDir dist/cjs --declaration",
+    "build:cjs": "npm run clean:cjs && tsc -p ./tsconfig.cjs.json",
     "build": "npm run clean && npm run compile && npm run build:cjs"
   }
 }

packages/vscode-ws-jsonrpc/tsconfig.cjs.json

@@ -0,0 +1,17 @@
+{
+  "extends": "../../tsconfig",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "dist/cjs",
+    "declarationDir": "dist/cjs",
+    "module": "CommonJS"
+  },
+  "include": [
+    "src/**/*.ts",
+  ],
+  "exclude": [
+    "dist",
+    "lib",
+    "node_modules"
+  ]
+}