From 771d16e50f80baae55e56e2576cc7297eb5efb93 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 7 Jun 2023 13:53:17 -0400 Subject: [PATCH 1/6] Adding a UX React recipe --- .../2.9/config/routes/ux_autocomplete.yaml | 3 ++ symfony/ux-react/2.9/manifest.json | 36 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml create mode 100644 symfony/ux-react/2.9/manifest.json diff --git a/symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml b/symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml new file mode 100644 index 000000000..da6b261a6 --- /dev/null +++ b/symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml @@ -0,0 +1,3 @@ +ux_autocomplete: + resource: '@AutocompleteBundle/config/routes.php' + prefix: '/autocomplete' diff --git a/symfony/ux-react/2.9/manifest.json b/symfony/ux-react/2.9/manifest.json new file mode 100644 index 000000000..11454feb3 --- /dev/null +++ b/symfony/ux-react/2.9/manifest.json @@ -0,0 +1,36 @@ +{ + "bundles": { + "Symfony\\UX\\React\\ReactBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + }, + "add-lines": [ + { + "file": "webpack.config.js", + "content": "\n .enableReactPreset()", + "position": "after_target", + "target": ".splitEntryChunks()" + }, + { + "file": "assets/app.js", + "content": "import { registerReactControllerComponents } from '@symfony/ux-react';", + "position": "top", + "warn_if_missing": true + }, + { + "file": "assets/app.js", + "content": "registerReactControllerComponents(require.context('./react/controllers', true, /\\.(j|t)sx?$/));", + "position": "bottom", + "warn_if_missing": true, + "requires": "symfony/webpack-encore-bundle" + }, + { + "file": "assets/app.js", + "content": "registerReactControllerComponents();", + "position": "bottom", + "warn_if_missing": true, + "requires": "symfony/asset-mapper" + } + ] +} From 150001d320b4f576de930da64b9a6eb1831af719 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 7 Jun 2023 13:53:58 -0400 Subject: [PATCH 2/6] removing copied file --- symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml diff --git a/symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml b/symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml deleted file mode 100644 index da6b261a6..000000000 --- a/symfony/ux-react/2.9/config/routes/ux_autocomplete.yaml +++ /dev/null @@ -1,3 +0,0 @@ -ux_autocomplete: - resource: '@AutocompleteBundle/config/routes.php' - prefix: '/autocomplete' From c3d89cece86111e72cb9f30dad1fdbc4d7f09140 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 7 Jun 2023 13:54:59 -0400 Subject: [PATCH 3/6] Adding 2.8 recipe so that if there is a conflict, at least IT is installed --- symfony/ux-react/2.8/manifest.json | 5 +++++ symfony/ux-react/2.9/manifest.json | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 symfony/ux-react/2.8/manifest.json diff --git a/symfony/ux-react/2.8/manifest.json b/symfony/ux-react/2.8/manifest.json new file mode 100644 index 000000000..be0ff742e --- /dev/null +++ b/symfony/ux-react/2.8/manifest.json @@ -0,0 +1,5 @@ +{ + "bundles": { + "Symfony\\UX\\React\\ReactBundle": ["all"] + } +} diff --git a/symfony/ux-react/2.9/manifest.json b/symfony/ux-react/2.9/manifest.json index 11454feb3..6e006594c 100644 --- a/symfony/ux-react/2.9/manifest.json +++ b/symfony/ux-react/2.9/manifest.json @@ -2,8 +2,9 @@ "bundles": { "Symfony\\UX\\React\\ReactBundle": ["all"] }, - "copy-from-recipe": { - "config/": "%CONFIG_DIR%/" + "conflict": { + "symfony/webpack-encore-bundle": "<2.0", + "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0" }, "add-lines": [ { From cd61c4094b766ba9724bb06f1e8580bf1f8b26b4 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 7 Jun 2023 14:02:35 -0400 Subject: [PATCH 4/6] Adding svelte and vue --- symfony/ux-svelte/2.8/manifest.json | 5 ++++ symfony/ux-svelte/2.9/manifest.json | 37 +++++++++++++++++++++++++++++ symfony/ux-vue/2.8/manifest.json | 5 ++++ symfony/ux-vue/2.9/manifest.json | 37 +++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) create mode 100644 symfony/ux-svelte/2.8/manifest.json create mode 100644 symfony/ux-svelte/2.9/manifest.json create mode 100644 symfony/ux-vue/2.8/manifest.json create mode 100644 symfony/ux-vue/2.9/manifest.json diff --git a/symfony/ux-svelte/2.8/manifest.json b/symfony/ux-svelte/2.8/manifest.json new file mode 100644 index 000000000..7c82371ec --- /dev/null +++ b/symfony/ux-svelte/2.8/manifest.json @@ -0,0 +1,5 @@ +{ + "bundles": { + "Symfony\\UX\\Svelte\\SvelteBundle": ["all"] + } +} diff --git a/symfony/ux-svelte/2.9/manifest.json b/symfony/ux-svelte/2.9/manifest.json new file mode 100644 index 000000000..26946ec29 --- /dev/null +++ b/symfony/ux-svelte/2.9/manifest.json @@ -0,0 +1,37 @@ +{ + "bundles": { + "Symfony\\UX\\Svelte\\SvelteBundle": ["all"] + }, + "conflict": { + "symfony/webpack-encore-bundle": "<2.0", + "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0" + }, + "add-lines": [ + { + "file": "webpack.config.js", + "content": "\n .enableSvelte()", + "position": "after_target", + "target": ".splitEntryChunks()" + }, + { + "file": "assets/app.js", + "content": "import { registerSvelteControllerComponents } from '@symfony/ux-svelte';", + "position": "top", + "warn_if_missing": true + }, + { + "file": "assets/app.js", + "content": "registerSvelteControllerComponents(require.context('./svelte/controllers', true, /\\.svelte$/));", + "position": "bottom", + "warn_if_missing": true, + "requires": "symfony/webpack-encore-bundle" + }, + { + "file": "assets/app.js", + "content": "registerSvelteControllerComponents();", + "position": "bottom", + "warn_if_missing": true, + "requires": "symfony/asset-mapper" + } + ] +} diff --git a/symfony/ux-vue/2.8/manifest.json b/symfony/ux-vue/2.8/manifest.json new file mode 100644 index 000000000..9010c6f25 --- /dev/null +++ b/symfony/ux-vue/2.8/manifest.json @@ -0,0 +1,5 @@ +{ + "bundles": { + "Symfony\\UX\\Vue\\VueBundle": ["all"] + } +} diff --git a/symfony/ux-vue/2.9/manifest.json b/symfony/ux-vue/2.9/manifest.json new file mode 100644 index 000000000..4089ba24a --- /dev/null +++ b/symfony/ux-vue/2.9/manifest.json @@ -0,0 +1,37 @@ +{ + "bundles": { + "Symfony\\UX\\Vue\\VueBundle": ["all"] + }, + "conflict": { + "symfony/webpack-encore-bundle": "<2.0", + "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0" + }, + "add-lines": [ + { + "file": "webpack.config.js", + "content": "\n .enableVueLoader()", + "position": "after_target", + "target": ".splitEntryChunks()" + }, + { + "file": "assets/app.js", + "content": "import { registerVueControllerComponents } from '@symfony/ux-vue';", + "position": "top", + "warn_if_missing": true + }, + { + "file": "assets/app.js", + "content": "registerVueControllerComponents(require.context('./vue/controllers', true, /\\.vue$/));", + "position": "bottom", + "warn_if_missing": true, + "requires": "symfony/webpack-encore-bundle" + }, + { + "file": "assets/app.js", + "content": "registerVueControllerComponents();", + "position": "bottom", + "warn_if_missing": true, + "requires": "symfony/asset-mapper" + } + ] +} From 802471831744121a660448a0b239bab1abfb23d4 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 7 Jun 2023 15:47:28 -0400 Subject: [PATCH 5/6] Adding example components to each --- symfony/ux-react/2.9/assets/svelte/controllers/Hello.jsx | 5 +++++ symfony/ux-react/2.9/manifest.json | 3 +++ .../ux-svelte/2.9/assets/svelte/controllers/Hello.svelte | 5 +++++ symfony/ux-svelte/2.9/manifest.json | 3 +++ symfony/ux-vue/2.9/assets/svelte/controllers/Hello.vue | 9 +++++++++ symfony/ux-vue/2.9/manifest.json | 3 +++ 6 files changed, 28 insertions(+) create mode 100644 symfony/ux-react/2.9/assets/svelte/controllers/Hello.jsx create mode 100644 symfony/ux-svelte/2.9/assets/svelte/controllers/Hello.svelte create mode 100644 symfony/ux-vue/2.9/assets/svelte/controllers/Hello.vue diff --git a/symfony/ux-react/2.9/assets/svelte/controllers/Hello.jsx b/symfony/ux-react/2.9/assets/svelte/controllers/Hello.jsx new file mode 100644 index 000000000..54fe3686c --- /dev/null +++ b/symfony/ux-react/2.9/assets/svelte/controllers/Hello.jsx @@ -0,0 +1,5 @@ +import React from 'react'; + +export default function (props) { + return
Hello {props.fullName}
; +} diff --git a/symfony/ux-react/2.9/manifest.json b/symfony/ux-react/2.9/manifest.json index 6e006594c..444d845b1 100644 --- a/symfony/ux-react/2.9/manifest.json +++ b/symfony/ux-react/2.9/manifest.json @@ -2,6 +2,9 @@ "bundles": { "Symfony\\UX\\React\\ReactBundle": ["all"] }, + "copy-from-recipe": { + "assets/": "assets/" + }, "conflict": { "symfony/webpack-encore-bundle": "<2.0", "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0" diff --git a/symfony/ux-svelte/2.9/assets/svelte/controllers/Hello.svelte b/symfony/ux-svelte/2.9/assets/svelte/controllers/Hello.svelte new file mode 100644 index 000000000..3499af48b --- /dev/null +++ b/symfony/ux-svelte/2.9/assets/svelte/controllers/Hello.svelte @@ -0,0 +1,5 @@ + + +
Hello {name}
diff --git a/symfony/ux-svelte/2.9/manifest.json b/symfony/ux-svelte/2.9/manifest.json index 26946ec29..c5e3457b8 100644 --- a/symfony/ux-svelte/2.9/manifest.json +++ b/symfony/ux-svelte/2.9/manifest.json @@ -2,6 +2,9 @@ "bundles": { "Symfony\\UX\\Svelte\\SvelteBundle": ["all"] }, + "copy-from-recipe": { + "assets/": "assets/" + }, "conflict": { "symfony/webpack-encore-bundle": "<2.0", "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0" diff --git a/symfony/ux-vue/2.9/assets/svelte/controllers/Hello.vue b/symfony/ux-vue/2.9/assets/svelte/controllers/Hello.vue new file mode 100644 index 000000000..2812aa432 --- /dev/null +++ b/symfony/ux-vue/2.9/assets/svelte/controllers/Hello.vue @@ -0,0 +1,9 @@ + + + diff --git a/symfony/ux-vue/2.9/manifest.json b/symfony/ux-vue/2.9/manifest.json index 4089ba24a..2682a6221 100644 --- a/symfony/ux-vue/2.9/manifest.json +++ b/symfony/ux-vue/2.9/manifest.json @@ -2,6 +2,9 @@ "bundles": { "Symfony\\UX\\Vue\\VueBundle": ["all"] }, + "copy-from-recipe": { + "assets/": "assets/" + }, "conflict": { "symfony/webpack-encore-bundle": "<2.0", "symfony/flex": "<1.20.0 || >=2.0.0,<2.3.0" From ed822fead4691998c8a23beddca4cde5814d1d17 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Wed, 7 Jun 2023 15:50:10 -0400 Subject: [PATCH 6/6] renaming bad directories --- .../ux-react/2.9/assets/{svelte => react}/controllers/Hello.jsx | 0 symfony/ux-vue/2.9/assets/{svelte => vue}/controllers/Hello.vue | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename symfony/ux-react/2.9/assets/{svelte => react}/controllers/Hello.jsx (100%) rename symfony/ux-vue/2.9/assets/{svelte => vue}/controllers/Hello.vue (100%) diff --git a/symfony/ux-react/2.9/assets/svelte/controllers/Hello.jsx b/symfony/ux-react/2.9/assets/react/controllers/Hello.jsx similarity index 100% rename from symfony/ux-react/2.9/assets/svelte/controllers/Hello.jsx rename to symfony/ux-react/2.9/assets/react/controllers/Hello.jsx diff --git a/symfony/ux-vue/2.9/assets/svelte/controllers/Hello.vue b/symfony/ux-vue/2.9/assets/vue/controllers/Hello.vue similarity index 100% rename from symfony/ux-vue/2.9/assets/svelte/controllers/Hello.vue rename to symfony/ux-vue/2.9/assets/vue/controllers/Hello.vue