? ? NPM Resource Changed Pending

User tests: Successful: Unsuccessful:

avatar dgrammatiko
dgrammatiko
9 Sep 2021

Pull Request for Issue # .

Summary of Changes

  • Update to 5.1.1
  • refactor the root colours to use the custom ones
  • remove the empty mixin file and all the calls to it

Testing Instructions

Apply the patch
Run npm ci

Check that ALL 3 templates are ok, not broken AND customising the colours still works as expected

Actual result BEFORE applying this Pull Request

Expected result AFTER applying this Pull Request

Documentation Changes Required

NO

Some short explanations of what's happening here:

Votes

# of Users Experiencing Issue
1/1
Average Importance Score
5.00

avatar dgrammatiko dgrammatiko - open - 9 Sep 2021
avatar dgrammatiko dgrammatiko - change - 9 Sep 2021
Status New Pending
avatar joomla-cms-bot joomla-cms-bot - change - 9 Sep 2021
Category Administration Templates (admin) NPM Change Installation Front End Templates (site)
avatar PhilETaylor
PhilETaylor - comment - 9 Sep 2021

Doesnt this need to be based on 4.1-dev and not 4.0-dev ?

avatar dgrammatiko
dgrammatiko - comment - 9 Sep 2021

Doesnt this need to be based on 4.1-dev and not 4.0-dev ?

I didn't break anything (I hope) and it's just an update of some dependency so it should be fine for 4.0.x

avatar PhilETaylor
PhilETaylor - comment - 9 Sep 2021

Im pretty sure @brianteeman said it could not go in 4.0.x somewhere.

#35182 (comment)

I also took a look the other day. It would have to be for 4.1.0 because of the breaking changes and not 4.0.1

avatar dgrammatiko
dgrammatiko - comment - 9 Sep 2021

Im pretty sure Teeman said it could not go in 4.0.x somewhere.

I thought also that it couldn't be done in a B/C way, but here we are...

avatar PhilETaylor
PhilETaylor - comment - 9 Sep 2021

If you are happy, then cool. I was just repeating what I had read elsewhere.

avatar dgrammatiko dgrammatiko - change - 9 Sep 2021
Title
[4.0] Update Bootscrap to 5.1.1
[4.0] Update Bootsyrap to 5.1.1
avatar dgrammatiko dgrammatiko - edited - 9 Sep 2021
avatar dgrammatiko dgrammatiko - change - 9 Sep 2021
Title
[4.0] Update Bootsyrap to 5.1.1
[4.0] Update Bootstrap to 5.1.1
avatar dgrammatiko dgrammatiko - edited - 9 Sep 2021
avatar dgrammatiko
dgrammatiko - comment - 9 Sep 2021

If you are happy, then cool. I was just repeating what I had read elsewhere.

I'm never happy when it comes to BS ?

avatar dgrammatiko dgrammatiko - change - 9 Sep 2021
Labels Added: ? NPM Resource Changed
avatar Quy
Quy - comment - 9 Sep 2021

Unrelated changes in templates/system/?

avatar dgrammatiko
dgrammatiko - comment - 9 Sep 2021

Unrelated changes in templates/system/?

These files need to be committed anyways. Check #35413 and #35098 (comment), in short, the Github actions should do that or someone needs to create a PR whenever the Github action runs...

avatar brianteeman
brianteeman - comment - 9 Sep 2021
Processing Legacy js file: template.es5.js...
Error: $color: var(--template-text-dark) is not a color.
   ╷
37 │   @return red($value), green($value), blue($value);
   │           ^^^^^^^^^^^
   ╵
  media\vendor\bootstrap\scss\_functions.scss 37:11                  to-rgb()
  media\vendor\bootstrap\scss\_variables.scss 423:13                 @import
  administrator\templates\atum copy\scss\vendor\_bootstrap.scss 6:9  @import
  administrator\templates\atum copy\scss\template.scss 11:9          @import
  administrator\templates\atum copy\scss\template-rtl.scss 1:9       root stylesheet
npm ERR! code 1
npm ERR! path C:\htdocs\joomla-cms
npm ERR! command failed
npm ERR! command C:\WINDOWS\system32\cmd.exe /d /s /c node build/build.js --prepare
avatar dgrammatiko
dgrammatiko - comment - 9 Sep 2021

atum copy

@brianteeman in your custom template (atum copy) do the following

  • apply the changes in variables
  • add the _root.scss in the template's scss root folder (copy from here and diff it)
  • in your scss/vendor/_bootstrap.scss edit the line for the root to point in your template/scss/_root.scss
avatar brianteeman
brianteeman - comment - 9 Sep 2021

You have better eyes than me. I didnt even realise it was "atum copy". Something left over from a previous test. As its not relevant for testing this PR I deleted it and reran npm ci and it now completes. I can now test and make sure all the core templates work etc

avatar brianteeman
brianteeman - comment - 9 Sep 2021

The admin template seems to work fine and the color settings in the styles all work.
The site template seems to work fine and the font settings all work
The installation template seems to work fine.

