Bugzilla – Attachment 145210 Details for
Bug 32609
Remove compiled files from src
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32609: Improve yarn build commands
Bug-32609-Improve-yarn-build-commands.patch (text/plain), 4.26 KB, created by
Jonathan Druart
on 2023-01-11 16:13:19 UTC
(
hide
)
Description:
Bug 32609: Improve yarn build commands
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2023-01-11 16:13:19 UTC
Size:
4.26 KB
patch
obsolete
>From dd73a29f8462f049932b8a2a16b7fd9a9115d42d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 11 Jan 2023 13:46:33 +0100 >Subject: [PATCH] Bug 32609: Improve yarn build commands > >We had: >yarn css # Build staff css >yarn css --view opac # Build OPAC css >yarn build # Nothing, was broken >yarn watch # Nothing, was broken >yarn build_js # Build JS/Vue >yarn watch_js # Watch JS/Vue > >This patch is suggesting to have something more consistent: >yarn css:build # Build CSS for OPAC and staff (dev) >yarn css:build:prod # Build CSS for OPAC and staff (prod) >yarn css:watch # Watch CSS for OPAC and staff (dev) >yarn js:build # Build JS (dev) >yarn js:build:prod # Build JS (prod) >yarn js:watch # Watch JS (dev) >yarn build # Same as css:build and js:build (dev) >yarn build:prod # Same as css:build:prod and js:build:prod (prod) > >Note that the cssnano was breaking the build function. >--- > gulpfile.js | 39 +++++++++++++++++++++++---------------- > package.json | 13 ++++++++----- > 2 files changed, 31 insertions(+), 21 deletions(-) > >diff --git a/gulpfile.js b/gulpfile.js >index da998c332d8..9616ac88145 100644 >--- a/gulpfile.js >+++ b/gulpfile.js >@@ -25,11 +25,9 @@ const rename = require('gulp-rename'); > const STAFF_CSS_BASE = "koha-tmpl/intranet-tmpl/prog/css"; > const OPAC_CSS_BASE = "koha-tmpl/opac-tmpl/bootstrap/css"; > >-if (args.view == "opac") { >- var css_base = OPAC_CSS_BASE; >-} else { >- var css_base = STAFF_CSS_BASE; >-} >+var CSS_BASE = args.view == "opac" >+ ? OPAC_CSS_BASE >+ : STAFF_CSS_BASE; > > var sassOptions = { > errLogToConsole: true, >@@ -41,7 +39,8 @@ var sassOptions = { > } > > // CSS processing for development >-function css() { >+function css(css_base) { >+ css_base = css_base || CSS_BASE > var stream = src(css_base + "/src/**/*.scss") > .pipe(sourcemaps.init()) > .pipe(sass(sassOptions).on('error', sass.logError)) >@@ -65,13 +64,11 @@ function css() { > } > > // CSS processing for production >-function build() { >+function build(css_base) { >+ css_base = css_base || CSS_BASE > var stream = src(css_base + "/src/**/*.scss") > .pipe(sass(sassOptions).on('error', sass.logError)) > .pipe(autoprefixer()) >- .pipe(cssnano({ >- zindex: false >- })) > .pipe(dest(css_base)); > > if( args.view == "opac" ){ >@@ -85,6 +82,14 @@ function build() { > return stream; > } > >+function opac_css(){ >+ return css(OPAC_CSS_BASE); >+} >+ >+function staff_css(){ >+ return css(STAFF_CSS_BASE); >+} >+ > const poTasks = { > 'marc-MARC21': { > extract: po_extract_marc_marc21, >@@ -368,13 +373,15 @@ function getLanguages () { > return Array.from(new Set(languages)); > } > >-exports.build = build; >-exports.css = css; >+exports.build = function(next){build(); next();}; >+exports.css = function(next){css(); next();}; >+exports.opac_css = opac_css; >+exports.staff_css = staff_css; >+exports.watch = function () { >+ watch(OPAC_CSS_BASE + "/src/**/*.scss", series('opac_css')); >+ watch(STAFF_CSS_BASE + "/src/**/*.scss", series('staff_css')); >+}; > > exports['po:create'] = parallel(...poTypes.map(type => series(poTasks[type].extract, poTasks[type].create))); > exports['po:update'] = parallel(...poTypes.map(type => series(poTasks[type].extract, poTasks[type].update))); > exports['po:extract'] = parallel(...poTypes.map(type => poTasks[type].extract)); >- >-exports.default = function () { >- watch(css_base + "/src/**/*.scss", series('css')); >-} >diff --git a/package.json b/package.json >index d7e59eec409..de80dfb501b 100644 >--- a/package.json >+++ b/package.json >@@ -40,11 +40,14 @@ > "vue-select": "4.0.0-beta.3" > }, > "scripts": { >- "build": "gulp build", >- "build_js": "webpack --mode production", >- "watch_js": "webpack --mode development --watch", >- "css": "gulp css", >- "watch": "gulp watch", >+ "css:build": "gulp css && gulp css --opac", >+ "css:build:prod": "gulp build && gulp css --opac", >+ "css:watch": "gulp watch", >+ "js:build": "webpack --mode development", >+ "js:watch": "webpack --mode development --watch", >+ "js:build:prod": "webpack --mode production", >+ "build": "yarn css:build && yarn js:build", >+ "build:prod": "yarn css:build:prod && yarn js:build:prod", > "cypress": "cypress", > "prettier": "prettier" > }, >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32609
:
145209
|
145210
|
145211
|
145212
|
145802
|
145838