From 52348fc9820879c4fd2c2dd9a00d20e664429a5d Mon Sep 17 00:00:00 2001 From: Manu Date: Sun, 26 May 2019 16:06:23 +0200 Subject: [PATCH 01/23] Update webpack.dev.js Include livereload script in head --- generators/webpack/app/assets/webpack.dev.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/webpack/app/assets/webpack.dev.js b/generators/webpack/app/assets/webpack.dev.js index 5b1710a0..0199bbbc 100644 --- a/generators/webpack/app/assets/webpack.dev.js +++ b/generators/webpack/app/assets/webpack.dev.js @@ -6,6 +6,6 @@ module.exports = merge(common, { mode: 'development', devtool: 'inline-source-map', plugins: [ - new LiveReloadPlugin() + new LiveReloadPlugin({"appendScriptTag":true}) ] }); From aff5380dddd02dc7fdc17adc61a8c5a8be55b2e1 Mon Sep 17 00:00:00 2001 From: Manu Date: Sun, 26 May 2019 16:07:47 +0200 Subject: [PATCH 02/23] Update default.liquid removed live reload script which is added by the plugin --- generators/blank/app/views/pages/layouts/default.liquid | 3 --- 1 file changed, 3 deletions(-) diff --git a/generators/blank/app/views/pages/layouts/default.liquid b/generators/blank/app/views/pages/layouts/default.liquid index 70f8211c..283165bc 100644 --- a/generators/blank/app/views/pages/layouts/default.liquid +++ b/generators/blank/app/views/pages/layouts/default.liquid @@ -13,9 +13,6 @@ is_layout: false {{ 'bundle.css' | stylesheet_tag }} {{ 'bundle.js' | javascript_tag }} - {% if wagon %} - - {% endif %}

{{ page.title }}

