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

Use base url for cache prefix and SCSS caching #5429

Merged
merged 5 commits into from
Jun 19, 2017
Merged

Conversation

juliusknorr
Copy link
Member

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@mention-bot
Copy link

@juliushaertl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rullzer, @LukasReschke and @tanghus to be potential reviewers.

@codecov
Copy link

codecov bot commented Jun 16, 2017

Codecov Report

Merging #5429 into master will increase coverage by <.01%.
The diff coverage is 94.44%.

@@             Coverage Diff              @@
##             master    #5429      +/-   ##
============================================
+ Coverage     54.13%   54.14%   +<.01%     
- Complexity    22329    22344      +15     
============================================
  Files          1380     1380              
  Lines         85544    85547       +3     
  Branches       1329     1329              
============================================
+ Hits          46311    46321      +10     
+ Misses        39233    39226       -7
Impacted Files Coverage Δ Complexity Δ
lib/private/URLGenerator.php 77.63% <100%> (+1.68%) 64 <1> (+14) ⬆️
lib/private/Server.php 93.31% <100%> (+0.03%) 120 <0> (ø) ⬇️
lib/private/Template/SCSSCacher.php 69.35% <80%> (+0.5%) 35 <1> (+1) ⬆️
core/js/js.js 61.83% <0%> (+0.55%) 0% <0%> (ø) ⬇️

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@MorrisJobke MorrisJobke merged commit 381850b into master Jun 19, 2017
@MorrisJobke MorrisJobke deleted the cache-baseurl branch June 19, 2017 03:21
@blizzz
Copy link
Member

blizzz commented Jun 19, 2017

It fixes bugs in 12 (all linked above) I pledge for backporting to 12.

danxuliu added a commit that referenced this pull request Aug 4, 2017
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the DataResponse from the controller now
provides the full URL to the "server.css" file that has to be reloaded
(if any).

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu danxuliu mentioned this pull request Aug 4, 2017
danxuliu added a commit that referenced this pull request Aug 4, 2017
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the DataResponse from the controller now
provides the full URL to the "server.css" file that has to be reloaded
(if any).

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
danxuliu added a commit that referenced this pull request Aug 8, 2017
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the DataResponse from the controller now
provides the full URL to the "server.css" file that has to be reloaded
(if any).

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
danxuliu added a commit that referenced this pull request Aug 10, 2017
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).

The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
danxuliu added a commit that referenced this pull request Aug 10, 2017
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.

As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.

Fixes #5975

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@oparoz
Copy link
Member

oparoz commented Nov 20, 2017

Was backported in #5584

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

Successfully merging this pull request may close these issues.

6 participants