Chore: More sane config options

facebook · Dec 1, 2023 · dc3cca7 · dc3cca7
1 parent 32d1d4e
commit dc3cca7
Show file tree

Hide file tree

Showing 27 changed files with 304 additions and 300 deletions.
diff --git a/packages/babel-plugin/__tests__/evaluation/stylex-import-evaluation-test.js b/packages/babel-plugin/__tests__/evaluation/stylex-import-evaluation-test.js
@@ -34,10 +34,7 @@ function transform(source, opts = options) {
       jsx,
       [
         stylexPlugin,
-        {
-          treeshakeCompensation: true,
-          ...opts,
-        },
+        { treeshakeCompensation: true, runtimeInjection: true, ...opts },
       ],
     ],
   });

diff --git a/packages/babel-plugin/__tests__/stylex-transform-call-test.js b/packages/babel-plugin/__tests__/stylex-transform-call-test.js
@@ -21,7 +21,7 @@ function transform(source, opts = {}) {
     parserOpts: {
       flow: 'all',
     },
-    plugins: [jsx, [stylexPlugin, opts]],
+    plugins: [jsx, [stylexPlugin, { runtimeInjection: true, ...opts }]],
   }).code;
 }
 

diff --git a/packages/babel-plugin/__tests__/stylex-transform-create-test.js b/packages/babel-plugin/__tests__/stylex-transform-create-test.js
@@ -21,7 +21,7 @@ function transform(source, opts = {}) {
     parserOpts: {
       flow: 'all',
     },
-    plugins: [flowPlugin, [stylexPlugin, opts]],
+    plugins: [flowPlugin, [stylexPlugin, { runtimeInjection: true, ...opts }]],
   }).code;
 }
 
@@ -805,7 +805,7 @@ describe('@stylexjs/babel-plugin', () => {
               }
             });
          `,
-          { stylexSheetName: '<>' },
+          { runtimeInjection: false },
         ),
       ).toMatchInlineSnapshot(`
         "import stylex from 'stylex';
@@ -984,7 +984,7 @@ describe('@stylexjs/babel-plugin', () => {
             }
           });
          `,
-          { stylexSheetName: '<>', styleResolution: 'property-specificity' },
+          { runtimeInjection: false, styleResolution: 'property-specificity' },
         ),
       ).toMatchInlineSnapshot(`
         "import stylex from 'stylex';

diff --git a/packages/babel-plugin/__tests__/stylex-transform-import-test.js b/packages/babel-plugin/__tests__/stylex-transform-import-test.js
@@ -20,7 +20,7 @@ function transform(source, opts = {}) {
     parserOpts: {
       flow: 'all',
     },
-    plugins: [[stylexPlugin, opts]],
+    plugins: [[stylexPlugin, { runtimeInjection: true, ...opts }]],
   }).code;
 }
 

diff --git a/packages/babel-plugin/__tests__/stylex-transform-keyframes-test.js b/packages/babel-plugin/__tests__/stylex-transform-keyframes-test.js
@@ -20,7 +20,7 @@ function transform(source, opts = {}) {
     parserOpts: {
       flow: 'all',
     },
-    plugins: [[stylexPlugin, opts]],
+    plugins: [[stylexPlugin, { runtimeInjection: true, ...opts }]],
   }).code;
 }
 

diff --git a/packages/babel-plugin/__tests__/stylex-transform-legacy-shorthands-test.js b/packages/babel-plugin/__tests__/stylex-transform-legacy-shorthands-test.js
@@ -25,7 +25,14 @@ function transform(source, opts = {}) {
     },
     plugins: [
       jsx,
-      [stylexPlugin, { styleResolution: 'legacy-expand-shorthands', ...opts }],
+      [
+        stylexPlugin,
+        {
+          runtimeInjection: true,
+          styleResolution: 'legacy-expand-shorthands',
+          ...opts,
+        },
+      ],
     ],
   }).code;
 }

diff --git a/packages/babel-plugin/__tests__/stylex-transform-logical-properties-test.js b/packages/babel-plugin/__tests__/stylex-transform-logical-properties-test.js
@@ -20,7 +20,7 @@ function transform(source, opts = {}) {
     parserOpts: {
       flow: 'all',
     },
-    plugins: [[stylexPlugin, opts]],
+    plugins: [[stylexPlugin, { ...opts, runtimeInjection: true }]],
   }).code;
 }
 

diff --git a/packages/babel-plugin/__tests__/stylex-transform-logical-values-test.js b/packages/babel-plugin/__tests__/stylex-transform-logical-values-test.js
@@ -20,7 +20,7 @@ function transform(source, opts = {}) {
     parserOpts: {
       flow: 'all',
     },
-    plugins: [[stylexPlugin, opts]],
+    plugins: [[stylexPlugin, { runtimeInjection: true, ...opts }]],
   }).code;
 }
 

