...

Pushword · Dec 21, 2021 · 2886081 · 2886081
1 parent f084466
commit 2886081
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 7,856 deletions.
diff --git a/packages/admin-block-editor/package.json b/packages/admin-block-editor/package.json
@@ -16,7 +16,7 @@
         "@editorjs/table": "^2.0.1",
         "@pushword/editorjs-tools": "file:../admin-block-editor-tools",
         "@pushword/js-helper": "file:../js-helper",
-        "@symfony/webpack-encore": "^1.6.1",
+        "@symfony/webpack-encore": "^1.7",
         "@vietlongn/editorjs-carousel": "^2.3.6",
         "ace-builds": "^1.4.12",
         "autoprefixer": "^10.1.0",

diff --git a/packages/admin-block-editor/yarn-error.log b/packages/admin-block-editor/yarn-error.log
diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -2,12 +2,11 @@
     "devDependencies": {
         "140.css": "^1.0.1",
         "@pushword/js-helper": "file:../js-helper",
-        "@symfony/webpack-encore": "^0.33",
+        "@symfony/webpack-encore": "^1.7",
         "@tailwindcss/aspect-ratio": "^0.2.0",
         "@tailwindcss/forms": "^0.4",
         "@tailwindcss/typography": "^0.5",
         "ace-builds": "^1.4.12",
-        "alpinejs": "^2.8.0",
         "autoprefixer": "^10.1.0",
         "babel-preset-stage-2": "^6.24.1",
         "codemirror": "^5.59.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -2,17 +2,17 @@
     "devDependencies": {
         "140.css": "^1.0.1",
         "@pushword/js-helper": "file:../js-helper",
-        "@symfony/webpack-encore": "^0.33",
+        "@symfony/webpack-encore": "^1.7",
         "@tailwindcss/aspect-ratio": "^0.2.0",
         "@tailwindcss/forms": "^0.4",
         "@tailwindcss/typography": "^0.5",
         "ace-builds": "^1.4.12",
-        "alpinejs": "^2.8.0",
-        "autoprefixer": "^10.1.0",
+        "autoprefixer": "^10.4",
         "babel-preset-stage-2": "^6.24.1",
         "codemirror": "^5.59.0",
         "core-js": "^3.8.1",
         "easymde": "^2.13.0",
+        "file-loader": "^6.0.0",
         "fslightbox": "^3.2.2",
         "node-sass": "^5.0.0",
         "postcss": "^8.2.1",

diff --git a/packages/core/src/Resources/assets/page.js b/packages/core/src/Resources/assets/page.js
@@ -1,5 +1,3 @@
-//import 'alpinejs';
-
 require("fslightbox");
 
 import {

diff --git a/packages/core/src/Resources/public/manifest.json b/packages/core/src/Resources/public/manifest.json
@@ -1,18 +1,18 @@
 {
   "bundles/pushwordcore/page.min.js": "./page.min.js",
   "bundles/pushwordcore/tailwind.min.css": "./tailwind.min.css",
-  "bundles/pushwordcore/favicons/android-chrome-192x192.png": "./favicons/android-chrome-192x192.png",
+  "bundles/pushwordcore/favicons/favicon.ico": "./favicons/favicon.ico",
   "bundles/pushwordcore/favicons/android-chrome-512x512.png": "./favicons/android-chrome-512x512.png",
+  "bundles/pushwordcore/favicons/mstile-310x310.png": "./favicons/mstile-310x310.png",
+  "bundles/pushwordcore/favicons/mstile-310x150.png": "./favicons/mstile-310x150.png",
+  "bundles/pushwordcore/favicons/android-chrome-192x192.png": "./favicons/android-chrome-192x192.png",
   "bundles/pushwordcore/favicons/apple-touch-icon.png": "./favicons/apple-touch-icon.png",
-  "bundles/pushwordcore/favicons/browserconfig.xml": "./favicons/browserconfig.xml",
-  "bundles/pushwordcore/favicons/favicon-16x16.png": "./favicons/favicon-16x16.png",
-  "bundles/pushwordcore/favicons/favicon-32x32.png": "./favicons/favicon-32x32.png",
-  "bundles/pushwordcore/favicons/favicon.ico": "./favicons/favicon.ico",
-  "bundles/pushwordcore/favicons/mstile-144x144.png": "./favicons/mstile-144x144.png",
   "bundles/pushwordcore/favicons/mstile-150x150.png": "./favicons/mstile-150x150.png",
-  "bundles/pushwordcore/favicons/mstile-310x150.png": "./favicons/mstile-310x150.png",
-  "bundles/pushwordcore/favicons/mstile-310x310.png": "./favicons/mstile-310x310.png",
+  "bundles/pushwordcore/favicons/mstile-144x144.png": "./favicons/mstile-144x144.png",
   "bundles/pushwordcore/favicons/mstile-70x70.png": "./favicons/mstile-70x70.png",
   "bundles/pushwordcore/favicons/safari-pinned-tab.svg": "./favicons/safari-pinned-tab.svg",
-  "bundles/pushwordcore/favicons/site.webmanifest": "./favicons/site.webmanifest"
+  "bundles/pushwordcore/favicons/favicon-32x32.png": "./favicons/favicon-32x32.png",
+  "bundles/pushwordcore/favicons/favicon-16x16.png": "./favicons/favicon-16x16.png",
+  "bundles/pushwordcore/favicons/site.webmanifest": "./favicons/site.webmanifest",
+  "bundles/pushwordcore/favicons/browserconfig.xml": "./favicons/browserconfig.xml"
 }
diff --git a/packages/core/src/Resources/public/page.min.js b/packages/core/src/Resources/public/page.min.js
diff --git a/packages/core/src/Resources/public/tailwind.min.css b/packages/core/src/Resources/public/tailwind.min.css
diff --git a/packages/docs/assets/app.js b/packages/docs/assets/app.js
@@ -1,5 +1,3 @@
-//import 'alpinejs';
-
 //require("fslightbox");
 import hljs from "highlight.js";
 

diff --git a/packages/docs/assets/package.json b/packages/docs/assets/package.json
@@ -2,12 +2,11 @@
     "devDependencies": {
         "140.css": "^1.0.1",
         "@pushword/js-helper": "file:../../js-helper",
-        "@symfony/webpack-encore": "^0.33",
+        "@symfony/webpack-encore": "^1.7",
         "@tailwindcss/aspect-ratio": "^0.2.0",
         "@tailwindcss/forms": "^0.4",
         "@tailwindcss/typography": "^0.5",
         "ace-builds": "^1.4.12",
-        "alpinejs": "^2.8.0",
         "autoprefixer": "^10.1.0",
         "babel-preset-stage-2": "^6.24.1",
         "codemirror": "^5.59.0",

diff --git a/packages/skeleton/assets/app.js b/packages/skeleton/assets/app.js
@@ -1,5 +1,3 @@
-//import 'alpinejs';
-
 require("fslightbox");
 
 import {

diff --git a/packages/skeleton/assets/package.json b/packages/skeleton/assets/package.json
@@ -2,7 +2,7 @@
     "devDependencies": {
         "140.css": "^1.0",
         "@pushword/js-helper": "^0.0",
-        "@symfony/webpack-encore": "^0.33",
+        "@symfony/webpack-encore": "^1.7",
         "@tailwindcss/aspect-ratio": "^0.2",
         "@tailwindcss/forms": "^0.2",
         "@tailwindcss/typography": "^0.3",

diff --git a/packages/version/tests/ControllerTest.php b/packages/version/tests/ControllerTest.php
@@ -4,6 +4,8 @@
 
 use Pushword\Admin\Tests\AbstractAdminTest;
 use Pushword\Version\Versionner;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Serializer;
 
 class ControllerTest extends AbstractAdminTest
 {
@@ -20,7 +22,7 @@ public function testLogin()
             self::$kernel->getLogDir(),
             $pageClass,
             self::$kernel->getContainer()->get('doctrine.orm.default_entity_manager'),
-            self::$kernel->getContainer()->get('serializer')
+            new Serializer([], ['json' => new JsonEncoder()])
         );
 
         $pageVersions = $versionner->getPageVersions(1);

diff --git a/packages/version/tests/VersionTest.php b/packages/version/tests/VersionTest.php
@@ -7,6 +7,8 @@
 use Pushword\Core\Repository\Repository;
 use Pushword\Version\Versionner;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Serializer;
 
 class VersionTest extends KernelTestCase
 {
@@ -30,7 +32,7 @@ public function testIt(): void
             self::$kernel->getLogDir(),
             $pageClass,
             self::$kernel->getContainer()->get('doctrine.orm.default_entity_manager'),
-            self::$kernel->getContainer()->get('serializer')
+            new Serializer([], ['json' => new JsonEncoder()])
         );
 
         $pageVersions = $versionner->getPageVersions($page);