Merge pull request #10 from jakubtobiasz/new-webpack

New webpack
Sylius · Jun 14, 2022 · ef255f6 · ef255f6
2 parents ba5b999 + bdaf592
commit ef255f6
Show file tree

Hide file tree

Showing 25 changed files with 236 additions and 2,439 deletions.
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
@@ -1,4 +1,10 @@
 framework:
+    assets:
+        packages:
+            shop:
+                json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
+            admin:
+                json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'
     secret: '%env(APP_SECRET)%'
     form: true
     csrf_protection: true

diff --git a/config/packages/webpack_encore.yaml b/config/packages/webpack_encore.yaml
@@ -3,10 +3,3 @@ webpack_encore:
     builds:
         shop: '%kernel.project_dir%/public/build/shop'
         admin: '%kernel.project_dir%/public/build/admin'
-framework:
-    assets:
-        packages:
-            shop:
-                json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
-            admin:
-                json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "chart.js": "^3.7.1",
-    "fomantic-ui": "^2.9.0-beta.288",
+    "semantic-ui": "npm:fomantic-ui@^2.9.0-beta.288",
     "jquery": "^3.5.0",
     "jquery.dirtyforms": "^2.0.0",
     "lightbox2": "^2.9.0",
@@ -11,7 +11,6 @@
     "@symfony/webpack-encore": "^2.1.0",
     "eslint": "^4.19.1",
     "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-import-resolver-babel-module": "^4.0.0",
     "eslint-plugin-import": "^2.11.0",
     "sass": "^1.51.0",
     "sass-loader": "^12.0.0"

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/entry.js b/src/Sylius/Bundle/AdminBundle/Resources/private/entry.js
@@ -1,8 +1,6 @@
 import './js/shim/shim-jquery';
-import './js/shim/shim-semantic-ui';
-
-import 'fomantic-ui/dist/semantic.css';
 
+import 'semantic-ui/dist/semantic.css';
 import 'sylius/ui-resources/js/app';
 import './js/app';
 

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/app.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/app.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/accordion';
+import 'semantic-ui/dist/components/accordion';
 import $ from 'jquery';
 import 'jquery.dirtyforms/jquery.dirtyforms';
 

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/shim/shim-polyfill.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/shim/shim-polyfill.js
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/shim/shim-semantic-ui.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/shim/shim-semantic-ui.js
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/sylius-lazy-choice-tree.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/sylius-lazy-choice-tree.js
@@ -7,8 +7,8 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/api';
-import 'semantic-ui-css/components/checkbox';
+import 'semantic-ui/dist/components/api';
+import 'semantic-ui/dist/components/checkbox';
 import $ from 'jquery';
 
 const createRootContainer = function createRootContainer() {

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/sylius-move-product-variant.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/sylius-move-product-variant.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/api';
+import 'semantic-ui/dist/components/api';
 import $ from 'jquery';
 
 $.fn.extend({

diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/js/sylius-move-taxon.js b/src/Sylius/Bundle/AdminBundle/Resources/private/js/sylius-move-taxon.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/api';
+import 'semantic-ui/dist/components/api';
 import $ from 'jquery';
 
 $.fn.extend({

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/entry.js b/src/Sylius/Bundle/ShopBundle/Resources/private/entry.js
@@ -1,8 +1,7 @@
 import './js/shim/shim-jquery';
 import './js/shim/shim-lightbox';
-import './js/shim/shim-semantic-ui';
 
-import 'fomantic-ui/dist/semantic.css';
+import 'semantic-ui/dist/semantic.css';
 import 'lightbox2/dist/css/lightbox.min.css';
 import 'slick-carousel/slick/slick.css';
 

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/js/app.js b/src/Sylius/Bundle/ShopBundle/Resources/private/js/app.js
@@ -7,8 +7,8 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/popup';
-import 'semantic-ui-css/components/rating';
+import 'semantic-ui/dist/components/popup';
+import 'semantic-ui/dist/components/rating';
 import $ from 'jquery';
 import 'slick-carousel';
 

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/js/shim/shim-polyfill.js b/src/Sylius/Bundle/ShopBundle/Resources/private/js/shim/shim-polyfill.js
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/js/shim/shim-semantic-ui.js b/src/Sylius/Bundle/ShopBundle/Resources/private/js/shim/shim-semantic-ui.js
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/js/sylius-add-to-cart.js b/src/Sylius/Bundle/ShopBundle/Resources/private/js/sylius-add-to-cart.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/api';
+import 'semantic-ui/dist/components/api';
 import $ from 'jquery';
 
 $.fn.extend({

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/js/sylius-address-book.js b/src/Sylius/Bundle/ShopBundle/Resources/private/js/sylius-address-book.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/dropdown';
+import 'semantic-ui/dist/components/dropdown';
 import $ from 'jquery';
 
 const parseKey = function parseKey(key) {

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/app.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/app.js
@@ -7,14 +7,14 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/accordion';
-import 'semantic-ui-css/components/checkbox';
-import 'semantic-ui-css/components/dimmer';
-import 'semantic-ui-css/components/dropdown';
-import 'semantic-ui-css/components/rating';
-import 'semantic-ui-css/components/sidebar';
-import 'semantic-ui-css/components/tab';
-import 'semantic-ui-css/components/transition';
+import 'semantic-ui/dist/components/accordion';
+import 'semantic-ui/dist/components/checkbox';
+import 'semantic-ui/dist/components/dimmer';
+import 'semantic-ui/dist/components/dropdown';
+import 'semantic-ui/dist/components/rating';
+import 'semantic-ui/dist/components/sidebar';
+import 'semantic-ui/dist/components/tab';
+import 'semantic-ui/dist/components/transition';
 import $ from 'jquery';
 
 import './sylius-bulk-action-require-confirmation';

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-login.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-login.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/api';
+import 'semantic-ui/dist/components/api';
 import $ from 'jquery';
 
 $.fn.extend({

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-toggle.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-api-toggle.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/api';
+import 'semantic-ui/dist/components/api';
 import $ from 'jquery';
 
 $.fn.extend({

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-auto-complete.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-auto-complete.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/dropdown';
+import 'semantic-ui/dist/components/dropdown';
 import $ from 'jquery';
 
 $.fn.extend({

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-bulk-action-require-confirmation.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-bulk-action-require-confirmation.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/modal';
+import 'semantic-ui/dist/components/modal';
 import $ from 'jquery';
 
 $.fn.extend({

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-product-attributes.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-product-attributes.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/dropdown';
+import 'semantic-ui/dist/components/dropdown';
 import $ from 'jquery';
 
 const getNextIndex = function getNextIndex() {

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-product-auto-complete.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-product-auto-complete.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/dropdown';
+import 'semantic-ui/dist/components/dropdown';
 import $ from 'jquery';
 
 $.fn.extend({

diff --git a/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-require-confirmation.js b/src/Sylius/Bundle/UiBundle/Resources/private/js/sylius-require-confirmation.js
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-import 'semantic-ui-css/components/modal';
+import 'semantic-ui/dist/components/modal';
 import $ from 'jquery';
 
 $.fn.extend({