[TRA-1723] Move all assets to webpack (#541)

toptal · Jun 30, 2021 · 63b88dc · 63b88dc
1 parent b29164a
commit 63b88dc
Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/Public/assets/main.css b/Public/assets/main.css
diff --git a/Public/assets/main.js b/Public/assets/main.js
diff --git a/Public/external/jquery-3.6.0/jquery.min.js b/Public/external/jquery-3.6.0/jquery.min.js
diff --git a/Resources/Views/index.leaf b/Resources/Views/index.leaf
@@ -103,10 +103,7 @@
     </div>
 
     <!-- Footer Scripts -->
-    <script async src="external/url-search-params-1.1.0/url-search-params.min.js"></script>
-    <script src="external/jquery-3.6.0/jquery.min.js"></script>
-    <script async src="external/select2-4.0.13/select2.min.js"></script>
-    <script async src="js/app.js"></script>
+    <script async src="assets/main.js"></script>
     <script async>
         window.dataLayer = window.dataLayer || [];
         function gtag(){dataLayer.push(arguments);}

diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^3.0.1",
     "file-loader": "^6.2.0",
+    "jquery": "^3.6.0",
     "less": "^4.1.1",
     "less-loader": "^10.0.0",
     "mini-css-extract-plugin": "^1.6.0",

diff --git a/src/index.js b/src/index.js
@@ -2,3 +2,7 @@ import "./css/bootstrap-extract.css";
 import "./css/select2.min.css";
 import "./less/select2-toptal-theme.less";
 import "./less/app.less";
+
+import "./js/select2-4.0.13/select2.min.js"
+import "./js/url-search-params-1.1.0/url-search-params.min.js"
+import "./js/app.js"
diff --git a/Public/js/app.js → src/js/app.js b/Public/js/app.js → src/js/app.js
@@ -1,3 +1,5 @@
+import $ from 'jquery';
+
 $(function () {
 
     $.ajax(window.BASE_PREFIX + '/dropdown/templates.json').done(function(data) {

diff --git a/...ic/external/select2-4.0.13/select2.min.js → src/js/select2-4.0.13/select2.min.js b/...ic/external/select2-4.0.13/select2.min.js → src/js/select2-4.0.13/select2.min.js
diff --git a/...rch-params-1.1.0/url-search-params.min.js → ...rch-params-1.1.0/url-search-params.min.js b/...rch-params-1.1.0/url-search-params.min.js → ...rch-params-1.1.0/url-search-params.min.js
diff --git a/src/less/app.less b/src/less/app.less
@@ -140,6 +140,7 @@ main {
 
     img {
       width: 100%;
+      height: auto;
       max-width: 370px;
     }
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -48,7 +48,7 @@ module.exports = {
   optimization: {
     minimizer: [
       // For webpack@5 you can use the `...` syntax to extend existing minimizers (i.e. `terser-webpack-plugin`), uncomment the next line
-      // `...`,
+     `...`,
       new CssMinimizerPlugin(),
     ],
   },

diff --git a/yarn.lock b/yarn.lock
@@ -3133,6 +3133,11 @@ jest@^25.1.0:
     import-local "^3.0.2"
     jest-cli "^25.5.4"
 
+jquery@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"