Skip to content

Commit

Permalink
update mockup to include plone/mockup#1005
Browse files Browse the repository at this point in the history
  • Loading branch information
pbauer committed Aug 3, 2020
1 parent 9f67d77 commit 59f05eb
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 6 deletions.
2 changes: 2 additions & 0 deletions news/94.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update static resources.
[pbauer]
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bootstrap-icons": "1.0.0-alpha3",
"jquery": "1.12.4",
"less": "https://github.com/less/less.git#v2.7.3",
"mockup": "https://github.com/plone/mockup.git#2767f8d3d68c50e265bce434468ef2c7a4632a67",
"mockup": "https://github.com/plone/mockup.git#c875ad19ecafcfad6bc8e99be9e049b6c67b7d69",
"requirejs": "^2.3.6"
}
}
2 changes: 1 addition & 1 deletion src/plone/staticresources/profiles/default/metadata.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<metadata>
<version>9</version>
<version>10</version>
<dependencies>
<dependency>profile-plone.resource:default</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<value key="expression">python: member is not None</value>
<value key="jscompilation">++plone++static/plone-logged-in-compiled.min.js</value>
<value key="csscompilation">++plone++static/plone-logged-in-compiled.css</value>
<value key="last_compilation">2020-07-05 18:00:00</value>
<value key="last_compilation">2020-08-03 18:00:00</value>
<value key="load_async">False</value>
<value key="load_defer">False</value>
<value key="stub_js_modules">
Expand Down
1 change: 1 addition & 0 deletions src/plone/staticresources/setuphandlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ def getNonInstallableProfiles(self):
"plone.staticresources.upgrades:7",
"plone.staticresources.upgrades:8",
"plone.staticresources.upgrades:9",
"plone.staticresources.upgrades:10",
]
Original file line number Diff line number Diff line change
Expand Up @@ -14958,5 +14958,5 @@ require([
'use strict';
});

define("/home/vincentfretin/workspace/buildout.coredev-5.2/src/plone.staticresources/src/plone/staticresources/static/plone-logged-in.js", function(){});
define("/Users/pbauer/workspace/coredev/src/plone.staticresources/src/plone/staticresources/static/plone-logged-in.js", function(){});

Large diffs are not rendered by default.

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions src/plone/staticresources/upgrades/10.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<configure xmlns="http://namespaces.zope.org/zope"
xmlns:gs="http://namespaces.zope.org/genericsetup">

<gs:registerProfile name="10"
title="Update bundles"
description='Configuration for version 10'
directory="profiles/10"
for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
provides="Products.GenericSetup.interfaces.EXTENSION" />

<gs:upgradeSteps source="9"
destination="10"
profile="plone.staticresources:default">

<gs:upgradeDepends
title="Update bundles"
import_profile="plone.staticresources.upgrades:10" />

</gs:upgradeSteps>

</configure>
1 change: 1 addition & 0 deletions src/plone/staticresources/upgrades/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
<include file="7.zcml" />
<include file="8.zcml" />
<include file="9.zcml" />
<include file="10.zcml" />

</configure>
6 changes: 6 additions & 0 deletions src/plone/staticresources/upgrades/profiles/10/registry.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<registry>
<records prefix="plone.bundles/plone-logged-in" interface='Products.CMFPlone.interfaces.IBundleRegistry'>
<value key="last_compilation">2020-08-03 18:00:00</value>
</records>
</registry>

0 comments on commit 59f05eb

Please sign in to comment.