Use rollup for dev build too

microsoft · Dec 4, 2023 · 233e321 · 233e321
1 parent 81a3b3d
commit 233e321
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 22 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/typespec-vscode/extension-shim.js b/packages/typespec-vscode/extension-shim.js
diff --git a/packages/typespec-vscode/package.json b/packages/typespec-vscode/package.json
@@ -21,8 +21,8 @@
   "categories": [
     "Programming Languages"
   ],
-  "type": "commonjs",
-  "main": "./extension-shim.js",
+  "type": "module",
+  "main": "./dist/src/extension.cjs",
   "engines": {
     "vscode": "^1.82.0"
   },
@@ -106,20 +106,20 @@
     ]
   },
   "scripts": {
-    "clean": "rimraf ./dist ./dist-dev ./temp",
-    "build": "npm run compile && npm run rollup && npm run copy-tmlanguage && npm run generate-language-configuration && npm run generate-third-party-notices && npm run package-vsix",
-    "compile": "tsc -p .",
-    "watch": "tsc -p . --watch",
+    "clean": "rimraf ./dist ./temp",
+    "build": "npm run compile && npm run copy-tmlanguage && npm run generate-language-configuration && npm run generate-third-party-notices && npm run package-vsix",
+    "compile": "rollup --config rollup.config.ts --configPlugin typescript --failAfterWarnings 2>&1",
+    "watch": "rollup --config rollup.config.ts --configPlugin typescript --watch",
     "dogfood": "node scripts/dogfood.js",
     "copy-tmlanguage": "node scripts/copy-tmlanguage.js",
     "generate-language-configuration": "node scripts/generate-language-configuration.js",
     "generate-third-party-notices": "typespec-build-tool generate-third-party-notices",
-    "rollup": "rollup --config --failAfterWarnings 2>&1",
     "package-vsix": "vsce package"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "~25.0.4",
     "@rollup/plugin-node-resolve": "~15.2.1",
+    "@rollup/plugin-typescript": "~11.1.5",
     "@types/mocha": "~10.0.1",
     "@types/node": "~18.11.9",
     "@types/vscode": "~1.82.0",

diff --git a/packages/typespec-vscode/rollup.config.mjs → packages/typespec-vscode/rollup.config.ts b/packages/typespec-vscode/rollup.config.mjs → packages/typespec-vscode/rollup.config.ts
@@ -1,19 +1,24 @@
-// @ts-check
 import commonjs from "@rollup/plugin-commonjs";
 import resolve from "@rollup/plugin-node-resolve";
+import typescript from "@rollup/plugin-typescript";
+
 import { defineConfig } from "rollup";
 
 export default defineConfig({
-  input: "dist-dev/src/extension.js",
+  input: "src/extension.ts",
   output: {
-    file: "dist/src/extension.js",
+    file: "dist/src/extension.cjs",
     format: "commonjs",
     sourcemap: true,
     exports: "named",
     inlineDynamicImports: true,
   },
   external: ["fs/promises", "vscode"],
-  plugins: [resolve({ preferBuiltins: true }), commonjs()],
+  plugins: [
+    (resolve as any)({ preferBuiltins: true }),
+    (commonjs as any)(),
+    (typescript as any)({ tsconfig: "./tsconfig.build.json" }),
+  ],
   onwarn: (warning, warn) => {
     if (warning.code === "CIRCULAR_DEPENDENCY") {
       // filter out warnings about circular dependencies out of our control

diff --git a/packages/typespec-vscode/tsconfig.build.json b/packages/typespec-vscode/tsconfig.build.json
@@ -0,0 +1,10 @@
+// tsconfig for building the playground
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": true,
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext"
+  },
+  "include": ["src/**/*.ts"]
+}
diff --git a/packages/typespec-vscode/tsconfig.json b/packages/typespec-vscode/tsconfig.json
@@ -2,13 +2,14 @@
   "extends": "../tsconfig.json",
   "references": [{ "path": "../tmlanguage-generator/tsconfig.json" }],
   "compilerOptions": {
-    "outDir": "dist-dev",
+    "incremental": false,
+    "composite": false,
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "sourceMap": false,
+    "resolveJsonModule": true,
+    "outDir": "dist",
     "rootDir": ".",
-    "tsBuildInfoFile": "temp/tsconfig.tsbuildinfo",
-    "module": "ES2022",
-    "moduleResolution": "Bundler",
-    "skipLibCheck": true,
-    "types": ["node", "mocha"]
   },
-  "include": ["src/**/*.ts", "test/**/*.ts"]
+  "include": ["rollup.config.ts", "src/**/*.ts", "test/**/*.ts"]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -10,7 +10,6 @@
     { "path": "packages/openapi3/tsconfig.json" },
     { "path": "packages/lint/tsconfig.json" },
     { "path": "packages/migrate/tsconfig.json" },
-    { "path": "packages/typespec-vscode/tsconfig.json" },
     { "path": "packages/internal-build-utils/tsconfig.json" },
     { "path": "packages/bundle-uploader/tsconfig.json" },
     { "path": "packages/tmlanguage-generator/tsconfig.json" },