Revert "Include decorator and class field plugins after TypeScript, i…

…f present" This reverts commit e08b59d.
emberjs · Dec 12, 2019 · eeed4fa · eeed4fa
1 parent a72f8b0
commit eeed4fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -340,8 +340,7 @@ module.exports = {
         plugins,
         [require.resolve('@babel/plugin-proposal-decorators'), { legacy: true }],
         {
-          before: ['@babel/plugin-proposal-class-properties'],
-          after: ['@babel/plugin-transform-typescript']
+          before: ['@babel/plugin-proposal-class-properties', '@babel/plugin-transform-typescript']
         }
       );
     }
@@ -358,7 +357,8 @@ module.exports = {
         plugins,
         [require.resolve('@babel/plugin-proposal-class-properties'), { loose: options.loose || false }],
         {
-          after: ['@babel/plugin-proposal-decorators', '@babel/plugin-transform-typescript']
+          after: ['@babel/plugin-proposal-decorators'],
+          before: ['@babel/plugin-transform-typescript']
         }
       );
     }

diff --git a/node-tests/addon-test.js b/node-tests/addon-test.js
@@ -792,12 +792,6 @@ describe('ember-cli-babel', function() {
 
       expect(loosePlugins[1][1].loose).to.equal(true, 'loose setting added correctly');
     });
-
-    it('should include class fields and decorators after typescript if detected', function() {
-      let plugins = this.addon._addDecoratorPlugins(['@babel/plugin-transform-typescript'], {});
-      expect(plugins[0]).to.equal('@babel/plugin-transform-typescript', 'typescript still first');
-      expect(plugins.length).to.equal(3, 'class fields and decorators added');
-    });
   });
 
   describe('_shouldIncludeHelpers()', function() {