diff --git a/assets/app.js b/assets/app.ts similarity index 63% rename from assets/app.js rename to assets/app.ts index 8506504..f69ebe1 100644 --- a/assets/app.js +++ b/assets/app.ts @@ -5,5 +5,5 @@ * (and its CSS file) in your base layout (base.html.twig). */ -// any CSS you import will output into a single css file (app.css in this case) -import './styles/app.css'; +// any CSS you import will output into a single css file (app.scss in this case) +import './styles/app.scss'; diff --git a/assets/declarations.d.ts b/assets/declarations.d.ts new file mode 100644 index 0000000..3428423 --- /dev/null +++ b/assets/declarations.d.ts @@ -0,0 +1,2 @@ +declare module '*.scss'; +declare module '*.css'; diff --git a/assets/styles/app.css b/assets/styles/app.scss similarity index 100% rename from assets/styles/app.css rename to assets/styles/app.scss diff --git a/package.json b/package.json index 6f96f23..d46d7db 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,12 @@ "@babel/preset-env": "^7.16.0", "@symfony/webpack-encore": "^6.0.0", "core-js": "^3.38.0", + "fork-ts-checker-webpack-plugin": "^9.0.0", "regenerator-runtime": "^0.13.9", + "sass": "^1.100.0", + "sass-loader": "^16.0.1", + "ts-loader": "^9.0.0", + "typescript": "^6.0.3", "webpack": "^5.72", "webpack-cli": "^6.0.0" }, diff --git a/symfony.lock b/symfony.lock index cb5ddf6..86a122c 100644 --- a/symfony.lock +++ b/symfony.lock @@ -113,7 +113,7 @@ "ref": "b346dae458e64a1921ded2125993d94bd719a8dd" }, "files": [ - "assets/app.js", + "assets/app.ts", "assets/styles/app.css", "config/packages/webpack_encore.yaml", "package.json", diff --git a/templates/base.html.twig b/templates/base.html.twig index 8bb0531..5855c9f 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -8,10 +8,6 @@ {{ encore_entry_link_tags('app') }} {% endblock %} - {% block javascripts %} - {{ encore_entry_script_tags('app') }} - {% endblock %} - {% set frankenphpHotReload = app.request.server.get('FRANKENPHP_HOT_RELOAD') %} {% if frankenphpHotReload %} @@ -20,6 +16,14 @@ {% endif %}
- {% block body %}{% endblock %} +