Add Babel JavaScript compiler

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Sep 4, 2020 · 307b0d2 · 307b0d2
1 parent e1461d8
commit 307b0d2
Show file tree

Hide file tree

Showing 77 changed files with 1,800 additions and 18 deletions.
diff --git a/babel.config.json b/babel.config.json
@@ -0,0 +1,3 @@
+{
+    "presets": ["@babel/preset-env"]
+}
diff --git a/js/dist/.gitignore b/js/dist/.gitignore
@@ -0,0 +1,2 @@
+/*
+!/.gitignore
diff --git a/js/ajax.js → js/src/ajax.js b/js/ajax.js → js/src/ajax.js
diff --git a/js/chart.js → js/src/chart.js b/js/chart.js → js/src/chart.js
diff --git a/js/codemirror/addon/lint/sql-lint.js → js/src/codemirror/addon/lint/sql-lint.js b/js/codemirror/addon/lint/sql-lint.js → js/src/codemirror/addon/lint/sql-lint.js
diff --git a/js/common.js → js/src/common.js b/js/common.js → js/src/common.js
diff --git a/js/config.js → js/src/config.js b/js/config.js → js/src/config.js
diff --git a/js/console.js → js/src/console.js b/js/console.js → js/src/console.js
diff --git a/js/cross_framing_protection.js → js/src/cross_framing_protection.js b/js/cross_framing_protection.js → js/src/cross_framing_protection.js
diff --git a/js/database/central_columns.js → js/src/database/central_columns.js b/js/database/central_columns.js → js/src/database/central_columns.js
diff --git a/js/database/multi_table_query.js → js/src/database/multi_table_query.js b/js/database/multi_table_query.js → js/src/database/multi_table_query.js
diff --git a/js/database/operations.js → js/src/database/operations.js b/js/database/operations.js → js/src/database/operations.js
diff --git a/js/database/qbe.js → js/src/database/qbe.js b/js/database/qbe.js → js/src/database/qbe.js
diff --git a/js/database/query_generator.js → js/src/database/query_generator.js b/js/database/query_generator.js → js/src/database/query_generator.js
diff --git a/js/database/search.js → js/src/database/search.js b/js/database/search.js → js/src/database/search.js
diff --git a/js/database/structure.js → js/src/database/structure.js b/js/database/structure.js → js/src/database/structure.js
diff --git a/js/database/tracking.js → js/src/database/tracking.js b/js/database/tracking.js → js/src/database/tracking.js
diff --git a/js/designer/database.js → js/src/designer/database.js b/js/designer/database.js → js/src/designer/database.js
diff --git a/js/designer/history.js → js/src/designer/history.js b/js/designer/history.js → js/src/designer/history.js
diff --git a/js/designer/init.js → js/src/designer/init.js b/js/designer/init.js → js/src/designer/init.js
diff --git a/js/designer/move.js → js/src/designer/move.js b/js/designer/move.js → js/src/designer/move.js
diff --git a/js/designer/objects.js → js/src/designer/objects.js b/js/designer/objects.js → js/src/designer/objects.js
diff --git a/js/designer/page.js → js/src/designer/page.js b/js/designer/page.js → js/src/designer/page.js
diff --git a/js/doclinks.js → js/src/doclinks.js b/js/doclinks.js → js/src/doclinks.js
diff --git a/js/drag_drop_import.js → js/src/drag_drop_import.js b/js/drag_drop_import.js → js/src/drag_drop_import.js
diff --git a/js/error_report.js → js/src/error_report.js b/js/error_report.js → js/src/error_report.js
diff --git a/js/export.js → js/src/export.js b/js/export.js → js/src/export.js
diff --git a/js/export_output.js → js/src/export_output.js b/js/export_output.js → js/src/export_output.js
diff --git a/js/functions.js → js/src/functions.js b/js/functions.js → js/src/functions.js
diff --git a/js/gis_data_editor.js → js/src/gis_data_editor.js b/js/gis_data_editor.js → js/src/gis_data_editor.js
diff --git a/js/import.js → js/src/import.js b/js/import.js → js/src/import.js
diff --git a/js/indexes.js → js/src/indexes.js b/js/indexes.js → js/src/indexes.js
diff --git a/js/jqplot/plugins/jqplot.byteFormatter.js → ...rc/jqplot/plugins/jqplot.byteFormatter.js b/js/jqplot/plugins/jqplot.byteFormatter.js → ...rc/jqplot/plugins/jqplot.byteFormatter.js
diff --git a/js/keyhandler.js → js/src/keyhandler.js b/js/keyhandler.js → js/src/keyhandler.js
diff --git a/js/makegrid.js → js/src/makegrid.js b/js/makegrid.js → js/src/makegrid.js
diff --git a/js/menu_resizer.js → js/src/menu_resizer.js b/js/menu_resizer.js → js/src/menu_resizer.js
diff --git a/js/microhistory.js → js/src/microhistory.js b/js/microhistory.js → js/src/microhistory.js
diff --git a/js/multi_column_sort.js → js/src/multi_column_sort.js b/js/multi_column_sort.js → js/src/multi_column_sort.js
diff --git a/js/navigation.js → js/src/navigation.js b/js/navigation.js → js/src/navigation.js
diff --git a/js/normalization.js → js/src/normalization.js b/js/normalization.js → js/src/normalization.js
diff --git a/js/page_settings.js → js/src/page_settings.js b/js/page_settings.js → js/src/page_settings.js
diff --git a/js/replication.js → js/src/replication.js b/js/replication.js → js/src/replication.js
diff --git a/js/rte.js → js/src/rte.js b/js/rte.js → js/src/rte.js
diff --git a/js/server/databases.js → js/src/server/databases.js b/js/server/databases.js → js/src/server/databases.js
diff --git a/js/server/plugins.js → js/src/server/plugins.js b/js/server/plugins.js → js/src/server/plugins.js
diff --git a/js/server/privileges.js → js/src/server/privileges.js b/js/server/privileges.js → js/src/server/privileges.js
diff --git a/js/server/status/monitor.js → js/src/server/status/monitor.js b/js/server/status/monitor.js → js/src/server/status/monitor.js
diff --git a/js/server/status/processes.js → js/src/server/status/processes.js b/js/server/status/processes.js → js/src/server/status/processes.js
diff --git a/js/server/status/queries.js → js/src/server/status/queries.js b/js/server/status/queries.js → js/src/server/status/queries.js
diff --git a/js/server/status/sorter.js → js/src/server/status/sorter.js b/js/server/status/sorter.js → js/src/server/status/sorter.js
diff --git a/js/server/status/variables.js → js/src/server/status/variables.js b/js/server/status/variables.js → js/src/server/status/variables.js
diff --git a/js/server/user_groups.js → js/src/server/user_groups.js b/js/server/user_groups.js → js/src/server/user_groups.js
diff --git a/js/server/variables.js → js/src/server/variables.js b/js/server/variables.js → js/src/server/variables.js
diff --git a/js/setup/ajax.js → js/src/setup/ajax.js b/js/setup/ajax.js → js/src/setup/ajax.js
diff --git a/js/setup/scripts.js → js/src/setup/scripts.js b/js/setup/scripts.js → js/src/setup/scripts.js
diff --git a/js/shortcuts_handler.js → js/src/shortcuts_handler.js b/js/shortcuts_handler.js → js/src/shortcuts_handler.js
diff --git a/js/sql.js → js/src/sql.js b/js/sql.js → js/src/sql.js
diff --git a/js/table/change.js → js/src/table/change.js b/js/table/change.js → js/src/table/change.js
diff --git a/js/table/chart.js → js/src/table/chart.js b/js/table/chart.js → js/src/table/chart.js
diff --git a/js/table/find_replace.js → js/src/table/find_replace.js b/js/table/find_replace.js → js/src/table/find_replace.js
diff --git a/js/table/gis_visualization.js → js/src/table/gis_visualization.js b/js/table/gis_visualization.js → js/src/table/gis_visualization.js
diff --git a/js/table/operations.js → js/src/table/operations.js b/js/table/operations.js → js/src/table/operations.js
diff --git a/js/table/relation.js → js/src/table/relation.js b/js/table/relation.js → js/src/table/relation.js
diff --git a/js/table/select.js → js/src/table/select.js b/js/table/select.js → js/src/table/select.js
diff --git a/js/table/structure.js → js/src/table/structure.js b/js/table/structure.js → js/src/table/structure.js
diff --git a/js/table/tracking.js → js/src/table/tracking.js b/js/table/tracking.js → js/src/table/tracking.js
diff --git a/js/table/zoom_plot_jqplot.js → js/src/table/zoom_plot_jqplot.js b/js/table/zoom_plot_jqplot.js → js/src/table/zoom_plot_jqplot.js
diff --git a/js/transformations/image_upload.js → js/src/transformations/image_upload.js b/js/transformations/image_upload.js → js/src/transformations/image_upload.js
diff --git a/js/transformations/json.js → js/src/transformations/json.js b/js/transformations/json.js → js/src/transformations/json.js
diff --git a/js/transformations/json_editor.js → js/src/transformations/json_editor.js b/js/transformations/json_editor.js → js/src/transformations/json_editor.js
diff --git a/js/transformations/sql_editor.js → js/src/transformations/sql_editor.js b/js/transformations/sql_editor.js → js/src/transformations/sql_editor.js
diff --git a/js/transformations/xml.js → js/src/transformations/xml.js b/js/transformations/xml.js → js/src/transformations/xml.js
diff --git a/js/transformations/xml_editor.js → js/src/transformations/xml_editor.js b/js/transformations/xml_editor.js → js/src/transformations/xml_editor.js
diff --git a/js/u2f.js → js/src/u2f.js b/js/u2f.js → js/src/u2f.js
diff --git a/package.json b/package.json
@@ -37,6 +37,9 @@
     "zxcvbn": "4.4.2"
   },
   "devDependencies": {
+    "@babel/cli": "^7.11.5",
+    "@babel/core": "^7.11.5",
+    "@babel/preset-env": "^7.11.5",
     "eslint": "^7.5.0",
     "eslint-plugin-compat": "^3.8.0",
     "eslint-plugin-no-jquery": "^2.5.0",
@@ -50,9 +53,10 @@
     "lodash": "^4.17.19"
   },
   "scripts": {
-    "postinstall": "yarn run --silent css-compile --quiet --style=compressed",
+    "postinstall": "yarn run --silent css-compile --quiet --style=compressed && yarn run --silent js-compile --quiet",
     "css-compile": "sass themes/pmahomme/scss:themes/pmahomme/css themes/original/scss:themes/original/css themes/metro/scss:themes/metro/css themes/bootstrap/scss:themes/bootstrap/css",
     "css-lint": "stylelint --syntax scss \"themes/**/scss/*.scss\"",
-    "js-lint": "eslint js"
+    "js-lint": "eslint js/src",
+    "js-compile": "babel js/src -d js/dist"
   }
 }
diff --git a/templates/scripts.twig b/templates/scripts.twig
@@ -1,5 +1,6 @@
 {% for file in files %}
-  <script data-cfasync="false" type="text/javascript" src="{{ base_dir }}js/{{ file.filename }}
+  <script data-cfasync="false" type="text/javascript" src="{{ base_dir }}js/
+    {{- file.filename starts with 'vendor/' ? file.filename : 'dist/' ~ file.filename -}}
     {{- '.php' in file.filename ? get_common(file.params|merge({'v': version})) : '?v=' ~ version|url_encode }}"></script>
 {% endfor %}
 

diff --git a/yarn.lock b/yarn.lock