Revert "DEV: `@babel/plugin-proposal-decorators` -> `decorator-transforms` (#25290)" (#26971)

This reverts commit 0f4520867b.

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.
This commit is contained in:
David Taylor 2024-05-10 12:48:16 +01:00 committed by GitHub
parent 47cabdc6d2
commit 97847f6cd8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 12 additions and 151 deletions

View File

@ -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

View File

@ -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;
},

View File

@ -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() {

View File

@ -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": {

View File

@ -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 */

View File

@ -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: {

View File

@ -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";

View File

@ -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;
},

View File

@ -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;
},

View File

@ -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;
},

View File

@ -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",

View File

@ -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 {

View File

@ -6,7 +6,7 @@ require "json_schemer"
class Theme < ActiveRecord::Base
include GlobalPath
BASE_COMPILER_VERSION = 82
BASE_COMPILER_VERSION = 81
class SettingsMigrationError < StandardError
end

View File

@ -9,7 +9,9 @@ class DiscourseJsProcessor
# 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",

View File

@ -1,21 +0,0 @@
diff --git a/node_modules/decorator-transforms/dist/index.js b/node_modules/decorator-transforms/dist/index.js
index fce3aeb..c23d8e4 100644
--- a/node_modules/decorator-transforms/dist/index.js
+++ b/node_modules/decorator-transforms/dist/index.js
@@ -4,10 +4,13 @@ import {
import "./chunk-CSAU5B4Q.js";
// src/index.ts
-import { createRequire } from "module";
+
import { ImportUtil } from "babel-import-util";
-var req = createRequire(import.meta.url);
-var { default: decoratorSyntax } = req("@babel/plugin-syntax-decorators");
+
+// https://github.com/ef4/decorator-transforms/pull/27
+import PluginSyntaxDecorators from "@babel/plugin-syntax-decorators";
+const decoratorSyntax = PluginSyntaxDecorators.default || PluginSyntaxDecorators;
+
function makeVisitor(babel) {
const t = babel.types;
return {

View File

@ -92,7 +92,7 @@ RSpec.describe DiscourseJsProcessor do
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

View File

@ -251,7 +251,7 @@ RSpec.describe ThemeJavascriptCompiler do
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