Merge remote-tracking branch 'origin/master'

Author: alexander-akait

src/index.js

@@ -238,17 +238,26 @@ const plugin = (options = {}) => {
 
           tokens = tokens.map((token, idx) => {
             if (idx === 0 || tokens[idx - 1] === ",") {
+              let result = token;
+
               const localMatch = /^(\s*):local\s*\((.+?)\)/.exec(token);
+              const nextLocalMatch = /:local\s*\((.+?)\)/.exec(token);
 
               if (localMatch) {
-                return (
+                result =
                   localMatch[1] +
                   exportScopedName(localMatch[2]) +
-                  token.substr(localMatch[0].length)
-                );
+                  token.substr(localMatch[0].length);
+              } else if (nextLocalMatch) {
+                const input = nextLocalMatch.input;
+                const matchPattern = nextLocalMatch[0];
+                const matchVal = nextLocalMatch[1];
+                const newVal = exportScopedName(matchVal);
+                result = input.replace(matchPattern, newVal);
               } else {
-                return token;
+                // do nothing
               }
+              return result;
             } else {
               return token;
             }

test/test-cases/export-keyframes/expected.css

@@ -17,6 +17,14 @@
   animation-name: _input__fade-in;
 }
 
+._input__fadeIn {
+  animation: 2s _input__fade-in;
+}
+
+._input__fadeIn {
+  animation: _input__fade-in 2s;
+}
+
 :export {
   fadeIn: _input__fadeIn;
   fade-in: _input__fade-in;

test/test-cases/export-keyframes/source.css

@@ -16,3 +16,11 @@
 :local(.fadeIn) {
   animation-name: _colon_local(fade-in);
 }
+
+:local(.fadeIn) {
+  animation: 2s _colon_local(fade-in);
+}
+
+:local(.fadeIn) {
+  animation: _colon_local(fade-in) 2s;
+}