Merge remote-tracking branch 'upstream/master'

Author: hiro0218

.eslintignore

@@ -1,3 +1,3 @@
-test/fixtures/*
+**/fixtures/**
 coverage/**
-.nyc_output/**
+.nyc_output/**

.github/dependabot.yml

@@ -1,7 +1,10 @@
 version: 2
 updates:
-  - package-ecosystem: 'npm'
+  - package-ecosystem: npm
     directory: '/'
     schedule:
-      interval: 'daily'
+      interval: montly
     versioning-strategy: increase
+    open-pull-requests-limit: 1
+    labels:
+      - 'pr: dependencies'

.husky/pre-commit

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+[ -n "$CI" ] && exit 0
+
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged

.prettierignore

@@ -1,3 +1,3 @@
-test/fixtures/*
+**/fixtures/**
 coverage/**
 .nyc_output/**

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.38.0
+
+- Removed: hardcoded transform from float to cssFloat in objects ([#172](https://github.com/stylelint/postcss-css-in-js/pull/172))
+- Fixed: silent fail if @babel/plugin-proposal-decorators is in user's Babel configuration ([#237](https://github.com/stylelint/postcss-css-in-js/pull/237))
+
+## 0.37.3
+
+- Fixed: silent fail if Babel config is present ([#258](https://github.com/stylelint/postcss-css-in-js/pull/258)).
+
 ## 0.37.2
 
 - Fixed: use HTTPS url instead of HTTP for postcss logo in README ([#39](https://github.com/stylelint/postcss-css-in-js/pull/39)).

camel-case.js

@@ -4,7 +4,7 @@ function camelCase(str) {
 	return str.replace(/[\w-]+/g, (s) => {
 		return /^-?[a-z]+(?:-[a-z]+)+$/.test(s)
 			? s
-					.replace(/^-(ms|moz|khtml|epub|(\w+-?)*webkit)(?=-)/i, '$1')
+					.replace(/^-(ms|moz|khtml|epub|(\w+-?)*webkit)(?=-)/i, '$1') // eslint-disable-line regexp/no-super-linear-backtracking -- TODO: fix
 					.replace(/-\w/g, (uncasedStr) => uncasedStr[1].toUpperCase())
 			: s;
 	});

extract.js

@@ -141,6 +141,33 @@ function loadBabelOpts(opts) {
 		}
 
 		opts[key] = fileOpts[key];
+
+		if (Array.isArray(fileOpts[key]) && Array.isArray(opts.parserOpts[key])) {
+			// combine arrays for plugins
+			// plugins in fileOpts could be string, array or object
+			for (const plugin of fileOpts[key]) {
+				const option =
+					Array.isArray(plugin) || typeof plugin === 'string'
+						? plugin
+						: [plugin.key, plugin.options];
+
+				opts.parserOpts[key] = [...opts.parserOpts[key], option];
+			}
+		} else {
+			// because some options need to be passed to parser also
+			opts.parserOpts[key] = fileOpts[key];
+		}
+	}
+
+	// avoid conflicting with the legacy decorators plugin
+	if (opts.plugins && opts.plugins.some((p) => p.key === 'proposal-decorators')) {
+		const index = opts.parserOpts.plugins.findIndex(
+			(p) => Array.isArray(p) && p[0] === 'decorators',
+		);
+
+		if (index > -1) {
+			opts.parserOpts.plugins.splice(index, 1);
+		}
 	}
 
 	return opts;

object-parser.js

@@ -128,7 +128,7 @@ class objectParser {
 					.slice(parent.nodes[i - 1].raws.node.end, child.raws.node.start)
 					.replace(/^\s*,+/, '');
 			} else if (node) {
-				child.raws.before = source.slice(node.start, child.raws.node.start).replace(/^\s*{+/, '');
+				child.raws.before = source.slice(node.start, child.raws.node.start).replace(/^\s*\{+/, '');
 			}
 		});
 
@@ -143,10 +143,10 @@ class objectParser {
 					return '';
 				});
 			} else {
-				after = source.slice(node.start, node.end).replace(/^\s*{/, '');
+				after = source.slice(node.start, node.end).replace(/^\s*\{/, '');
 			}
 
-			parent.raws.after = after.replace(/}+\s*$/, '');
+			parent.raws.after = after.replace(/\}+\s*$/, '');
 			parent.raws.semicolon = semicolon || false;
 		}
 	}
@@ -217,10 +217,11 @@ class objectParser {
 		if (node.value.type === 'ObjectExpression') {
 			let rule;
 
+			// eslint-disable-next-line regexp/no-unused-capturing-group, regexp/no-super-linear-backtracking -- TODO: fix
 			if (/^@(\S+)(\s*)(.*)$/.test(key.value)) {
-				const name = RegExp.$1;
-				const afterName = RegExp.$2;
-				const params = RegExp.$3;
+				const name = RegExp.$1; // eslint-disable-line regexp/no-legacy-features -- TODO: fix
+				const afterName = RegExp.$2; // eslint-disable-line regexp/no-legacy-features -- TODO: fix
+				const params = RegExp.$3; // eslint-disable-line regexp/no-legacy-features -- TODO: fix
 				const atRule = postcss.atRule({
 					name: unCamelCase(name),
 					raws: {
@@ -325,6 +326,7 @@ class objectParser {
 			return this.comment(node, parent.parent);
 		}
 
+		// eslint-disable-next-line regexp/no-super-linear-backtracking -- TODO: fix
 		const text = node.value.match(/^(\s*)((?:\S[\s\S]*?)?)(\s*)$/);
 		const comment = postcss.comment({
 			text: text[2],

object-stringifier.js

@@ -26,10 +26,6 @@ class ObjectStringifier extends Stringifier {
 	decl(node, semicolon) {
 		let prop = this.rawValue(node, 'prop');
 
-		if (prop === 'float') {
-			prop = 'cssFloat';
-		}
-
 		let string = prop;
 
 		const isObjectShorthand = node.raws.node && node.raws.node.shorthand;
@@ -100,7 +96,7 @@ class ObjectStringifier extends Stringifier {
 			!/:/.test(value)
 		) {
 			value = `:${value}`;
-		} else if (own === 'before' && /^(decl|rule)$/.test(node.type)) {
+		} else if (own === 'before' && /^(?:decl|rule)$/.test(node.type)) {
 			value = value.replace(/\S+$/, '');
 		}
 
@@ -123,11 +119,12 @@ class ObjectStringifier extends Stringifier {
 			return value;
 		}
 
-		if (/^(prop|selector)$/i.test(prop)) {
+		if (/^(?:prop|selector)$/i.test(prop)) {
 			value = camelCase(value);
 
+			// eslint-disable-next-line regexp/no-unused-capturing-group -- TODO: fix
 			if (node.raws.before && /(\S+)$/.test(node.raws.before)) {
-				value = RegExp.$1 + value;
+				value = RegExp.$1 + value; // eslint-disable-line regexp/no-legacy-features -- TODO: fix
 			} else if (value && !/\W/.test(value)) {
 				return value;
 			}