Refactor(web-twig): Use demo package css instead of own

lmc-eu · Sep 19, 2023 · b2547ff · b2547ff
1 parent faac0e1
commit b2547ff
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 90 deletions.
diff --git a/apps/web-twig-demo/assets/styles/app.scss b/apps/web-twig-demo/assets/styles/app.scss
@@ -1 +1,2 @@
-@forward '@lmc-eu/spirit-web/src/scss/';
+@forward '@lmc-eu/spirit-web/src/scss';
+@forward '@lmc-eu/spirit-demo/scss';
diff --git a/apps/web-twig-demo/docker/docker-compose.override.yml b/apps/web-twig-demo/docker/docker-compose.override.yml
@@ -30,6 +30,7 @@ services:
     volumes:
       - ./../:/srv/spirit-web-twig-demo/:delegated
       - ./../../../packages/web:/srv/spirit-web/:delegated
+      - ./../../../packages/demo:/srv/spirit-demo/:delegated
       - ./../../../packages/form-validations:/srv/spirit-form-validations/:delegated
       # If you develop on Mac or Windows you can remove the node_modules/ directory
       #  from the bind-mount for better performance by enabling the next line:

diff --git a/apps/web-twig-demo/package.json b/apps/web-twig-demo/package.json
@@ -11,6 +11,7 @@
     "@hotwired/stimulus": "3.2.2",
     "@lmc-eu/spirit-web": "1.2.0",
     "@lmc-eu/spirit-form-validations": "1.0.2",
+    "@lmc-eu/spirit-demo": "0.0.1",
     "@symfony/stimulus-bridge": "3.2.2",
     "@symfony/webpack-encore": "4.4.0",
     "core-js": "3.32.1",

diff --git a/apps/web-twig-demo/public/css/demo.css b/apps/web-twig-demo/public/css/demo.css
diff --git a/apps/web-twig-demo/templates/layout/base.html.twig b/apps/web-twig-demo/templates/layout/base.html.twig
@@ -14,8 +14,6 @@
 
     <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600;700&display=swap">
     {{ encore_entry_link_tags('app') }}
-    <link rel="stylesheet" href="{{ asset('css/demo.css') }}">
-
     {{ encore_entry_script_tags('app') }}
 
   </head>

diff --git a/apps/web-twig-demo/yarn.lock b/apps/web-twig-demo/yarn.lock
@@ -1207,6 +1207,11 @@
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
+"@lmc-eu/[email protected]":
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/@lmc-eu/spirit-demo/-/spirit-demo-0.0.1.tgz#1ef098fc45d99cc64c9655b7760946d888465212"
+  integrity sha512-ZX6Z/mS7K6VLFRjDoACzUKkNyDdO5xNiRgOqA3MztVMGL5Ahg7kom//8AqQkM1DW4UVSkrtsHzkx9gRuYy0J4A==
+
 "@lmc-eu/spirit-design-tokens@^0.25.5":
   version "0.25.5"
   resolved "https://registry.yarnpkg.com/@lmc-eu/spirit-design-tokens/-/spirit-design-tokens-0.25.5.tgz#1663518f3e07572d5c228dc72aebce3a6caa8058"

diff --git a/packages/web-twig/Makefile b/packages/web-twig/Makefile
@@ -80,7 +80,7 @@ encore-install: ## Install demo dependencies
 	cd $(APP_DOCKER_DIR) && $(DOCKER_COMP) exec $(DOCKER_ENCORE_SERVICE) yarn install
 
 encore-link: ## Link demo dependencies
-	cd $(APP_DOCKER_DIR) && $(DOCKER_COMP) exec $(DOCKER_ENCORE_SERVICE) sh -c "cd /srv/spirit-web && yarn link && cd /srv/spirit-web-twig-demo && yarn link @lmc-eu/spirit-web && cd /srv/spirit-form-validations && yarn link && cd /srv/spirit-web-twig-demo && yarn link @lmc-eu/spirit-form-validations"
+	cd $(APP_DOCKER_DIR) && $(DOCKER_COMP) exec $(DOCKER_ENCORE_SERVICE) sh -c "cd /srv/spirit-web && yarn link && cd /srv/spirit-web-twig-demo && yarn link @lmc-eu/spirit-web && cd /srv/spirit-form-validations && yarn link && cd /srv/spirit-web-twig-demo && yarn link @lmc-eu/spirit-form-validations && cd /srv/spirit-demo && yarn link && cd /srv/spirit-web-twig-demo && yarn link @lmc-eu/spirit-demo"
 
 encore-build: ## Build demo assets
 	cd $(APP_DOCKER_DIR) && $(DOCKER_COMP) exec $(DOCKER_ENCORE_SERVICE) yarn build