avatar brianteeman brianteeman - test_item - 9 Sep 2021 - Tested successfully
avatar brianteeman
brianteeman - comment - 9 Sep 2021

I have tested this item successfully on 574932a


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

avatar dgrammatiko dgrammatiko - change - 9 Sep 2021
The description was changed
avatar dgrammatiko dgrammatiko - edited - 9 Sep 2021
avatar RickR2H RickR2H - test_item - 9 Sep 2021 - Tested successfully
avatar RickR2H
RickR2H - comment - 9 Sep 2021

I have tested this item successfully on 574932a

Everything seems to work! Thanks!


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

avatar RickR2H RickR2H - test_item - 9 Sep 2021 - Tested unsuccessfully
avatar RickR2H
RickR2H - comment - 9 Sep 2021

I have tested this item ? unsuccessfully on 574932a

@dgrammatiko I noticed that the installer template now has an issue with the header color


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

Also the border of the dropdown is gone.

Image 3

avatar joomla-cms-bot joomla-cms-bot - change - 9 Sep 2021
Category Administration Templates (admin) NPM Change Installation Front End Templates (site) Administration Templates (admin) NPM Change Repository Installation Front End Templates (site)
avatar dgrammatiko
dgrammatiko - comment - 9 Sep 2021

@RickR2H Nice catch, should be ok now with e2580b0

avatar RickR2H RickR2H - test_item - 9 Sep 2021 - Tested successfully
avatar RickR2H
RickR2H - comment - 9 Sep 2021

I have tested this item successfully on 076461f


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

avatar RickR2H
RickR2H - comment - 9 Sep 2021

@dgrammatiko Much better ?


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

avatar joomla-cms-bot joomla-cms-bot - change - 11 Sep 2021
Category Administration Templates (admin) NPM Change Installation Front End Templates (site) Repository Administration Templates (admin) NPM Change Repository Installation
avatar dgrammatiko
dgrammatiko - comment - 12 Sep 2021

@wilsonge you probably want to merge this for 4.0.3

avatar PhilETaylor
PhilETaylor - comment - 12 Sep 2021

4.0.3-rc1 has already been cut, surely its now too late to slip in a major css framework update before the release?

avatar dgrammatiko
dgrammatiko - comment - 12 Sep 2021

its now too late to slip in a major css framework update

It's not a major update, it's a patch and it doesn't break anything. Also provides a handful of fixes for bugs. Reminder: BS is already 2 releases behind in J4.

avatar PhilETaylor
PhilETaylor - comment - 12 Sep 2021

If this (or anything that is not a fix of something already in the RC) is merged after a Release Candidate is released, then that makes a mockery of the RC status.

But then, Joomla does that all the time /facepalm....

avatar dgrammatiko
dgrammatiko - comment - 12 Sep 2021

Never mind, I missed the RC part...

avatar PhilETaylor
PhilETaylor - comment - 12 Sep 2021

Joomla! 4.0.3 Release Candidate @wilsonge released this 32 minutes ago

avatar RickR2H
RickR2H - comment - 12 Sep 2021

We choose BS and imho falling behind is not the best way to go. We should at least keep external frameworks as updated as possible or not choose them at all. Technically it is a fix, as it is fixing BS issues.

avatar PhilETaylor
PhilETaylor - comment - 12 Sep 2021

Its not my decision thankfully.

Joomla commits to SemVer - however a release candidate is not part of the definition in SemVer it seems, apart from it being called a "pre-release" version which can have a version number appended by an identifier.

A release candidate "is a beta version with potential to be a stable product, which is ready to release unless significant bugs emerge" according to wikipedia.

The clue is in the word "candidate" - it is a "candidate" to be released as the official stable version. (Also interesting that Drupal has RC status for "at least a month" before release, and here is Joomla with 48 hours...)

But Im sure the Joomla project will just run roughshod through established software lifecycle processes and merge this before next tuesday, it has repeatedly done so in the past.

avatar wilsonge
wilsonge - comment - 14 Sep 2021

Targeting this for 4.0.4. It was too late for 4.0.3

FWIW normally release candidates are 1 week before the stable (for patch versions) - but I was massively late cutting it due to coming back from holiday and being hit with a mega backlog at work on my return.

avatar dgrammatiko
dgrammatiko - comment - 16 Sep 2021

@wilsonge copy that. I'll guess we have to hold this for a bit as 5.1.2 is ante portas https://github.com/twbs/bootstrap/projects/43

avatar wilsonge
wilsonge - comment - 18 Sep 2021

It's fine let's get this in. Bug fix versions should be a very simple npm update. I'd rather give people as much time as possible to report any potential issues with the CSS vars

avatar dgrammatiko
dgrammatiko - comment - 18 Sep 2021

@wilsonge your call

avatar richard67
richard67 - comment - 21 Sep 2021

@dgrammatiko This PR has a merge conflict now in the package-lock.json file. It comes from the recently merged PR #35605 . Could you solve that and update your branch? Thanks in advance.

avatar dgrammatiko
dgrammatiko - comment - 21 Sep 2021

