Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.0][NO CACHE] Refactor the build tools pt.2 #23786

Closed
wants to merge 24 commits into from
Closed

[4.0][NO CACHE] Refactor the build tools pt.2 #23786

wants to merge 24 commits into from

Conversation

dgrammatiko
Copy link
Contributor

@dgrammatiko dgrammatiko commented Feb 7, 2019

Pull Request for Issue # .

Summary of Changes

The second part of the refactoring of the npm build tools.

  • Templates get an src assets_source folder which can have subfolders for css, js or scss

  • Scss files compiled (unmagnified and minified as well) and stored in the usual template/css

  • CSS files get copied over to the usual template/css folder and minified as well

  • JS files can be any of the 3 versions already introduced in the previous PR (.es6.js, .es5.js and .w-c.es6.js) The respective product of these will be placed in template/js

  • Watch gets the second round of revamp also it gets more specific.

  • Without any param will watch the build/media_source folder

  • Can also accept administrator/templates so someone can work on a backend template

  • or templates and this will watch the front end templates

  • ATM it will not handle plain css files (that will be on the next PR)

  • Also there is no logic to synchronise the removal of a source file to be correctly reflected in the distribution folders (again that's for the next PR)

Testing Instructions

  • apply patch
  • run npm init
  • run node run build.js --watch

edit the file joomla-cms/build/media_source/plg_installer_webinstaller/scss/client.scss check if the css and .min.css in the media forder was updated

Create a file joomla-cms/build/media_source/plg_installer_webinstaller/scss/test.scss with any valid code (eg body {display:none;} ) check if the css and .min.css in the media forder was created

press ctrl+c to quit the watch.

Repeat the procedure but this time use node run build.js --watch administrator/templates and edit create a file in the atum/src/scss folder

Happy coding 🍸

Expected result

Actual result

Documentation Changes Required

Based on the #23723

Update all dev dependencies
+ keep the language order in the error pages constant (eg no falsy changes marked)
…ools-refactoring

* '4.0-dev' of github.com:joomla/joomla-cms:
  [4.0] Housekeeping (#23600)
  [4.0] com_finder: Filtering common & numeric words and language fixes and params (#21037)
…ools-refactoring

* '4.0-dev' of github.com:joomla/joomla-cms:
  [4.0] Correcting icons display in debug bar (#23732)
…ools-refactoring

* '4.0-dev' of github.com:joomla/joomla-cms:
  [4.0] Fix database name validation for MySQL in installation app (#23704)
  [4.0] Normalize sample data plugins to use Joomla default workflow (#23719)
  [4.0] Correcting success colour after installing sample data (#23726)
…ools-refactoring

* '4.0-dev' of github.com:joomla/joomla-cms:
  modified_time check (#23689)
  [4.0] FIX SQL int default value to  numeric (#23669)
  Clean up hard coded usage of state values (#23330)
  [4.0] - fix save article (#23638)
  [4.0] JS error when closing a item and going back to a list view (#23642)
  Fixes plugins ordering (#23731)
  [4.0] [a11y] Make ActionButton Featured accessible (#23718)
  Remove extra type attribute (#23753)
  [4.0] Remove unused string (#23750)
  Fix stats alert information (#23727)
  [4.0] Remove deprecated functions isSite and isAdmin (#22492)
…ools-refactoring

* '4.0-dev' of github.com:joomla/joomla-cms:
  Fix saving content menu items (#23716)
  [4.0] remove duplicate string (#23771)
  Remove the slider button (#23388)
  [4.0] Set default workflow for protected workflows (#23607)
@dgrammatiko
Copy link
Contributor Author

@Hackwar so no files moved to media...

@dgrammatiko dgrammatiko changed the title [4.0] Refactor the build tools [4.0] Refactor the build tools pt.2 Feb 7, 2019
@dgrammatiko dgrammatiko changed the title [4.0] Refactor the build tools pt.2 [4.0][NO CACHE] Refactor the build tools pt.2 Feb 7, 2019
…omla-cms into 4.o-dev-tools-refactoring-templates

* '4.0-dev-tools-refactoring' of github.com:dgrammatiko/joomla-cms:
  re-re-trigger
  retrigger drone
…ools-refactoring-templates

* '4.0-dev' of github.com:joomla/joomla-cms:
  [4.0][NO CACHE] Refactor the build tools (#23723)

# Conflicts:
#	.eslintignore
#	administrator/templates/atum/scss/font-awesome.scss
#	administrator/templates/atum/src/scss/template.scss
#	build.js
#	build/build-modules-js/compilecss.es6.js
#	build/build-modules-js/compilejs.es6.js
#	build/build-modules-js/error-pages.es6.js
#	build/build-modules-js/init.es6.js
#	build/build-modules-js/javascript/compile-es6.es6.js
#	build/build-modules-js/javascript/compile-w-c.es6.js
#	build/build-modules-js/javascript/handle-file.es6.js
#	build/build-modules-js/stylesheets/scss-transform.es6.js
#	build/build-modules-js/watch.es6.js
#	templates/cassiopeia/src/scss/template.scss
@dgrammatiko
Copy link
Contributor Author

@wilsone more pain here, sorry 😐. I promise this is the last one, after this one any changes will be only on the build tools script, no more files moving around...

…ools-refactoring-templates

* '4.0-dev' of github.com:joomla/joomla-cms: (153 commits)
  [4.0] Fix debug (#23637)
  Fix typehint to be compatible with parent interface (#24041)
  [4.0]Table text changed (#24022)
  [4.0] Change Status dropdown consistency (#24078)
  Fix Finder logging table creation in MySQL (#24060)
  [4.0] Remove com_admin profile (#24064)
  [4.0] Fix webcomponents not being included on the page (#24075)
  Fix path to file (#24074)
  Fix codestyle in mod search, move calendar locale to new location
  Fix stability
  Global checkin - select call style (#24031)
  [4.0] An error has occurred on Search Filter (#23679)
  [4.0] Group toolbar buttons for workflow stages and transitions (#23608)
  com_finder update (#24047)
  [4.0] Toolbar button consistency (#24048)
  Fix default date for postgresql (#24046)
  [4.0] Update bootstrap version (#24003)
  [4.0][com_media] RTL: adapting media manager to rtl + some (#24043)
  [4.0] Smart Search: Adding nested taxonomy (#21327)
  [4.0] Update composer deps (#24037)
  ...
@dgrammatiko
Copy link
Contributor Author

@wilsonge let me know if you want to merge this otherwise I'll just close it

@wilsonge
Copy link
Contributor

OK I want it - but i'd like to keep the scss folder top level please. Also we need to gitignore the template css and js files (especially the minified version if/when we go this way)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants