chore: moved all source javascript files to grunt/src, updated packag…

…es (WIP)
Yoast · Aug 15, 2024 · 049cf71 · 049cf71
1 parent 24b19e8
commit 049cf71
Show file tree

Hide file tree

Showing 39 changed files with 3,078 additions and 2,423 deletions.
diff --git a/grunt/package.json b/grunt/package.json
@@ -3,28 +3,46 @@
   "version": "1.0.0",
   "description": "Yoast SEO for TYPO3",
   "main": "plugin.js",
-  "devDependencies": {
-    "@babel/core": "^7.21.5",
-    "@babel/preset-env": "^7.16.5",
-    "@babel/preset-react": "^7.16.5",
-    "@yoast/grunt-plugin-tasks": "^2.2.1",
-    "babel-loader": "^8.2.3",
-    "cross-env": "^5.2.1",
-    "css-loader": "^3.6.0",
-    "grunt": "^1.4.1",
-    "grunt-contrib-clean": "^2.0.0",
-    "grunt-contrib-copy": "^1.0.0",
-    "grunt-glotpress": "git+https://github.com/markoheijnen/grunt-glotpress.git#05a38906b357d5a4785bc57e6287fb6479e674b7",
-    "grunt-po2json": "git+https://github.com/atimmer/grunt-po2json.git#f26c05653af89ef0f7a72456dbe141eb56bf5471",
-    "grunt-sass": "^3.1.0",
-    "grunt-wp-i18n": "^1.0.3",
-    "load-grunt-config": "^1.0.2",
-    "react-intl": "^2.9.0",
+  "dependencies": {
+    "@wordpress/components": "^13.0.3",
+    "@wordpress/html-entities": "^3.3.1",
+    "@wordpress/i18n": "^4.14.0",
+    "@wordpress/url": "^3.17.0",
+    "@yoast/analysis-report": "2.0.0-alpha.0",
+    "@yoast/components": "^3.0.0-alpha.0",
+    "@yoast/helpers": "^0.17.0-alpha.0",
+    "@yoast/replacement-variable-editor": "^2.0.0-alpha.0",
+    "@yoast/search-metadata-previews": "^3.0.0-alpha.0",
+    "@yoast/social-metadata-forms": "^2.0.0-alpha.0",
+    "@yoast/ui-library": "^4.0.0",
+    "classnames": "^2.3.2",
+    "draft-js": "^0.11.7",
+    "react-redux": "^5.0.6",
+    "redux": "^3.7.2",
     "redux-thunk": "^2.4.1",
-    "time-grunt": "^2.0.0",
-    "webpack": "^5.89.0",
+    "styled-components": "^5.3.6",
+    "yoastseo": "^2.0.0-alpha.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.17.9",
+    "@babel/polyfill": "^7.12.1",
+    "@babel/preset-react": "^7.24.7",
+    "@yoast/babel-preset": "^1.1.1",
+    "@yoast/browserslist-config": "^1.2.3",
+    "@yoast/grunt-plugin-tasks": "^2.4",
+    "@yoast/ui-library": "^4.0.0",
+    "babel-loader": "^9.1.3",
+    "babel-plugin-styled-components": "^2.0.6",
+    "case-sensitive-paths-webpack-plugin": "^2.1.2",
+    "cross-env": "^7.0.3",
+    "load-grunt-config": "^1.0.0",
+    "lodash": "^4.17.21",
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0",
+    "react-intl": "^2.4.0",
+    "webpack": "^5.88.2",
     "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1"
+    "webpack-dev-server": "^5.0.4"
   },
   "scripts": {
     "dev": "webpack-dev-server --mode=development --config webpack.config.js",
@@ -41,26 +59,6 @@
     "languageteam": "Yoast Translate <[email protected]>",
     "lasttranslator": "Yoast Translate Team <[email protected]>"
   },
-  "dependencies": {
-    "@babel/polyfill": "^7.12.1",
-    "@wordpress/babel-plugin-makepot": "^3.10.0",
-    "@yoast/analysis-report": "1.21.0",
-    "@yoast/components": "3.0.0-alpha.0",
-    "@yoast/helpers": "0.17.0-alpha.0",
-    "@yoast/search-metadata-previews": "3.0.0-alpha.0",
-    "@yoast/ui-library": "^4.0.0",
-    "entities": "^1.1",
-    "fstream": "^1.0.12",
-    "lodash": "^4.17.21",
-    "parse5": "^5.1",
-    "process": "^0.11.10",
-    "react": "^16.14.0",
-    "react-dom": "^16.14.0",
-    "react-redux": "^7.2.6",
-    "url": "^0.11.3",
-    "util": "^0.12.5",
-    "yoastseo": "2.0.0-alpha.0"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/YoastSeoForTypo3/t3ext-yoast-seo.git"

diff --git a/.../Public/JavaScript/Components/Analysis.js → grunt/src/Components/Analysis.js b/.../Public/JavaScript/Components/Analysis.js → grunt/src/Components/Analysis.js
diff --git a/...ript/Components/DescriptionProgressBar.js → .../src/Components/DescriptionProgressBar.js b/...ript/Components/DescriptionProgressBar.js → .../src/Components/DescriptionProgressBar.js
diff --git a/.../Public/JavaScript/Components/Insights.js → grunt/src/Components/Insights.js b/.../Public/JavaScript/Components/Insights.js → grunt/src/Components/Insights.js
diff --git a/...vaScript/Components/LinkingSuggestions.js → grunt/src/Components/LinkingSuggestions.js b/...vaScript/Components/LinkingSuggestions.js → grunt/src/Components/LinkingSuggestions.js
diff --git a/...JavaScript/Components/LoadingIndicator.js → grunt/src/Components/LoadingIndicator.js b/...JavaScript/Components/LoadingIndicator.js → grunt/src/Components/LoadingIndicator.js
diff --git a/...lic/JavaScript/Components/ModeSwitcher.js → grunt/src/Components/ModeSwitcher.js b/...lic/JavaScript/Components/ModeSwitcher.js → grunt/src/Components/ModeSwitcher.js
diff --git a/...c/JavaScript/Components/SnippetPreview.js → grunt/src/Components/SnippetPreview.js b/...c/JavaScript/Components/SnippetPreview.js → grunt/src/Components/SnippetPreview.js
diff --git a/...aScript/Components/SnippetPreviewError.js → grunt/src/Components/SnippetPreviewError.js b/...aScript/Components/SnippetPreviewError.js → grunt/src/Components/SnippetPreviewError.js
diff --git a/...ublic/JavaScript/Components/StatusIcon.js → grunt/src/Components/StatusIcon.js b/...ublic/JavaScript/Components/StatusIcon.js → grunt/src/Components/StatusIcon.js
diff --git a/...JavaScript/Components/TitleProgressBar.js → grunt/src/Components/TitleProgressBar.js b/...JavaScript/Components/TitleProgressBar.js → grunt/src/Components/TitleProgressBar.js
diff --git a/...vaScript/analysis/createAnalysisWorker.js → grunt/src/analysis/createAnalysisWorker.js b/...vaScript/analysis/createAnalysisWorker.js → grunt/src/analysis/createAnalysisWorker.js
diff --git a/...ic/JavaScript/analysis/refreshAnalysis.js → grunt/src/analysis/refreshAnalysis.js b/...ic/JavaScript/analysis/refreshAnalysis.js → grunt/src/analysis/refreshAnalysis.js
diff --git a/Resources/Public/JavaScript/colors.json → grunt/src/colors.json b/Resources/Public/JavaScript/colors.json → grunt/src/colors.json
diff --git a/...es/Public/JavaScript/helpers/getResult.js → grunt/src/helpers/getResult.js b/...es/Public/JavaScript/helpers/getResult.js → grunt/src/helpers/getResult.js
diff --git a/...s/Public/JavaScript/helpers/mapResults.js → grunt/src/helpers/mapResults.js b/...s/Public/JavaScript/helpers/mapResults.js → grunt/src/helpers/mapResults.js
diff --git a/...ic/JavaScript/helpers/measureTextWidth.js → grunt/src/helpers/measureTextWidth.js b/...ic/JavaScript/helpers/measureTextWidth.js → grunt/src/helpers/measureTextWidth.js
diff --git a/...ublic/JavaScript/helpers/progressColor.js → grunt/src/helpers/progressColor.js b/...ublic/JavaScript/helpers/progressColor.js → grunt/src/helpers/progressColor.js
diff --git a/Resources/Public/JavaScript/plugin.js → grunt/src/plugin.js b/Resources/Public/JavaScript/plugin.js → grunt/src/plugin.js
diff --git a/...blic/JavaScript/redux/actions/analysis.js → grunt/src/redux/actions/analysis.js b/...blic/JavaScript/redux/actions/analysis.js → grunt/src/redux/actions/analysis.js
diff --git a/...ublic/JavaScript/redux/actions/content.js → grunt/src/redux/actions/content.js b/...ublic/JavaScript/redux/actions/content.js → grunt/src/redux/actions/content.js
diff --git a/.../JavaScript/redux/actions/focusKeyword.js → grunt/src/redux/actions/focusKeyword.js b/.../JavaScript/redux/actions/focusKeyword.js → grunt/src/redux/actions/focusKeyword.js
diff --git a/...ipt/redux/actions/focusKeywordSynonyms.js → ...src/redux/actions/focusKeywordSynonyms.js b/...ipt/redux/actions/focusKeywordSynonyms.js → ...src/redux/actions/focusKeywordSynonyms.js
diff --git a/.../Public/JavaScript/redux/actions/index.js → grunt/src/redux/actions/index.js b/.../Public/JavaScript/redux/actions/index.js → grunt/src/redux/actions/index.js
diff --git a/...blic/JavaScript/redux/actions/insights.js → grunt/src/redux/actions/insights.js b/...blic/JavaScript/redux/actions/insights.js → grunt/src/redux/actions/insights.js
diff --git a/...cript/redux/actions/linkingSuggestions.js → ...t/src/redux/actions/linkingSuggestions.js b/...cript/redux/actions/linkingSuggestions.js → ...t/src/redux/actions/linkingSuggestions.js
diff --git a/...JavaScript/redux/actions/relevantWords.js → grunt/src/redux/actions/relevantWords.js b/...JavaScript/redux/actions/relevantWords.js → grunt/src/redux/actions/relevantWords.js
diff --git a/...lic/JavaScript/redux/reducers/analysis.js → grunt/src/redux/reducers/analysis.js b/...lic/JavaScript/redux/reducers/analysis.js → grunt/src/redux/reducers/analysis.js
diff --git a/...blic/JavaScript/redux/reducers/content.js → grunt/src/redux/reducers/content.js b/...blic/JavaScript/redux/reducers/content.js → grunt/src/redux/reducers/content.js
diff --git a/...JavaScript/redux/reducers/focusKeyword.js → grunt/src/redux/reducers/focusKeyword.js b/...JavaScript/redux/reducers/focusKeyword.js → grunt/src/redux/reducers/focusKeyword.js
diff --git a/...pt/redux/reducers/focusKeywordSynonyms.js → ...rc/redux/reducers/focusKeywordSynonyms.js b/...pt/redux/reducers/focusKeywordSynonyms.js → ...rc/redux/reducers/focusKeywordSynonyms.js
diff --git a/...Public/JavaScript/redux/reducers/index.js → grunt/src/redux/reducers/index.js b/...Public/JavaScript/redux/reducers/index.js → grunt/src/redux/reducers/index.js
diff --git a/...lic/JavaScript/redux/reducers/insights.js → grunt/src/redux/reducers/insights.js b/...lic/JavaScript/redux/reducers/insights.js → grunt/src/redux/reducers/insights.js
diff --git a/...ript/redux/reducers/linkingSuggestions.js → .../src/redux/reducers/linkingSuggestions.js b/...ript/redux/reducers/linkingSuggestions.js → .../src/redux/reducers/linkingSuggestions.js
diff --git a/...avaScript/redux/reducers/relevantWords.js → grunt/src/redux/reducers/relevantWords.js b/...avaScript/redux/reducers/relevantWords.js → grunt/src/redux/reducers/relevantWords.js
diff --git a/Resources/Public/JavaScript/redux/store.js → grunt/src/redux/store.js b/Resources/Public/JavaScript/redux/store.js → grunt/src/redux/store.js
diff --git a/Resources/Public/JavaScript/worker.js → grunt/src/worker.js b/Resources/Public/JavaScript/worker.js → grunt/src/worker.js
diff --git a/grunt/webpack.config.js b/grunt/webpack.config.js
@@ -5,8 +5,8 @@ const PORT = 3333;
 
 module.exports = {
     entry: {
-        plugin: ['@babel/polyfill', './../Resources/Public/JavaScript/plugin.js'],
-        worker: ['@babel/polyfill', './../Resources/Public/JavaScript/worker.js']
+        plugin: ['@babel/polyfill', './src/plugin.js'],
+        worker: ['@babel/polyfill', './src/worker.js']
     },
     output: {
         filename: '[name].js',
@@ -15,10 +15,6 @@ module.exports = {
     },
     resolve: {
         modules: [path.join(__dirname, 'node_modules')],
-        fallback: {
-            "url": require.resolve("url/"),
-            "util": require.resolve("util/")
-        },
     },
     plugins: [
         // fix "process is not defined" error:

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