Huge News!Announcing our $40M Series B led by Abstract Ventures.Learn More
Socket
Sign inDemoInstall
Socket

aesthetic-adapter-typestyle

Package Overview
Dependencies
Maintainers
1
Versions
38
Alerts
File Explorer

Advanced tools

Socket logo

Install Socket

Detect and block malicious and high-risk dependencies

Install

aesthetic-adapter-typestyle - npm Package Compare versions

Comparing version 1.2.1 to 1.3.0

7

CHANGELOG.md

@@ -0,1 +1,8 @@

# 1.3.0 - 05/30/18
#### 🚀 New
* Updated `aesthetic` peer requirement to 2.5.
#### 🛠 Internal
* Removed `lodash.merge` dependency.
# 1.2.1 - 03/20/18

@@ -2,0 +9,0 @@ #### 🐞 Fixed

8

esm/NativeAdapter.js

@@ -1,2 +0,1 @@

import _toConsumableArray from 'babel-runtime/helpers/toConsumableArray';
import _classCallCheck from 'babel-runtime/helpers/classCallCheck';

@@ -14,3 +13,2 @@ import _createClass from 'babel-runtime/helpers/createClass';

import { TypeStyle } from 'typestyle';
import deepMerge from 'lodash.merge';

@@ -34,7 +32,3 @@ var TypeStyleAdapter = function (_Adapter) {

value: function transform() {
for (var _len = arguments.length, styles = Array(_len), _key = 0; _key < _len; _key++) {
styles[_key] = arguments[_key];
}
return this.typeStyle.style(deepMerge.apply(undefined, [{}].concat(_toConsumableArray(styles))));
return this.typeStyle.style(this.merge.apply(this, arguments));
}

@@ -41,0 +35,0 @@ }]);

@@ -17,3 +17,2 @@ import _toConsumableArray from 'babel-runtime/helpers/toConsumableArray';

import { TypeStyle } from 'typestyle';
import merge from 'lodash.merge';
import TypeStyleAdapter from './NativeAdapter';

@@ -87,3 +86,3 @@

merge(declaration.$nest, style);
declaration.$nest = this.merge(declaration.$nest, style);
}

@@ -90,0 +89,0 @@ }]);

@@ -7,6 +7,2 @@ 'use strict';

var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');

@@ -32,8 +28,10 @@

var _lodash = require('lodash.merge');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var _lodash2 = _interopRequireDefault(_lodash);
/**
* @copyright 2017, Miles Johnson
* @license https://opensource.org/licenses/MIT
*
*/
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
var TypeStyleAdapter = function (_Adapter) {

@@ -55,16 +53,8 @@ (0, _inherits3.default)(TypeStyleAdapter, _Adapter);

value: function transform() {
for (var _len = arguments.length, styles = Array(_len), _key = 0; _key < _len; _key++) {
styles[_key] = arguments[_key];
}
return this.typeStyle.style(_lodash2.default.apply(undefined, [{}].concat((0, _toConsumableArray3.default)(styles))));
return this.typeStyle.style(this.merge.apply(this, arguments));
}
}]);
return TypeStyleAdapter;
}(_aesthetic.Adapter); /**
* @copyright 2017, Miles Johnson
* @license https://opensource.org/licenses/MIT
*
*/
}(_aesthetic.Adapter);
exports.default = TypeStyleAdapter;

@@ -45,6 +45,2 @@ 'use strict';

var _lodash = require('lodash.merge');
var _lodash2 = _interopRequireDefault(_lodash);
var _NativeAdapter = require('./NativeAdapter');

@@ -56,2 +52,8 @@

/**
* @copyright 2017, Miles Johnson
* @license https://opensource.org/licenses/MIT
*
*/
var UnifiedTypeStyleAdapter = function (_TypeStyleAdapter) {

@@ -122,12 +124,8 @@ (0, _inherits3.default)(UnifiedTypeStyleAdapter, _TypeStyleAdapter);

(0, _lodash2.default)(declaration.$nest, style);
declaration.$nest = this.merge(declaration.$nest, style);
}
}]);
return UnifiedTypeStyleAdapter;
}(_NativeAdapter2.default); /**
* @copyright 2017, Miles Johnson
* @license https://opensource.org/licenses/MIT
*
*/
}(_NativeAdapter2.default);
exports.default = UnifiedTypeStyleAdapter;
{
"name": "aesthetic-adapter-typestyle",
"version": "1.2.1",
"version": "1.3.0",
"description": "TypeStyle support for Aesthetic.",

@@ -18,7 +18,6 @@ "keywords": [

"babel-runtime": "^6.26.0",
"lodash.merge": "^4.6.1",
"prop-types": "^15.6.1"
},
"peerDependencies": {
"aesthetic": "^2.1.0",
"aesthetic": "^2.5.0",
"typestyle": "^1.7.0"

@@ -28,5 +27,5 @@ },

"@milesj/build-tool-config": "^0.50.0",
"aesthetic": "^2.2.3",
"aesthetic": "^2.5.0",
"typestyle": "^1.7.2"
}
}

@@ -9,3 +9,2 @@ /**

import { TypeStyle } from 'typestyle';
import deepMerge from 'lodash.merge';

@@ -22,4 +21,4 @@ import type { ClassName, StyleDeclaration } from '../../types';

transform(...styles: StyleDeclaration[]): ClassName {
return this.typeStyle.style(deepMerge({}, ...styles));
return this.typeStyle.style(this.merge(...styles));
}
}

@@ -12,3 +12,2 @@ /**

import { TypeStyle } from 'typestyle';
import merge from 'lodash.merge';
import TypeStyleAdapter from './NativeAdapter';

@@ -98,4 +97,4 @@

merge(declaration.$nest, style);
declaration.$nest = this.merge(declaration.$nest, style);
}
}
SocketSocket SOC 2 Logo

Product

  • Package Alerts
  • Integrations
  • Docs
  • Pricing
  • FAQ
  • Roadmap
  • Changelog

Packages

npm

Stay in touch

Get open source security insights delivered straight into your inbox.


  • Terms
  • Privacy
  • Security

Made with ⚡️ by Socket Inc