From a5abe0eaa84377795010a99e5eb34c69bc37c1d2 Mon Sep 17 00:00:00 2001 From: Manu Date: Mon, 27 May 2019 15:35:07 +0200 Subject: [PATCH 03/23] Update webpack.dev.js append LR script in page's head --- generators/blank/app/assets/webpack.dev.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/blank/app/assets/webpack.dev.js b/generators/blank/app/assets/webpack.dev.js index 5b1710a0..0199bbbc 100644 --- a/generators/blank/app/assets/webpack.dev.js +++ b/generators/blank/app/assets/webpack.dev.js @@ -6,6 +6,6 @@ module.exports = merge(common, { mode: 'development', devtool: 'inline-source-map', plugins: [ - new LiveReloadPlugin() + new LiveReloadPlugin({"appendScriptTag":true}) ] }); From 943ed7f90cb8d67e40c0a1478a0a6a1d2f22943b Mon Sep 17 00:00:00 2001 From: Manu Date: Mon, 27 May 2019 17:51:59 +0200 Subject: [PATCH 04/23] Update package.json.tt Facilitate js imports --- generators/webpack/package.json.tt | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/webpack/package.json.tt b/generators/webpack/package.json.tt index 4ab33a36..c7b9c27d 100644 --- a/generators/webpack/package.json.tt +++ b/generators/webpack/package.json.tt @@ -27,6 +27,7 @@ "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.5", "sass-loader": "^7.0.1", + "script-loader": "^0.7.2", "style-loader": "^0.21.0", "webpack": "^4.20.2", "webpack-cli": "^3.1.1", From ec84ee145c2c592c47af2f73118e93443ab0f699 Mon Sep 17 00:00:00 2001 From: Manu Date: Mon, 27 May 2019 17:53:07 +0200 Subject: [PATCH 05/23] Update app.js Facilitate js imports --- generators/webpack/app/assets/javascripts/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/webpack/app/assets/javascripts/app.js b/generators/webpack/app/assets/javascripts/app.js index 08be0d8f..74a7774c 100644 --- a/generators/webpack/app/assets/javascripts/app.js +++ b/generators/webpack/app/assets/javascripts/app.js @@ -1,5 +1,5 @@ // === Wagon main javascript file === - +// import script from 'script-loader!./script.js'; // Tell Webpack to load the style import '../stylesheets/app.scss'; From b47b00e2df201010c471cd60c3471512ac19bbb6 Mon Sep 17 00:00:00 2001 From: Manu Date: Mon, 27 May 2019 17:53:50 +0200 Subject: [PATCH 06/23] Update package.json.tt Facilitate js imports --- generators/blank/package.json.tt | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/blank/package.json.tt b/generators/blank/package.json.tt index 0c166830..dd5d68d6 100644 --- a/generators/blank/package.json.tt +++ b/generators/blank/package.json.tt @@ -27,6 +27,7 @@ "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.5", "sass-loader": "^7.0.1", + "script-loader": "^0.7.2", "style-loader": "^0.21.0", "webpack": "^4.20.2", "webpack-cli": "^3.1.1", From 3899d461ba18f58f523d0efcf10cbf3487c15123 Mon Sep 17 00:00:00 2001 From: Manu Date: Mon, 27 May 2019 17:54:37 +0200 Subject: [PATCH 07/23] Update app.js Facilitate js imports --- generators/blank/app/assets/javascripts/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/blank/app/assets/javascripts/app.js b/generators/blank/app/assets/javascripts/app.js index 08be0d8f..c01d62e0 100644 --- a/generators/blank/app/assets/javascripts/app.js +++ b/generators/blank/app/assets/javascripts/app.js @@ -1,4 +1,5 @@ // === Wagon main javascript file === +// import script from 'script-loader!./script.js'; // Tell Webpack to load the style import '../stylesheets/app.scss'; From 21bdeb906bdce749caa796588ca7e6b172ae2e4b Mon Sep 17 00:00:00 2001 From: Manu Date: Mon, 27 May 2019 17:54:59 +0200 Subject: [PATCH 08/23] Update app.js --- generators/webpack/app/assets/javascripts/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/webpack/app/assets/javascripts/app.js b/generators/webpack/app/assets/javascripts/app.js index 74a7774c..c01d62e0 100644 --- a/generators/webpack/app/assets/javascripts/app.js +++ b/generators/webpack/app/assets/javascripts/app.js @@ -1,5 +1,6 @@ // === Wagon main javascript file === // import script from 'script-loader!./script.js'; + // Tell Webpack to load the style import '../stylesheets/app.scss'; From 2305758644c31a956b9c3e3ca33fcd06bac35f10 Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 15:48:48 +0200 Subject: [PATCH 09/23] Update package.json.tt --- generators/webpack/package.json.tt | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/webpack/package.json.tt b/generators/webpack/package.json.tt index c7b9c27d..4ab33a36 100644 --- a/generators/webpack/package.json.tt +++ b/generators/webpack/package.json.tt @@ -27,7 +27,6 @@ "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.5", "sass-loader": "^7.0.1", - "script-loader": "^0.7.2", "style-loader": "^0.21.0", "webpack": "^4.20.2", "webpack-cli": "^3.1.1", From ab844df2d711667a07c2c01e1a8874ecd82a07de Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 15:49:18 +0200 Subject: [PATCH 10/23] Update app.js --- generators/webpack/app/assets/javascripts/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/webpack/app/assets/javascripts/app.js b/generators/webpack/app/assets/javascripts/app.js index c01d62e0..08be0d8f 100644 --- a/generators/webpack/app/assets/javascripts/app.js +++ b/generators/webpack/app/assets/javascripts/app.js @@ -1,5 +1,4 @@ // === Wagon main javascript file === -// import script from 'script-loader!./script.js'; // Tell Webpack to load the style import '../stylesheets/app.scss'; From cb64c6e6bdeecba6c938b388182de4a8a1f90349 Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 15:50:20 +0200 Subject: [PATCH 11/23] Update package.json.tt --- generators/blank/package.json.tt | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/blank/package.json.tt b/generators/blank/package.json.tt index dd5d68d6..0c166830 100644 --- a/generators/blank/package.json.tt +++ b/generators/blank/package.json.tt @@ -27,7 +27,6 @@ "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.5", "sass-loader": "^7.0.1", - "script-loader": "^0.7.2", "style-loader": "^0.21.0", "webpack": "^4.20.2", "webpack-cli": "^3.1.1", From 2d4239999cee56815bf27e9f052a780c8cfdab9d Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 15:50:35 +0200 Subject: [PATCH 12/23] Update app.js --- generators/blank/app/assets/javascripts/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/blank/app/assets/javascripts/app.js b/generators/blank/app/assets/javascripts/app.js index c01d62e0..08be0d8f 100644 --- a/generators/blank/app/assets/javascripts/app.js +++ b/generators/blank/app/assets/javascripts/app.js @@ -1,5 +1,4 @@ // === Wagon main javascript file === -// import script from 'script-loader!./script.js'; // Tell Webpack to load the style import '../stylesheets/app.scss'; From 509e01429778110b088ba3c6111d8cc5a154f4d1 Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 15:53:10 +0200 Subject: [PATCH 13/23] Update package.json.tt Import external scripts --- generators/blank/package.json.tt | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/blank/package.json.tt b/generators/blank/package.json.tt index 0c166830..dd5d68d6 100644 --- a/generators/blank/package.json.tt +++ b/generators/blank/package.json.tt @@ -27,6 +27,7 @@ "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.5", "sass-loader": "^7.0.1", + "script-loader": "^0.7.2", "style-loader": "^0.21.0", "webpack": "^4.20.2", "webpack-cli": "^3.1.1", From a0e8f42c98d297183e9ff664dc46fc1bf266de5f Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 15:53:42 +0200 Subject: [PATCH 14/23] Update app.js Import external scripts --- generators/blank/app/assets/javascripts/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/blank/app/assets/javascripts/app.js b/generators/blank/app/assets/javascripts/app.js index 08be0d8f..c01d62e0 100644 --- a/generators/blank/app/assets/javascripts/app.js +++ b/generators/blank/app/assets/javascripts/app.js @@ -1,4 +1,5 @@ // === Wagon main javascript file === +// import script from 'script-loader!./script.js'; // Tell Webpack to load the style import '../stylesheets/app.scss'; From 122a1c0dfbb42ec5acb97672706196dbbe6ee42e Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 15:54:11 +0200 Subject: [PATCH 15/23] Update package.json.tt Import external scripts --- generators/webpack/package.json.tt | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/webpack/package.json.tt b/generators/webpack/package.json.tt index 4ab33a36..c7b9c27d 100644 --- a/generators/webpack/package.json.tt +++ b/generators/webpack/package.json.tt @@ -27,6 +27,7 @@ "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.5", "sass-loader": "^7.0.1", + "script-loader": "^0.7.2", "style-loader": "^0.21.0", "webpack": "^4.20.2", "webpack-cli": "^3.1.1", From 705128f844aae046e136062c0af4f5593cd728f2 Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 15:54:38 +0200 Subject: [PATCH 16/23] Update app.js Import external scripts --- generators/webpack/app/assets/javascripts/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/generators/webpack/app/assets/javascripts/app.js b/generators/webpack/app/assets/javascripts/app.js index 08be0d8f..c01d62e0 100644 --- a/generators/webpack/app/assets/javascripts/app.js +++ b/generators/webpack/app/assets/javascripts/app.js @@ -1,4 +1,5 @@ // === Wagon main javascript file === +// import script from 'script-loader!./script.js'; // Tell Webpack to load the style import '../stylesheets/app.scss'; From 282d0af7c8cbb2cf4366a4abc04e780078b6a52b Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 16:43:20 +0200 Subject: [PATCH 17/23] Update webpack.prod.js --- generators/webpack/app/assets/webpack.prod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/webpack/app/assets/webpack.prod.js b/generators/webpack/app/assets/webpack.prod.js index 9f70c635..c8c550dd 100644 --- a/generators/webpack/app/assets/webpack.prod.js +++ b/generators/webpack/app/assets/webpack.prod.js @@ -1,5 +1,5 @@ const merge = require('webpack-merge'); -const common = require('./webpack.config.js'); +const common = require('./webpack.common.js'); const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); module.exports = merge(common, { From 59ef5d4ebefa05d2c6e64f9463b61fed601bd976 Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 16:44:14 +0200 Subject: [PATCH 18/23] Update webpack.prod.js --- generators/blank/app/assets/webpack.prod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/blank/app/assets/webpack.prod.js b/generators/blank/app/assets/webpack.prod.js index 9f70c635..c8c550dd 100644 --- a/generators/blank/app/assets/webpack.prod.js +++ b/generators/blank/app/assets/webpack.prod.js @@ -1,5 +1,5 @@ const merge = require('webpack-merge'); -const common = require('./webpack.config.js'); +const common = require('./webpack.common.js'); const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin'); module.exports = merge(common, { From 499a2ceb4cdb8bba87f1174074ea221f69a1fa85 Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 21:35:00 +0200 Subject: [PATCH 19/23] Update package.json.tt --- generators/webpack/package.json.tt | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/webpack/package.json.tt b/generators/webpack/package.json.tt index c7b9c27d..4ab33a36 100644 --- a/generators/webpack/package.json.tt +++ b/generators/webpack/package.json.tt @@ -27,7 +27,6 @@ "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.5", "sass-loader": "^7.0.1", - "script-loader": "^0.7.2", "style-loader": "^0.21.0", "webpack": "^4.20.2", "webpack-cli": "^3.1.1", From 2331f40d663e5709807160d5ece8dd6e55332017 Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 21:35:33 +0200 Subject: [PATCH 20/23] Update app.js --- generators/webpack/app/assets/javascripts/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/webpack/app/assets/javascripts/app.js b/generators/webpack/app/assets/javascripts/app.js index c01d62e0..08be0d8f 100644 --- a/generators/webpack/app/assets/javascripts/app.js +++ b/generators/webpack/app/assets/javascripts/app.js @@ -1,5 +1,4 @@ // === Wagon main javascript file === -// import script from 'script-loader!./script.js'; // Tell Webpack to load the style import '../stylesheets/app.scss'; From bee1c9c55f7ad3e0c15dc614d41e01ea8cd819ed Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 21:36:00 +0200 Subject: [PATCH 21/23] Update package.json.tt --- generators/blank/package.json.tt | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/blank/package.json.tt b/generators/blank/package.json.tt index dd5d68d6..0c166830 100644 --- a/generators/blank/package.json.tt +++ b/generators/blank/package.json.tt @@ -27,7 +27,6 @@ "postcss-flexbugs-fixes": "^3.3.1", "postcss-loader": "^2.1.5", "sass-loader": "^7.0.1", - "script-loader": "^0.7.2", "style-loader": "^0.21.0", "webpack": "^4.20.2", "webpack-cli": "^3.1.1", From 6c5ca7802dcede5b5e43feeca0421518162a0d67 Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 29 May 2019 21:36:23 +0200 Subject: [PATCH 22/23] Update app.js --- generators/blank/app/assets/javascripts/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/blank/app/assets/javascripts/app.js b/generators/blank/app/assets/javascripts/app.js index c01d62e0..08be0d8f 100644 --- a/generators/blank/app/assets/javascripts/app.js +++ b/generators/blank/app/assets/javascripts/app.js @@ -1,5 +1,4 @@ // === Wagon main javascript file === -// import script from 'script-loader!./script.js'; // Tell Webpack to load the style import '../stylesheets/app.scss'; From 8d76164fafe6525bf8b871239b57e2fb3107eafb Mon Sep 17 00:00:00 2001 From: Manu Date: Wed, 14 Aug 2019 13:07:45 +0200 Subject: [PATCH 23/23] Update template.liquid.tt The presets definition needs to be an array in order to deploy without errors. --- generators/section/template.liquid.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/section/template.liquid.tt b/generators/section/template.liquid.tt index 773da4a0..8c9bbc3c 100644 --- a/generators/section/template.liquid.tt +++ b/generators/section/template.liquid.tt @@ -74,7 +74,7 @@ default: # Presets can be seen as different versions of a same section. # Useless if the section is not aimed tobe used along with section_dropzone liquid tag presets: - name: "<%= config[:name] %>" +- name: "<%= config[:name] %>" category: "Category" settings: title: "Hello world"