I will run again npm I but maybe we should add package-lock.json and composer.lock to the .gitignore and update them using an action on every PR merge (assuming there's some changes that need to be committed). My 2c for this as it keeps bothering, to put it nicely, every contributor...

avatar thednp
thednp - comment - 29 Sep 2021

Let's get this done. Adding the package-lock.json to .gitignore is a great idea. I would get built on any npm install / npm update command anyways.

avatar thednp
thednp - comment - 30 Sep 2021

Guys can we please push this in? I have a couple PRs depending on it.

avatar dgrammatiko dgrammatiko - change - 30 Sep 2021
Labels Added: Conflicting Files
avatar dgrammatiko
dgrammatiko - comment - 30 Sep 2021

@thednp it still needs 2 tests...

avatar thednp
thednp - comment - 30 Sep 2021

OK now that the conflicts have been solved, let's get to testing.

avatar thednp
thednp - comment - 30 Sep 2021

I cannot find the PR on JTracker.

avatar dgrammatiko
dgrammatiko - comment - 30 Sep 2021

I cannot find the PR on JTracker.

https://issues.joomla.org/tracker/joomla-cms/35518

avatar thednp
thednp - comment - 30 Sep 2021

image

Build successful on my local clone of your branch.

Should I also perform a quick install?

avatar dgrammatiko
dgrammatiko - comment - 30 Sep 2021

Should I also perform a quick install?

Yes, you need to confirm that all 3 templates (installation, front end, back end) are still good

Edit: irrelevant but what are the specs of your machine? (I'm concerned that the tools took 72 seconds to finish)

avatar thednp
thednp - comment - 30 Sep 2021

Win 10, 8 core CPU, latest XAMPP APACHE server v3.3.0.

BTW, how do you guys create those sample data plugins?

avatar thednp
thednp - comment - 30 Sep 2021

OK my test looks good, installer, admin template and front-end template, all looking good. I should confirm the test on the tracker now?

avatar thednp
thednp - comment - 30 Sep 2021

Unrelated: I couldn't install "Testing Sample Data" for some reason, there was an AJAX error.

avatar dgrammatiko
dgrammatiko - comment - 30 Sep 2021

Unrelated: I couldn't install "Testing Sample Data" for some reason, there was an AJAX error.

As you said, unrelated, but maybe it's a good idea to create an issue for that

BTW, how do you guys create those sample data plugins?

Well, the core has a different way but I have my own https://github.com/dgrammatiko/sloth-pkg/tree/main/plg_sampledata The sampledata is for the sloth template (an SPA-PWA template+, totally different thing than the usual MPA stuff people do with Joomla) https://github.com/dgrammatiko/sloth

avatar RickR2H RickR2H - test_item - 30 Sep 2021 - Tested successfully
avatar RickR2H
RickR2H - comment - 30 Sep 2021

I have tested this item successfully on dcfde0d

Tested all 3 templates and could not find irregularities.


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

avatar dgrammatiko
dgrammatiko - comment - 30 Sep 2021

@thednp could you mark your test as successful in the tracker so this could be finally merged?

avatar thednp thednp - test_item - 30 Sep 2021 - Tested successfully
avatar thednp
thednp - comment - 30 Sep 2021

I have tested this item successfully on dcfde0d


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

avatar thednp
thednp - comment - 30 Sep 2021

I have tested this item successfully on dcfde0d


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

avatar thednp
thednp - comment - 30 Sep 2021

RTC

avatar alikon alikon - change - 30 Sep 2021
Status Pending Ready to Commit
avatar alikon
alikon - comment - 30 Sep 2021

RTC


This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/35518.

avatar dgrammatiko
dgrammatiko - comment - 30 Sep 2021

@wilsonge friendly reminder ?

avatar wilsonge
wilsonge - comment - 3 Oct 2021

I'm so sorry - one last merge conflict fix?

avatar dgrammatiko dgrammatiko - change - 3 Oct 2021
Labels Added: ?
Removed: Conflicting Files
8e38261 3 Oct 2021 avatar dgrammatiko Oops
d1c661d 3 Oct 2021 avatar dgrammatiko sync
avatar dgrammatiko
dgrammatiko - comment - 3 Oct 2021

@wilsonge done

avatar wilsonge wilsonge - change - 3 Oct 2021
Status Ready to Commit Fixed in Code Base
Closed_Date 0000-00-00 00:00:00 2021-10-03 21:07:42
Closed_By wilsonge
avatar wilsonge wilsonge - close - 3 Oct 2021
avatar wilsonge wilsonge - merge - 3 Oct 2021
avatar wilsonge
wilsonge - comment - 3 Oct 2021

Thanks!

avatar dgrammatiko
dgrammatiko - comment - 5 Oct 2021

@peteruoi well, that was expected: #35518 (comment)
The PR for updating to 5.1.2 should be fairly easy for anyone, the 5.1 was harder as there were breaking changes in the templates

EDIT: @peteruoi please test #35766

Add a Comment

Login with GitHub to post a comment