diff --git a/packages/babel-plugin/__tests__/stylex-transform-stylex-props-test.js b/packages/babel-plugin/__tests__/stylex-transform-stylex-props-test.js
@@ -21,7 +21,7 @@ function transform(source, opts = {}) {
     parserOpts: {
       flow: 'all',
     },
-    plugins: [jsx, [stylexPlugin, opts]],
+    plugins: [jsx, [stylexPlugin, { ...opts, runtimeInjection: true }]],
   }).code;
 }
 

diff --git a/packages/babel-plugin/__tests__/stylex-transform-value-normalize-test.js b/packages/babel-plugin/__tests__/stylex-transform-value-normalize-test.js
@@ -20,7 +20,7 @@ function transform(source, opts = {}) {
     parserOpts: {
       flow: 'all',
     },
-    plugins: [[stylexPlugin, opts]],
+    plugins: [[stylexPlugin, { runtimeInjection: true, ...opts }]],
   }).code;
 }
 

diff --git a/packages/babel-plugin/__tests__/stylex-transform-variable-removal-test.js b/packages/babel-plugin/__tests__/stylex-transform-variable-removal-test.js
@@ -17,7 +17,7 @@ const stylexPlugin = require('../src/index');
 function transform(source, opts = {}) {
   const options = {
     filename: opts.filename,
-    plugins: [[stylexPlugin, opts]],
+    plugins: [[stylexPlugin, { ...opts, runtimeInjection: true }]],
   };
   const result = transformSync(source, options);
   return result;

diff --git a/packages/babel-plugin/src/utils/state-manager.js b/packages/babel-plugin/src/utils/state-manager.js
@@ -81,7 +81,8 @@ export default class StateManager {
       ...options,
       dev: !!(options: $FlowFixMe).dev,
       test: !!(options: $FlowFixMe).test,
-      stylexSheetName: (options: $FlowFixMe).stylexSheetName ?? undefined,
+      runtimeInjection:
+        (options: $FlowFixMe).runtimeInjection ?? !!(options: $FlowFixMe).dev,
       classNamePrefix: (options: $FlowFixMe).classNamePrefix ?? 'x',
       importSources: (options: $FlowFixMe).importSources ?? [name, 'stylex'],
       definedStylexCSSVariables:
@@ -117,8 +118,8 @@ export default class StateManager {
     return this._state.file.metadata;
   }
 
-  get stylexSheetName(): string | void {
-    return this.options.stylexSheetName ?? undefined;
+  get runtimeInjection(): boolean {
+    return !!this.options.runtimeInjection;
   }
 
   get isDev(): boolean {

diff --git a/packages/babel-plugin/src/visitors/stylex-create-theme.js b/packages/babel-plugin/src/visitors/stylex-create-theme.js
@@ -107,7 +107,7 @@ export default function transformStyleXCreateTheme(
     // This should be a transformed variables object
     callExpressionPath.replaceWith(convertObjectToAST(overridesObj));
 
-    if (state.isDev || state.stylexSheetName == null) {
+    if (state.runtimeInjection) {
       // We know that the top level parent path is an variable declarator
       const statementPath: ?NodePath<> = variableDeclaratorPath.parentPath;
 

diff --git a/packages/babel-plugin/src/visitors/stylex-create/index.js b/packages/babel-plugin/src/visitors/stylex-create/index.js
@@ -194,7 +194,7 @@ export default function transformStyleXCreate(
     if (Object.keys(injectedStyles).length === 0) {
       return;
     }
-    if (state.isDev || state.stylexSheetName == null) {
+    if (state.runtimeInjection) {
       const statementPath = findNearestStatementAncestor(path);
       const stylexName = getStylexDefaultImport(path, state);
 

diff --git a/packages/babel-plugin/src/visitors/stylex-define-vars.js b/packages/babel-plugin/src/visitors/stylex-define-vars.js
@@ -99,7 +99,7 @@ export default function transformStyleXDefineVars(
     // This should be a transformed variables object
     callExpressionPath.replaceWith(convertObjectToAST(variablesObj));
 
-    if (state.isDev || state.stylexSheetName == null) {
+    if (state.runtimeInjection) {
       // We know that the top level parent path is an export named declaration
       const maybeStatementPath: ?NodePath<> =
         variableDeclaratorPath.parentPath.parentPath;

diff --git a/packages/babel-plugin/src/visitors/stylex-keyframes.js b/packages/babel-plugin/src/visitors/stylex-keyframes.js
@@ -77,7 +77,7 @@ export default function transformStyleXKeyframes(
     const { ltr, priority, rtl } = injectedStyle;
 
     if (
-      (state.isDev || state.stylexSheetName == null) &&
+      state.runtimeInjection &&
       pathUtils.isVariableDeclaration(path.parentPath)
     ) {
       // We know that the parent path is a variable declaration