Skip to content

Commit

Permalink
[fc] Repository: plone.behavior
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2017-03-21T09:40:25-06:00
Author: Fulvio Casali (fulv) <fulviocasali@gmail.com>
Commit: plone/plone.behavior@0619934

Fix import dotted path in example

Files changed:
M README.rst
Repository: plone.behavior

Branch: refs/heads/master
Date: 2017-10-02T00:49:07+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.behavior@4673409

Merge pull request #15 from plone/fulv-patch-1

Fix import dotted path in example

Files changed:
M README.rst
  • Loading branch information
jensens committed Oct 1, 2017
1 parent ac4de19 commit 38b06b8
Showing 1 changed file with 30 additions and 226 deletions.
256 changes: 30 additions & 226 deletions last_commit.txt
@@ -1,254 +1,58 @@
Repository: Products.CMFPlone
Repository: plone.behavior


Branch: refs/heads/master
Date: 2017-09-29T01:25:07+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/fe36b71320a6775880947a7dffed8a28c9a2e522
Date: 2017-03-21T09:40:25-06:00
Author: Fulvio Casali (fulv) <fulviocasali@gmail.com>
Commit: https://github.com/plone/plone.behavior/commit/06199343cf7c9a86e773700b80d8e6674c3a6658

Update npm dependencies.
Fix import dotted path in example

Files changed:
M CHANGES.rst
M Products/CMFPlone/_scripts/_generate_gruntfile.py
M Products/CMFPlone/_scripts/compile_resources.py
M README.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index f44020629..fca8eeeaa 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,7 +14,8 @@ Breaking changes:
diff --git a/README.rst b/README.rst
index f233991..3866f65 100644
--- a/README.rst
+++ b/README.rst
@@ -112,7 +112,7 @@ The ``name`` can be used for lookup instead of the full dotted name of the inter

New features:
We also have a helper function to achieve this::

-- *add item here*
+- Update npm dependencies.
+ [thet]
- from registration import lookup_behavior_registration
+ from plone.behavior.registration import lookup_behavior_registration

Bug fixes:
registration = lookup_behavior_registration(name='locking_support')

