Switch from bower to NPM

CouscousPHP · Sep 2, 2022 · 8aa0419 · 8aa0419
1 parent 5dff409
commit 8aa0419
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 28 deletions.
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -11,6 +11,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   uses: actions/checkout@v2
+            -   uses: actions/setup-node@v3
+                with:
+                    node-version: 16
+            -   run: 'npm install -g less less-plugin-clean-css'
             -   uses: shivammathur/setup-php@v2
                 with:
                     php-version: 8.0

diff --git a/website/.gitignore b/website/.gitignore
@@ -1,3 +1,4 @@
 /css/all.min.css
 /bower_components/
 /couscous.phar
+node_modules
diff --git a/website/bower.json b/website/bower.json
diff --git a/website/default.twig b/website/default.twig
@@ -9,8 +9,8 @@
     <title>Couscous! Put your documentation in a website!</title>
     <meta name="description" content="Couscous! Put your documentation in a website!">
 
-    <link href="{{ baseUrl }}/bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
-    <link href="{{ baseUrl }}/bower_components/fontawesome/css/font-awesome.min.css" rel="stylesheet">
+    <link href="{{ baseUrl }}/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="{{ baseUrl }}/node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
     <link href="{{ baseUrl }}/css/prettify.tomorrow-night-eighties.css" rel="stylesheet">
     <link href="{{ baseUrl }}/css/all.min.css" rel="stylesheet">
 
@@ -27,6 +27,8 @@
     <!-- Google webmasters verification -->
     <meta name="google-site-verification" content="bjh41nmytWyBkuM8373PL1j6upqoiAQXSb19vMGJZDY" />
 
+    <script defer data-domain="couscous.io" src="https://plausible.io/js/plausible.js"></script>
+
 </head>
 
 <body class="{{ bodyClass }}">
@@ -100,9 +102,9 @@
 
     {% block javascripts %}
 
-        <script src="{{ baseUrl }}/bower_components/jquery/dist/jquery.min.js"></script>
-        <script src="{{ baseUrl }}/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
-        <script src="{{ baseUrl }}/bower_components/google-code-prettify/src/prettify.js"></script>
+        <script src="{{ baseUrl }}/node_modules/jquery/dist/jquery.min.js"></script>
+        <script src="{{ baseUrl }}/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+        <script src="{{ baseUrl }}/node_modules/google-code-prettify/src/prettify.js"></script>
 
         <script>
             $(function() {
@@ -112,21 +114,6 @@
             });
         </script>
 
-        <!-- Piwik -->
-        <script type="text/javascript">
-            var _paq = _paq || [];
-            _paq.push(['trackPageView']);
-            _paq.push(['enableLinkTracking']);
-            (function() {
-                var u=(("https:" == document.location.protocol) ? "https" : "http") + "://mnapoli.piwikpro.com/";
-                _paq.push(['setTrackerUrl', u+'piwik.php']);
-                _paq.push(['setSiteId', 2]);
-                var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
-                g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-            })();
-        </script>
-        <noscript><p><img src="https://mnapoli.piwikpro.com/piwik.php?idsite=2" style="border:0;" alt="" /></p></noscript>
-        <!-- End Piwik Code -->
     {% endblock %}
 
 </body>

diff --git a/website/package-lock.json b/website/package-lock.json
diff --git a/website/package.json b/website/package.json
@@ -0,0 +1,8 @@
+{
+  "dependencies": {
+    "bootstrap": "^3.2",
+    "font-awesome": "^4.7.0",
+    "google-code-prettify": "^1.0.0",
+    "jquery": "^3.6.1"
+  }
+}