Revert "Properly handle class properties proposal"

This reverts commit 0d47e8b. Fix #423 #425
emberjs · Dec 16, 2021 · ea752c4 · ea752c4
1 parent 4b44a6f
commit ea752c4
Show file tree

Hide file tree

Showing 6 changed files with 1,336 additions and 2,568 deletions.
diff --git a/lib/babel-options-util.js b/lib/babel-options-util.js
@@ -30,8 +30,8 @@ function _getPresetEnv(config, project) {
 }
 
 function _getModulesPlugin() {
-  const resolvePath =
-    require("./relative-module-paths").resolveRelativeModulePath;
+  const resolvePath = require("./relative-module-paths")
+    .resolveRelativeModulePath;
 
   return [
     [require.resolve("babel-plugin-module-resolver"), { resolvePath }],
@@ -296,12 +296,7 @@ function _getHelperVersion(project) {
   return APP_BABEL_RUNTIME_VERSION.get(project);
 }
 
-function _buildClassFeaturePluginConstraints(
-  constraints,
-  config,
-  parent,
-  project
-) {
+function _buildClassFeaturePluginConstraints(constraints, config, parent, project) {
   // With versions of ember-cli-typescript < 4.0, class feature plugins like
   // @babel/plugin-proposal-class-properties were run before the TS transform.
   if (!_shouldHandleTypeScript(config, parent, project)) {
@@ -312,14 +307,7 @@ function _buildClassFeaturePluginConstraints(
   return constraints;
 }
 
-function _addDecoratorPlugins({
-  plugins,
-  options,
-  config,
-  parent,
-  project,
-  isClassPropertiesRequired,
-}) {
+function _addDecoratorPlugins(plugins, options, config, parent, project) {
   const { hasPlugin, addPlugin } = require("ember-cli-babel-plugin-helpers");
 
   if (hasPlugin(plugins, "@babel/plugin-proposal-decorators")) {
@@ -353,7 +341,7 @@ function _addDecoratorPlugins({
         )} has added the class-properties plugin to its build, but ember-cli-babel provides these by default now! You can remove the transforms, or the addon that provided them, such as @ember-decorators/babel-transforms.`
       );
     }
-  } else if (isClassPropertiesRequired) {
+  } else {
     addPlugin(
       plugins,
       [

diff --git a/lib/get-babel-options.js b/lib/get-babel-options.js
@@ -14,14 +14,14 @@ const {
   _getPresetEnv,
 } = require("./babel-options-util");
 
-module.exports = function getBabelOptions(config, cliBabelInstance) {
-  let { parent, project } = cliBabelInstance;
+module.exports = function getBabelOptions(config, appInstance) {
+  let { parent, project } = appInstance;
   let addonProvidedConfig = _getAddonProvidedConfig(config);
-  let shouldIncludeHelpers = _shouldIncludeHelpers(config, cliBabelInstance);
+  let shouldIncludeHelpers = _shouldIncludeHelpers(config, appInstance);
   let shouldHandleTypeScript = _shouldHandleTypeScript(config, parent, project);
   let shouldIncludeDecoratorPlugins = _shouldIncludeDecoratorPlugins(config);
 
-  let emberCLIBabelConfig = config["ember-cli-babel"];
+ let emberCLIBabelConfig = config["ember-cli-babel"];
   let shouldRunPresetEnv = true;
 
   if (emberCLIBabelConfig) {
@@ -38,16 +38,13 @@ module.exports = function getBabelOptions(config, cliBabelInstance) {
   }
 
   if (shouldIncludeDecoratorPlugins) {
-    userPlugins = _addDecoratorPlugins({
-      plugins: userPlugins.slice(),
-      options: addonProvidedConfig.options,
+    userPlugins = _addDecoratorPlugins(
+      userPlugins.slice(),
+      addonProvidedConfig.options,
       config,
       parent,
-      project,
-      isClassPropertiesRequired: cliBabelInstance.isPluginRequired(
-        "proposal-class-properties"
-      ),
-    });
+      project
+    );
   }
 
   options.plugins = []
@@ -59,8 +56,7 @@ module.exports = function getBabelOptions(config, cliBabelInstance) {
       _getEmberDataPackagesPolyfill(config, parent),
       _shouldCompileModules(config, project) && _getModulesPlugin(),
       userPostTransformPlugins
-    )
-    .filter(Boolean);
+    ).filter(Boolean);
 
   options.presets = [
     shouldRunPresetEnv && _getPresetEnv(addonProvidedConfig, project),