Revert "DEV: @babel/plugin-proposal-decorators -> `decorator-transf…

…orms` (#25290)" (#26971) This reverts commit 0f45208. This has led to two problems: 1. An incompatibility with Cloudflare's "auto minify" feature. They've deprecated this feature because of incompatibility with modern JS syntax. But unfortunately it will remain enabled on existing properties until 2024-08-05. 2. Discourse fails to boot in Safari 15. This is strange, because Safari does support all the required features in our production JS bundles. Even more strangely, things start working as soon as you open the developer tools. That suggests the cause could be a Safari bug rather than a simple incompatibility. Reverting while we work out a path forward on both those issues.
discourse · May 10, 2024 · 97847f6 · 97847f6 · discoursebot · May 10, 2024
1 parent 47cabdc
commit 97847f6
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 151 deletions.
diff --git a/app/assets/javascripts/admin/index.js b/app/assets/javascripts/admin/index.js
@@ -6,23 +6,6 @@ const path = require("path");
 module.exports = {
   name: require("./package").name,
 
-  options: {
-    babel: {
-      plugins: [
-        [
-          require.resolve("decorator-transforms"),
-          {
-            runEarly: true,
-          },
-        ],
-      ],
-    },
-
-    "ember-cli-babel": {
-      disableDecoratorTransforms: true,
-    },
-  },
-
   // return an empty tree here as we do not want the addon modules to be
   // included into vendor.js; instead, we will produce a separate bundle
   // (admin.js) to be included via a script tag as needed

diff --git a/app/assets/javascripts/dialog-holder/index.js b/app/assets/javascripts/dialog-holder/index.js
@@ -3,23 +3,6 @@
 module.exports = {
   name: require("./package").name,
 
-  options: {
-    babel: {
-      plugins: [
-        [
-          require.resolve("decorator-transforms"),
-          {
-            runEarly: true,
-          },
-        ],
-      ],
-    },
-
-    "ember-cli-babel": {
-      disableDecoratorTransforms: true,
-    },
-  },
-
   isDevelopingAddon() {
     return true;
   },

diff --git a/app/assets/javascripts/discourse-common/index.js b/app/assets/javascripts/discourse-common/index.js
@@ -8,21 +8,6 @@ module.exports = {
         handlebars: "handlebars/dist/cjs/handlebars.js",
       },
     },
-
-    babel: {
-      plugins: [
-        [
-          require.resolve("decorator-transforms"),
-          {
-            runEarly: true,
-          },
-        ],
-      ],
-    },
-
-    "ember-cli-babel": {
-      disableDecoratorTransforms: true,
-    },
   },
 
   isDevelopingAddon() {

diff --git a/app/assets/javascripts/discourse-plugins/index.js b/app/assets/javascripts/discourse-plugins/index.js
@@ -97,20 +97,11 @@ module.exports = {
 
   options: {
     babel: {
-      plugins: [
-        require.resolve("deprecation-silencer"),
-        [
-          require.resolve("decorator-transforms"),
-          {
-            runEarly: true,
-          },
-        ],
-      ],
+      plugins: [require.resolve("deprecation-silencer")],
     },
 
     "ember-cli-babel": {
       throwUnlessParallelizable: true,
-      disableDecoratorTransforms: true,
     },
 
     "ember-this-fallback": {

diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js
@@ -1,5 +1,4 @@
 /* eslint-disable simple-import-sort/imports */
-import "decorator-transforms/globals";
 import "./loader-shims";
 import "./global-compat";
 /* eslint-enable simple-import-sort/imports */

diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js
@@ -60,20 +60,10 @@ module.exports = function (defaults) {
 
     "ember-cli-babel": {
       throwUnlessParallelizable: true,
-      disableDecoratorTransforms: true,
     },
 
     babel: {
-      sourceMaps: false,
-      plugins: [
-        require.resolve("deprecation-silencer"),
-        [
-          require.resolve("decorator-transforms"),
-          {
-            runEarly: true,
-          },
-        ],
-      ],
+      plugins: [require.resolve("deprecation-silencer")],
     },
 
     vendorFiles: {

diff --git a/app/assets/javascripts/discourse/tests/setup-tests.js b/app/assets/javascripts/discourse/tests/setup-tests.js
@@ -1,5 +1,4 @@
 /* eslint-disable simple-import-sort/imports */
-import Application from "../app";
 import "./loader-shims";
 /* eslint-enable simple-import-sort/imports */
 
@@ -47,6 +46,7 @@ import deprecated from "discourse-common/lib/deprecated";
 import { setDefaultOwner } from "discourse-common/lib/get-owner";
 import { setupS3CDN, setupURL } from "discourse-common/lib/get-url";
 import { buildResolver } from "discourse-common/resolver";
+import Application from "../app";
 import { loadSprites } from "../lib/svg-sprite-loader";
 import * as FakerModule from "@faker-js/faker";
 import { setLoadedFaker } from "discourse/lib/load-faker";

diff --git a/app/assets/javascripts/float-kit/index.js b/app/assets/javascripts/float-kit/index.js
@@ -2,22 +2,7 @@
 
 module.exports = {
   name: require("./package").name,
-  options: {
-    babel: {
-      plugins: [
-        [
-          require.resolve("decorator-transforms"),
-          {
-            runEarly: true,
-          },
-        ],
-      ],
-    },
-
-    "ember-cli-babel": {
-      disableDecoratorTransforms: true,
-    },
-  },
+  options: {},
   isDevelopingAddon() {
     return true;
   },

diff --git a/app/assets/javascripts/pretty-text/index.js b/app/assets/javascripts/pretty-text/index.js
@@ -3,23 +3,6 @@
 module.exports = {
   name: require("./package").name,
 
-  options: {
-    babel: {
-      plugins: [
-        [
-          require.resolve("decorator-transforms"),
-          {
-            runEarly: true,
-          },
-        ],
-      ],
-    },
-
-    "ember-cli-babel": {
-      disableDecoratorTransforms: true,
-    },
-  },
-
   isDevelopingAddon() {
     return true;
   },

diff --git a/app/assets/javascripts/select-kit/index.js b/app/assets/javascripts/select-kit/index.js
@@ -2,22 +2,7 @@
 
 module.exports = {
   name: require("./package").name,
-  options: {
-    babel: {
-      plugins: [
-        [
-          require.resolve("decorator-transforms"),
-          {
-            runEarly: true,
-          },
-        ],
-      ],
-    },
-
-    "ember-cli-babel": {
-      disableDecoratorTransforms: true,
-    },
-  },
+  options: {},
   isDevelopingAddon() {
     return true;
   },

diff --git a/app/assets/javascripts/theme-transpiler/package.json b/app/assets/javascripts/theme-transpiler/package.json
@@ -19,8 +19,7 @@
     "handlebars": "^4.7.8",
     "path-browserify": "^1.0.1",
     "polyfill-crypto.getrandomvalues": "^1.0.0",
-    "terser": "^5.31.0",
-    "decorator-transforms": "^2.0.0"
+    "terser": "^5.31.0"
   },
   "engines": {
     "node": ">= 18",

diff --git a/app/assets/javascripts/theme-transpiler/transpiler.js b/app/assets/javascripts/theme-transpiler/transpiler.js
@@ -19,7 +19,6 @@ globalThis.console = {
 import { transform as babelTransform } from "@babel/standalone";
 import HTMLBarsInlinePrecompile from "babel-plugin-ember-template-compilation";
 import { Preprocessor } from "content-tag";
-import DecoratorTransforms from "decorator-transforms";
 import colocatedBabelPlugin from "ember-cli-htmlbars/lib/colocated-babel-plugin";
 import { precompile } from "ember-source/dist/ember-template-compiler";
 import EmberThisFallback from "ember-this-fallback";
@@ -139,8 +138,6 @@ globalThis.transpile = function (source, options = {}) {
   if (moduleId && !skipModule) {
     plugins.push(["transform-modules-amd", { noInterop: true }]);
   }
-  commonPlugins.find((p) => p[0] === "decorator-transforms")[0] =
-    DecoratorTransforms;
   plugins.push(...commonPlugins);
 
   try {

diff --git a/app/models/theme.rb b/app/models/theme.rb
@@ -6,7 +6,7 @@
 class Theme < ActiveRecord::Base
   include GlobalPath
 
-  BASE_COMPILER_VERSION = 82
+  BASE_COMPILER_VERSION = 81
 
   class SettingsMigrationError < StandardError
   end

diff --git a/lib/discourse_js_processor.rb b/lib/discourse_js_processor.rb
@@ -9,7 +9,9 @@ class TranspileError < StandardError
   # To generate a list of babel plugins used by ember-cli, set
   # babel: { debug: true } in ember-cli-build.js, then run `yarn ember build -prod`
   DISCOURSE_COMMON_BABEL_PLUGINS = [
-    ["decorator-transforms", { runEarly: true }],
+    ["proposal-decorators", { legacy: true }],
+    "proposal-class-properties",
+    "proposal-private-methods",
     "proposal-class-static-block",
     "transform-parameters",
     "proposal-export-namespace-from",

diff --git a/patches/decorator-transforms+2.0.0.patch b/patches/decorator-transforms+2.0.0.patch
diff --git a/spec/lib/discourse_js_processor_spec.rb b/spec/lib/discourse_js_processor_spec.rb
@@ -92,7 +92,7 @@ class MyClass {
     JS
 
     result = DiscourseJsProcessor.transpile(script, "blah", "blah/mymodule")
-    expect(result).to include("static #_ = dt7948.n")
+    expect(result).to include("_applyDecoratedDescriptor")
   end
 
   it "correctly transpiles widget hbs" do

diff --git a/spec/lib/theme_javascript_compiler_spec.rb b/spec/lib/theme_javascript_compiler_spec.rb
@@ -251,7 +251,7 @@ class MyComponent extends Component {}
       expect(compiler.raw_content).to include(
         "define(\"discourse/theme-1/discourse/components/my-component\", [\"exports\",",
       )
-      expect(compiler.raw_content).to include('value = "foo";')
+      expect(compiler.raw_content).to include("_defineProperty(this, \"value\", \"foo\");")
       expect(compiler.raw_content).to include("setComponentTemplate")
       expect(compiler.raw_content).to include("createTemplateFactory")
     end