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

Fix examples, fixes #366 #367

Merged
merged 5 commits into from
Apr 5, 2019
Merged
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
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"es6": true,
"node": true
},
"parser": "babel-eslint",
"rules": {
"indent": ["error", 4],
"no-const-assign": "error",
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ notifications:
on_failure: always
on_start: never

before_script:
- npm run build
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The linter was catching references in examples/src/*.js to ../../lib/index.js as not existing. This should fix that.


after_script:
- npm run coveralls
148 changes: 123 additions & 25 deletions dist/aphrodite.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,18 +256,18 @@ var importantify = function importantify(string
);
};

var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};

function unwrapExports (x) {
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x.default : x;
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
}

function createCommonjsModule(fn, module) {
return module = { exports: {} }, fn(module, module.exports), module.exports;
}

function getCjsExportFromNamespace (n) {
return n && n.default || n;
return n && n['default'] || n;
}

// Use the fastest means possible to execute a task in its own turn, with
Expand Down Expand Up @@ -1143,6 +1143,122 @@ function gradient(property, value) {

var gradient = unwrapExports(gradient_1);

var grid_1 = createCommonjsModule(function (module, exports) {

Object.defineProperty(exports, "__esModule", {
value: true
});

var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();

exports.default = grid;
function isSimplePositionValue(value) {
return typeof value === 'number' && !isNaN(value);
}

var alignmentValues = ['center', 'end', 'start', 'stretch'];

var displayValues = {
'inline-grid': ['-ms-inline-grid', 'inline-grid'],
grid: ['-ms-grid', 'grid']
};

var propertyConverters = {
alignSelf: function alignSelf(value, style) {
if (alignmentValues.indexOf(value) > -1) {
style.msGridRowAlign = value;
}
},

gridColumn: function gridColumn(value, style) {
if (isSimplePositionValue(value)) {
style.msGridColumn = value;
} else {
var _value$split$map = value.split('/').map(function (position) {
return +position;
}),
_value$split$map2 = _slicedToArray(_value$split$map, 2),
start = _value$split$map2[0],
end = _value$split$map2[1];

propertyConverters.gridColumnStart(start, style);
propertyConverters.gridColumnEnd(end, style);
}
},

gridColumnEnd: function gridColumnEnd(value, style) {
var msGridColumn = style.msGridColumn;

if (isSimplePositionValue(value) && isSimplePositionValue(msGridColumn)) {
style.msGridColumnSpan = value - msGridColumn;
}
},

gridColumnStart: function gridColumnStart(value, style) {
if (isSimplePositionValue(value)) {
style.msGridColumn = value;
}
},

gridRow: function gridRow(value, style) {
if (isSimplePositionValue(value)) {
style.msGridRow = value;
} else {
var _value$split$map3 = value.split('/').map(function (position) {
return +position;
}),
_value$split$map4 = _slicedToArray(_value$split$map3, 2),
start = _value$split$map4[0],
end = _value$split$map4[1];

propertyConverters.gridRowStart(start, style);
propertyConverters.gridRowEnd(end, style);
}
},

gridRowEnd: function gridRowEnd(value, style) {
var msGridRow = style.msGridRow;

if (isSimplePositionValue(value) && isSimplePositionValue(msGridRow)) {
style.msGridRowSpan = value - msGridRow;
}
},

gridRowStart: function gridRowStart(value, style) {
if (isSimplePositionValue(value)) {
style.msGridRow = value;
}
},

gridTemplateColumns: function gridTemplateColumns(value, style) {
style.msGridColumns = value;
},

gridTemplateRows: function gridTemplateRows(value, style) {
style.msGridRows = value;
},

justifySelf: function justifySelf(value, style) {
if (alignmentValues.indexOf(value) > -1) {
style.msGridColumnAlign = value;
}
}
};

function grid(property, value, style) {
if (property === 'display' && value in displayValues) {
return displayValues[value];
}

if (property in propertyConverters) {
var propertyConverter = propertyConverters[property];
propertyConverter(value, style);
}
}
});

var grid = unwrapExports(grid_1);

var imageSet_1 = createCommonjsModule(function (module, exports) {

Object.defineProperty(exports, "__esModule", {
Expand Down Expand Up @@ -1413,7 +1529,7 @@ var wm = ["Webkit", "Moz"];
var wms = ["Webkit", "ms"];
var wmms = ["Webkit", "Moz", "ms"];
var staticData = {
plugins: [backgroundClip, calc, crossFade, cursor, filter, flex, flexboxIE, flexboxOld, gradient, imageSet, logical, position, sizing, transition],
plugins: [backgroundClip, calc, crossFade, cursor, filter, flex, flexboxIE, flexboxOld, gradient, grid, imageSet, logical, position, sizing, transition],
prefixMap: {
"transform": wms,
"transformOrigin": wms,
Expand Down Expand Up @@ -1516,25 +1632,7 @@ var staticData = {
"wrapThrough": ms,
"wrapMargin": ms,
"touchAction": ms,
"gridTemplateColumns": ms,
"gridTemplateRows": ms,
"gridTemplateAreas": ms,
"gridTemplate": ms,
"gridAutoColumns": ms,
"gridAutoRows": ms,
"gridAutoFlow": ms,
"grid": ms,
"gridRowStart": ms,
"gridColumnStart": ms,
"gridRowEnd": ms,
"gridRow": ms,
"gridColumn": ms,
"gridColumnEnd": ms,
"gridColumnGap": ms,
"gridRowGap": ms,
"gridArea": ms,
"gridGap": ms,
"textSizeAdjust": wms,
"textSizeAdjust": ["ms", "Webkit"],
"borderImage": w,
"borderImageOutset": w,
"borderImageRepeat": w,
Expand Down Expand Up @@ -2385,7 +2483,7 @@ exports.StyleSheet = StyleSheet$1;
exports.StyleSheetServer = StyleSheetServer$1;
exports.StyleSheetTestUtils = StyleSheetTestUtils$1;
exports.css = css;
exports.minify = minify;
exports.defaultSelectorHandlers = defaultSelectorHandlers$1;
exports.flushToStyleTag = flushToStyleTag$1;
exports.injectAndGetClassName = injectAndGetClassName$1;
exports.defaultSelectorHandlers = defaultSelectorHandlers$1;
exports.minify = minify;
146 changes: 122 additions & 24 deletions dist/aphrodite.umd.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/aphrodite.umd.min.js

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions examples/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/env", "@babel/react", "@babel/flow"]
}
Loading