diff --git a/Products/CMFPlone/_scripts/_generate_gruntfile.py b/Products/CMFPlone/_scripts/_generate_gruntfile.py
index b5990f04c..a9aa6de56 100644
--- a/Products/CMFPlone/_scripts/_generate_gruntfile.py
+++ b/Products/CMFPlone/_scripts/_generate_gruntfile.py
@@ -122,24 +122,25 @@ def applyBrowserLayers(site):
"{bkey}": {{
options: {{
baseUrl: "/",
+ exclude: ["jquery"],
generateSourceMaps: false,
- preserveLicenseComments: false,
- paths: {paths},
- shim: {shims},
- wrapShim: true,
name: "{name}",
- exclude: ["jquery"],
+ optimize: "none",
out: "{out}",
- optimize: "none"
+ paths: {paths},
+ preserveLicenseComments: false,
+ shim: {shims},
+ wrapShim: true
}}
}},
"""
UGLIFY_CONFIG_TEMPLATE = """
"{bkey}": {{
options: {{
- sourceMap: true,
- sourceMapName: "{destination}.map",
- sourceMapIncludeSources: false
+ sourceMap: {{
+ includeSources: false
+ }},
+ sourceMapName: "{destination}.map"
}},
files: {{
"{destination}": {files}
@@ -154,18 +155,16 @@ def applyBrowserLayers(site):
],
options: {{
compress: true,
- strictMath: false,
- sourceMap: true,
+ modifyVars: modifyVars,
outputSourceFiles: true,
- strictImports: false,
- sourceMapURL: "{sourcemap_url}",
- sourceMapBasepath: "{base_path}",
- relativeUrls: true,
- plugins: [
- new require("less-plugin-inline-urls"),
- ],
paths: lessPaths,
- modifyVars: modifyVars
+ plugins: [new require("less-plugin-inline-urls"),],
+ relativeUrls: true,
+ sourceMap: true,
+ sourceMapBasepath: "{base_path}",
+ sourceMapURL: "{sourcemap_url}",
+ strictImports: false,
+ strictMath: false
}}
}}\
"""
diff --git a/Products/CMFPlone/_scripts/compile_resources.py b/Products/CMFPlone/_scripts/compile_resources.py
index eec9fd285..784ab50a8 100644
--- a/Products/CMFPlone/_scripts/compile_resources.py
+++ b/Products/CMFPlone/_scripts/compile_resources.py
@@ -8,19 +8,19 @@

package_json_contents = """{
"name": "gruntrunner",
- "version": "1.1.2",
+ "version": "1.1.3",
"private": true,
"devDependencies": {
- "grunt": "~0.4.5",
+ "grunt": "~1.0.1",
"grunt-cli": "~1.2.0",
- "grunt-contrib-less": "~1.3.0",
+ "grunt-contrib-less": "~1.4.1",
"grunt-contrib-requirejs": "~1.0.0",
- "grunt-contrib-uglify": "~1.0.1",
+ "grunt-contrib-uglify": "~3.1.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-sed": "collective/grunt-sed#e625902539f5c29f1246228270a0330c1097b1e4",
"less-plugin-inline-urls": "^1.2.0"
}
-}"""
+}""" # noqa

if os.name == 'nt':
NPM_CMD = 'npm.cmd'


Repository: Products.CMFPlone
Repository: plone.behavior


Branch: refs/heads/master
Date: 2017-10-01T23:44:29+02:00
Date: 2017-10-02T00:49:07+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/Products.CMFPlone/commit/7ef4ec8eabdfb4e24b43386c3954c60b33de50ec
Commit: https://github.com/plone/plone.behavior/commit/4673409c0b2dc88d10f5570684c00df5036e5426

Merge pull request #2162 from plone/thet-updnpm
Merge pull request #15 from plone/fulv-patch-1

Update npm dependencies.
Fix import dotted path in example

Files changed:
M CHANGES.rst
M Products/CMFPlone/_scripts/_generate_gruntfile.py
M Products/CMFPlone/_scripts/compile_resources.py
M README.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index f44020629..fca8eeeaa 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,7 +14,8 @@ Breaking changes:

New features:

-- *add item here*
+- Update npm dependencies.
+ [thet]
diff --git a/README.rst b/README.rst
index f233991..3866f65 100644
--- a/README.rst
+++ b/README.rst
@@ -112,7 +112,7 @@ The ``name`` can be used for lookup instead of the full dotted name of the inter

Bug fixes:
We also have a helper function to achieve this::

diff --git a/Products/CMFPlone/_scripts/_generate_gruntfile.py b/Products/CMFPlone/_scripts/_generate_gruntfile.py
index b5990f04c..a9aa6de56 100644
--- a/Products/CMFPlone/_scripts/_generate_gruntfile.py
+++ b/Products/CMFPlone/_scripts/_generate_gruntfile.py
@@ -122,24 +122,25 @@ def applyBrowserLayers(site):
"{bkey}": {{
options: {{
baseUrl: "/",
+ exclude: ["jquery"],
generateSourceMaps: false,
- preserveLicenseComments: false,
- paths: {paths},
- shim: {shims},
- wrapShim: true,
name: "{name}",
- exclude: ["jquery"],
+ optimize: "none",
out: "{out}",
- optimize: "none"
+ paths: {paths},
+ preserveLicenseComments: false,
+ shim: {shims},
+ wrapShim: true
}}
}},
"""
UGLIFY_CONFIG_TEMPLATE = """
"{bkey}": {{
options: {{
- sourceMap: true,
- sourceMapName: "{destination}.map",
- sourceMapIncludeSources: false
+ sourceMap: {{
+ includeSources: false
+ }},
+ sourceMapName: "{destination}.map"
}},
files: {{
"{destination}": {files}
@@ -154,18 +155,16 @@ def applyBrowserLayers(site):
],
options: {{
compress: true,
- strictMath: false,
- sourceMap: true,
+ modifyVars: modifyVars,
outputSourceFiles: true,
- strictImports: false,
- sourceMapURL: "{sourcemap_url}",
- sourceMapBasepath: "{base_path}",
- relativeUrls: true,
- plugins: [
- new require("less-plugin-inline-urls"),
- ],
paths: lessPaths,
- modifyVars: modifyVars
+ plugins: [new require("less-plugin-inline-urls"),],
+ relativeUrls: true,
+ sourceMap: true,
+ sourceMapBasepath: "{base_path}",
+ sourceMapURL: "{sourcemap_url}",
+ strictImports: false,
+ strictMath: false
}}
}}\
"""
diff --git a/Products/CMFPlone/_scripts/compile_resources.py b/Products/CMFPlone/_scripts/compile_resources.py
index eec9fd285..784ab50a8 100644
--- a/Products/CMFPlone/_scripts/compile_resources.py
+++ b/Products/CMFPlone/_scripts/compile_resources.py
@@ -8,19 +8,19 @@
- from registration import lookup_behavior_registration
+ from plone.behavior.registration import lookup_behavior_registration

package_json_contents = """{
"name": "gruntrunner",
- "version": "1.1.2",
+ "version": "1.1.3",
"private": true,
"devDependencies": {
- "grunt": "~0.4.5",
+ "grunt": "~1.0.1",
"grunt-cli": "~1.2.0",
- "grunt-contrib-less": "~1.3.0",
+ "grunt-contrib-less": "~1.4.1",
"grunt-contrib-requirejs": "~1.0.0",
- "grunt-contrib-uglify": "~1.0.1",
+ "grunt-contrib-uglify": "~3.1.0",
"grunt-contrib-watch": "~1.0.0",
"grunt-sed": "collective/grunt-sed#e625902539f5c29f1246228270a0330c1097b1e4",
"less-plugin-inline-urls": "^1.2.0"
}
-}"""
+}""" # noqa
registration = lookup_behavior_registration(name='locking_support')

if os.name == 'nt':
NPM_CMD = 'npm.cmd'


0 comments on commit 38b06b8

Please sign in to comment.