switch @embroider/router's build to use @rollup/plugin-typescript

embroider-build · Jul 2, 2023 · 3d9a7a0 · 3d9a7a0
1 parent 326562b
commit 3d9a7a0
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 176 deletions.
diff --git a/packages/router/babel.config.json b/packages/router/babel.config.json
@@ -1,8 +1,5 @@
 {
-  "presets": [["@babel/preset-typescript"]],
   "plugins": [
-    "@embroider/addon-dev/template-colocation-plugin",
-    ["@babel/plugin-proposal-decorators", { "legacy": true }],
-    "@babel/plugin-proposal-class-properties"
+    "@babel/plugin-transform-typescript",
   ]
 }
diff --git a/packages/router/package.json b/packages/router/package.json
@@ -35,12 +35,11 @@
   },
   "devDependencies": {
     "@babel/core": "^7.17.0",
-    "@babel/preset-typescript": "^7.18.6",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-decorators": "^7.17.0",
-    "@babel/plugin-syntax-decorators": "^7.17.0",
+    "@babel/plugin-transform-typescript": "^7.8.7",
     "@embroider/addon-dev": "workspace:^",
     "@embroider/macros": "workspace:*",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-typescript": "^11.1.2",
     "@tsconfig/ember": "^1.0.0",
     "@typescript-eslint/eslint-plugin": "^5.59.5",
     "@typescript-eslint/parser": "^5.59.5",
@@ -54,8 +53,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "prettier": "^2.5.1",
     "rollup": "^3.23.0",
-    "rollup-plugin-copy": "^3.4.0",
-    "rollup-plugin-ts": "^3.2.0",
+    "tslib": "^2.6.0",
     "typescript": "^4.9.0"
   },
   "peerDependencies": {

diff --git a/packages/router/rollup.config.mjs b/packages/router/rollup.config.mjs
@@ -1,6 +1,6 @@
-import typescript from 'rollup-plugin-ts';
-import copy from 'rollup-plugin-copy';
+import typescript from '@rollup/plugin-typescript';
 import { Addon } from '@embroider/addon-dev/rollup';
+import { babel } from '@rollup/plugin-babel';
 
 const addon = new Addon({
   srcDir: 'src',
@@ -17,18 +17,18 @@ export default {
     // addon. Anything not listed here may get optimized away.
     addon.publicEntrypoints(['index.js']),
 
-    // Follow the V2 Addon rules about dependencies. Your code can import from
+    // Follow the V2 Addon rules about depecdndencies. Your code can import from
     // `dependencies` and `peerDependencies` as well as standard Ember-provided
     // package names.
     addon.dependencies(),
 
     // compile TypeScript to latest JavaScript, including Babel transpilation
     typescript({
-      transpiler: 'babel',
-      browserslist: false,
-      transpileOnly: true,
+      noForceEmit: true,
     }),
 
+    babel({ extensions: ['.ts'], babelHelpers: 'inline' }),
+
     // Ensure that standalone .hbs files are properly integrated as Javascript.
     addon.hbs(),
 

diff --git a/packages/router/tsconfig.json b/packages/router/tsconfig.json
@@ -2,6 +2,9 @@
   "extends": "@tsconfig/ember/tsconfig.json",
   "include": ["src/**/*"],
   "compilerOptions": {
-    "typeRoots": ["types"]
+    "typeRoots": ["types"],
+    "emitDeclarationOnly": true,
+    "noEmit": false,
+    "declarationDir": "dist"
   }
 }