Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ Changelog
0.1.3 (unreleased)
------------------

- Nothing changed yet.
BREAKING:
- Used collective.slick slick bundle instead of a static specific one
[nzambello]


0.1.2 (2018-06-11)
Expand Down
100 changes: 58 additions & 42 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,78 +1,95 @@
const sass = require("node-sass");

module.exports = function (grunt) {
'use strict';
module.exports = function(grunt) {
"use strict";

require('load-grunt-tasks')(grunt);
var productRoot = 'src/redturtle/patterns/slider';
require("load-grunt-tasks")(grunt);
var productRoot = "src/redturtle/patterns/slider";
grunt.initConfig({
sass: { // Task
dist: { // Target
options: { // Target options
style: 'expanded',
},
files: { // Dictionary of files
'./src/redturtle/patterns/slider/static/pattern.css': `${productRoot}/static/pattern.scss`,
sass: {
// Task
dist: {
// Target
options: {
// Target options
style: "expanded"
},
files: {
// Dictionary of files
"./src/redturtle/patterns/slider/static/pattern.css": `${productRoot}/static/pattern.scss`
}
},
options: {
implementation: sass,
sourceMap: true,
outputStyle: "compressed"
}
},
cssmin: {
target: {
files: {
'./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.min.css': [`${productRoot}/libraries/slick/slick.css`, `${productRoot}/static/pattern.css`],
},
"./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.min.css": [
`${productRoot}/static/pattern.css`
]
}
},
options: {
sourceMap: true,
},
sourceMap: true
}
},
requirejs: {
'redturtle-patterns-slider': {
"redturtle-patterns-slider": {
options: {
baseUrl: './',
baseUrl: "./",
generateSourceMaps: true,
preserveLicenseComments: false,
paths: {
jquery: 'empty:',
'pat-base': 'empty:',
'slick.min': `${productRoot}/libraries/slick/slick.min`,
'redturtle-patterns-slider': `${productRoot}/static/pattern`
jquery: "empty:",
"pat-base": "empty:",
"collective-slick-js": "empty:",
"redturtle-patterns-slider": `${productRoot}/static/pattern`
},
wrapShim: true,
name: `${productRoot}/static/bundle.js`,
exclude: ['jquery'],
exclude: ["jquery"],
out: `${productRoot}/static/build/redturtle-patterns-slider-bundle-compiled.js`,
optimize: 'none',
},
},
optimize: "none"
}
}
},
uglify: {
'redturtle-patterns-slider': {
"redturtle-patterns-slider": {
options: {
sourceMap: true,
sourceMapName: `./${productRoot}/static/build/redturtle-patterns-slider-bundle-compiled.js.map`,
sourceMapIncludeSources: false,
sourceMapIncludeSources: false
},
files: {
'./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.js': ['./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.js'],
},
},
"./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.js": [
"./src/redturtle/patterns/slider/static/build/redturtle-patterns-slider-bundle-compiled.js"
]
}
}
},
watch: {
scripts: {
files: [`${productRoot}/static/pattern.js`, `${productRoot}/static/bundle.js`],
tasks: ['requirejs', 'uglify'],
files: [
`${productRoot}/static/pattern.js`,
`${productRoot}/static/bundle.js`
],
tasks: ["requirejs", "uglify"],
options: {
livereload: true,
},
livereload: true
}
},
css: {
files: `${productRoot}/static/pattern.scss`,
tasks: ['sass', 'cssmin'],
tasks: ["sass", "cssmin"],
options: {
livereload: true,
},
},
},
livereload: true
}
}
}

// sed: {
// version: {
Expand All @@ -84,7 +101,6 @@ module.exports = function (grunt) {
// },
});

grunt.registerTask('default', ['watch']);
grunt.registerTask('compile', ['sass', 'cssmin', 'requirejs', 'uglify']);

grunt.registerTask("default", ["watch"]);
grunt.registerTask("compile", ["sass", "cssmin", "requirejs", "uglify"]);
};
9 changes: 7 additions & 2 deletions buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,18 @@ zc.buildout =
#setuptools = 24.3.0
#zc.buildout = 2.5.2
zc.recipe.egg = 2.0.3
flake8 = 3.0.4
# flake8 = 3.0.4
flake8-isort = 2.0.1
i18ndude = 4.0.1
robotframework = 3.0
robotframework-ride = 1.5.2.1
robotframework-selenium2library = 1.7.4
robotsuite = 1.7.0
selenium = 2.53.6
plone.testing = 5.0.0
# plone.testing = 5.0.0
coverage = 4.2

plone.testing = 7.0.1
flake8 = 3.3.0
pycodestyle = 2.0.0
pyflakes = 1.5.0
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
'plone.api',
'Products.GenericSetup>=1.8.2',
'setuptools',
'collective.slick',
],
extras_require={
'test': [
Expand Down
6 changes: 0 additions & 6 deletions src/redturtle/patterns/slider/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,4 @@
name="redturtle-patterns-slider"
/>

<browser:resourceDirectory
name="redturtle-patterns-slider-libraries"
directory="libraries"
/>


</configure>
117 changes: 0 additions & 117 deletions src/redturtle/patterns/slider/libraries/slick/slick.css

This file was deleted.

Loading