Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"beberlei/doctrineextensions": "^1.5",
"doctrine/doctrine-migrations-bundle": "^3.3",
"sentry/sentry-symfony": "^5.0",
"sumocoders/framework-core-bundle": "dev-278-asset-mapper",
"sumocoders/framework-core-bundle": "dev-319-stimulus",
"symfony/apache-pack": "^1.0.1",
"symfony/asset-mapper": "^7.1",
"symfony/debug-bundle": "^7.1",
Expand All @@ -28,6 +28,7 @@
"symfony/runtime": "^7.1",
"symfony/security-bundle": "^7.1",
"symfony/stimulus-bundle": "^2.20",
"symfony/ux-turbo": "^2.20",
"symfony/validator": "^7.1",
"symfony/web-profiler-bundle": "^7.1",
"symfony/yaml": "^7.1",
Expand Down
6 changes: 0 additions & 6 deletions scripts/assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,3 @@ import 'flatpickr/dist/themes/airbnb.css'
// JS
import 'bootstrap';
import './bootstrap.js';
import { Framework } from 'sumocoders/Framework'

// Load our Framework
Framework()

// App
27 changes: 27 additions & 0 deletions scripts/assets/js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { startStimulusApp } from '@symfony/stimulus-bundle'
import Clipboard from 'sumocoders/Clipboard'
import SidebarCollapsable from 'sumocoders/SidebarCollapsable'
import Toast from 'sumocoders/Toast'
import Theme from 'sumocoders/Theme'
import Tooltip from 'sumocoders/Tooltip'
import Popover from 'sumocoders/Popover'
import DateTimePicker from 'sumocoders/DateTimePicker'
import Tabs from 'sumocoders/Tabs'
import PasswordStrengthChecker from 'sumocoders/PasswordStrengthChecker'
import FormCollection from 'sumocoders/FormCollection'
import ScrollToTop from 'sumocoders/ScrollToTop'

const app = startStimulusApp()
// register any custom, 3rd party controllers here
// app.register('some_controller_name', SomeImportedController);
app.register('clipboard', Clipboard)
app.register('sidebar-collapsable', SidebarCollapsable)
app.register('toast', Toast)
app.register('theme', Theme)
app.register('tooltip', Tooltip)
app.register('popover', Popover)
app.register('date-time-picker', DateTimePicker)
app.register('tabs', Tabs)
app.register('password-strength-checker', PasswordStrengthChecker)
app.register('form-collection', FormCollection)
app.register('scroll-to-top', ScrollToTop)
43 changes: 37 additions & 6 deletions src/Skeleton/PostCreateProject.php
Original file line number Diff line number Diff line change
Expand Up @@ -320,14 +320,20 @@ private static function cleanupFiles(Event $event): void
$io->notice('→ Remove app.css');
$path = $projectDir . '/assets/styles/app.css';
if (file_exists($path)) {
unlink($projectDir . '/assets/styles/app.css');
unlink($path);
}

$io->notice('→ Remove reference to app.css');
$content = file_get_contents($projectDir . '/assets/app.js');
$content = preg_replace('|import \'\./styles/app.css\';\n|', '', $content);

file_put_contents($projectDir . '/assets/app.js', $content);

$io->notice('→ Remove hello_controller.js');
$path = $projectDir . '/assets/controllers/hello_controller.js';
if (file_exists($path)) {
unlink($path);
}
}

private static function cleanup(Event $event): void
Expand Down Expand Up @@ -416,6 +422,7 @@ private static function importAssets(Event $event): void
'flatpickr/dist/l10n/sl.js@^4.6',
'sortablejs@^1.15',
'axios@^1.7',
'@stimulus-components/clipboard@^5.0',
];

// Add all packages
Expand All @@ -424,11 +431,35 @@ private static function importAssets(Event $event): void
$io->write($output);
}

// Add Framework JS, needs to be separate because of --path parameter
$frameworkJs = 'sumocoders/Framework --path "./vendor/sumocoders/framework-core-bundle/assets-public/js/index.js"';
$output = shell_exec(sprintf('symfony console importmap:require %1$s', $frameworkJs));
if ($io->isVerbose()) {
$io->write($output);
// Add Framework JS and stimulus controllers, needs to be separate because of --path parameter
$packages = [
'Clipboard' => 'controllers/clipboard_controller.js',
'SidebarCollapsable' => 'controllers/sidebar_collapsable_controller.js',
'Toast' => 'controllers/toast_controller.js',
'addToast' => 'js/toast.js',
'cookie' => 'js/cookie.js',
'Theme' => 'controllers/theme_controller.js',
'Tooltip' => 'controllers/tooltip_controller.js',
'DateTimePicker' => 'controllers/date_time_picker_controller.js',
'Tabs' => 'controllers/tabs_controller.js',
'PasswordStrengthChecker' => 'controllers/password_strength_checker_controller.js',
'FormCollection' => 'controllers/form_collection_controller.js',
'debounce' => 'js/debounce.js',
'ScrollToTop' => 'controllers/scroll_to_top_controller.js',
'Popover' => 'controllers/popover_controller.js',
];
foreach ($packages as $name => $path) {
$output = shell_exec(
sprintf(
'symfony console importmap:require sumocoders/%1$s '.
'--path "./vendor/sumocoders/framework-core-bundle/assets-public/%2$s"',
$name,
$path
)
);
if ($io->isVerbose()) {
$io->write($output);
}
}
}

Expand Down