Merge pull request #231 from embroider-build/try-decorator-transforms

Remove unneeded babel plugins so that shipped addon code is way smaller and easier to debug without sourcemaps
embroider-build · Dec 8, 2023 · c161b56 · c161b56
2 parents 1185872 + 5410e19
commit c161b56
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 17 deletions.
diff --git a/files/__addonLocation__/babel.config.json b/files/__addonLocation__/babel.config.json
@@ -2,12 +2,10 @@
   "plugins": [
 <% if (typescript) { %>  ["@babel/plugin-transform-typescript", { "allExtensions": true, "onlyRemoveTypeImports": true, "allowDeclareFields": true }],
 <% } %>    "@embroider/addon-dev/template-colocation-plugin",
-    "@babel/plugin-transform-class-static-block",
     ["babel-plugin-ember-template-compilation", {
       "targetFormat": "hbs",
       "transforms": []
     }],
-    ["@babel/plugin-proposal-decorators", { "version": "legacy" }],
-    "@babel/plugin-proposal-class-properties"
+    ["module:decorator-transforms", { "runtime": { "import": "decorator-transforms/runtime" } }],
   ]
 }
diff --git a/files/__addonLocation__/package.json b/files/__addonLocation__/package.json
@@ -33,14 +33,12 @@
     "prepack": "rollup --config"
   },
   "dependencies": {
-    "@embroider/addon-shim": "^1.0.0"
+    "@embroider/addon-shim": "^1.0.0",
+    "decorator-transforms": "^1.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.17.0",
     <% if (typescript) { %>"@babel/plugin-transform-typescript": "^7.22.15"<% } else { %>"@babel/eslint-parser": "^7.19.1"<% } %>,
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-decorators": "^7.20.13",
-    "@babel/plugin-transform-class-static-block": "^7.20.0",
     "@babel/runtime": "^7.17.0",
     "@embroider/addon-dev": "^4.1.0",<% if (typescript) { %>
     "@glint/core": "^1.2.0",

diff --git a/tests/smoke-tests/--addon-only.test.ts b/tests/smoke-tests/--addon-only.test.ts
@@ -25,7 +25,7 @@ describe('--addon-only', () => {
     expect(rootContents).to.include('.editorconfig');
     expect(rootContents).to.include('.eslintignore');
     expect(rootContents).to.include('.eslintrc.cjs');
-    expect(rootContents).to.include('.gitignore'); 
+    expect(rootContents).to.include('.gitignore');
     expect(rootContents).to.include('.npmrc');
     expect(rootContents).to.include('.prettierignore');
     expect(rootContents).to.include('.prettierrc.cjs');
@@ -39,11 +39,11 @@ describe('--addon-only', () => {
     expect(rootContents).to.include('rollup.config.mjs');
 
     let configContents = await dirContents(path.join(helper.projectRoot, 'config'));
-    
+
     expect(configContents).to.include('ember-cli-update.json');
 
     let srcContents = await dirContents(path.join(helper.projectRoot, 'src'));
-    
+
     expect(srcContents).to.include('index.js');
   });
 

diff --git a/tests/smoke-tests/--typescript.test.ts b/tests/smoke-tests/--typescript.test.ts
@@ -89,17 +89,12 @@ for (let packageManager of SUPPORTED_PACKAGE_MANAGERS) {
         'template-registry.js.map',
       ]);
 
-      expect(distContents.hashed.length).toBe(4);
-      expect(
-        distContents.hashed
-          .filter((file) => file.includes('_rollup'))
-          .map((file) => file.split('.js')[1]),
-      ).to.deep.equal(['', '.map'], 'the rollup helpers are emitted with a source map');
+      expect(distContents.hashed.length).toBe(2);
       expect(
         distContents.hashed
           .filter((file) => file.includes('template-only'))
           .map((file) => file.split('.js')[1]),
-      ).to.deep.equal(['', '.map'], 'the template-only component is emitted with a source map');
+      ).to.deep.equal(['', '.map'], 'the template-only (private) component is emitted with a source map');
 
       expect(declarationsContents).to.deep.equal([
         'components',