From 874d32327e46df7b718a5d57b4dc2970ce0fc896 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Mon, 4 Dec 2023 19:27:10 +0530 Subject: [PATCH 1/3] fix: theme resolution build time --- .../babel-plugin-styled-resolver/src/index.js | 137 ++++++++---------- packages/react/src/createConfig.ts | 5 +- packages/react/src/styled.tsx | 17 +-- 3 files changed, 69 insertions(+), 90 deletions(-) diff --git a/packages/babel-plugin-styled-resolver/src/index.js b/packages/babel-plugin-styled-resolver/src/index.js index 4706cc68..09808017 100644 --- a/packages/babel-plugin-styled-resolver/src/index.js +++ b/packages/babel-plugin-styled-resolver/src/index.js @@ -7,6 +7,11 @@ const traverse = require('@babel/traverse').default; const types = require('@babel/types'); const { getConfig: buildAndGetConfig } = require('./buildConfig'); +let CONFIG; +const isConfigExist = fs.existsSync( + `${process.cwd()}/.gluestack/config-${process.ppid}.js` +); + const { convertStyledToStyledVerbosed, convertSxToSxVerbosed, @@ -39,6 +44,8 @@ const IMPORT_NAME = '@gluestack-style/react'; let configThemePath = []; const BUILD_TIME_GLUESTACK_STYLESHEET = new StyleInjector(); +let ConfigDefault = CONFIG; + const convertExpressionContainerToStaticObject = ( properties, result = {}, @@ -551,28 +558,13 @@ function isImportFromAbsolutePath( return false; } -let CONFIG; -const isConfigExist = fs.existsSync( - `${process.cwd()}/.gluestack/config-${process.ppid}.js` -); - -let ConfigDefault = CONFIG; - -if (!isConfigExist) { - buildAndGetConfig() - .then((res) => { - CONFIG = res; - ConfigDefault = res; - }) - .catch((err) => { - // eslint-disable-next-line no-console - console.log(err); - }); -} - -module.exports = function (b) { +module.exports = async function (b) { const { types: t } = b; + if (!isConfigExist) { + ConfigDefault = await buildAndGetConfig(); + } + function checkWebFileExists(filePath) { if (filePath.includes('node_modules')) { return false; @@ -608,22 +600,6 @@ module.exports = function (b) { return { name: 'gluestack-babel-styled-resolver', // not required - // async pre(state) { - // let plugin; - - // state.opts.plugins?.forEach((currentPlugin) => { - // if (currentPlugin.key === 'gluestack-babel-styled-resolver') { - // plugin = currentPlugin; - // } - // }); - - // const configPath = plugin?.options?.configPath; - - // if (!isConfigExist) { - // const res = await buildAndGetConfig(configPath); - // ConfigDefault = res; - // } - // }, visitor: { ImportDeclaration(importPath, state) { currentFileName = state.file.opts.filename; @@ -643,6 +619,8 @@ module.exports = function (b) { platform = 'all'; } + // console.log('\n\nCONFIG >>>>>>', ConfigDefault, '\n\nCONFIG >>>>>>'); + // `${process.cwd()}/.gluestack/config-${process.ppid}.js` // if ( @@ -899,41 +877,44 @@ module.exports = function (b) { */ const extendedThemeComponents = callExpressionPath.node.arguments[0].properties; - extendedThemeComponents.forEach((property) => { - if ( - !t.isIdentifier(property.value) && - !t.isTemplateLiteral(property.value) && - !t.isConditionalExpression(property.value) - ) { - const { themeNode, componentConfigNode } = - findThemeAndComponentConfig(property.value.properties); - - let theme = themeNode - ? getObjectFromAstNode(themeNode?.value) - : {}; - let componentConfig = componentConfigNode - ? getObjectFromAstNode(componentConfigNode?.value) - : {}; - - const resultParamsNode = getBuildTimeParams( - theme, - componentConfig, - {}, - outputLibrary, - platform, - 'extended' - ); - if (resultParamsNode) { - property.value.properties.push( - t.objectProperty( - t.stringLiteral('BUILD_TIME_PARAMS'), - resultParamsNode - ) + if (Array.isArray(extendedThemeComponents)) { + extendedThemeComponents.forEach((property) => { + if ( + !t.isIdentifier(property.value) && + !t.isTemplateLiteral(property.value) && + !t.isConditionalExpression(property.value) + ) { + const { themeNode, componentConfigNode } = + findThemeAndComponentConfig(property.value.properties); + + let theme = themeNode + ? getObjectFromAstNode(themeNode?.value) + : {}; + let componentConfig = componentConfigNode + ? getObjectFromAstNode(componentConfigNode?.value) + : {}; + + const resultParamsNode = getBuildTimeParams( + theme, + componentConfig, + {}, + outputLibrary, + platform, + 'extended' ); + + if (resultParamsNode) { + property.value.properties.push( + t.objectProperty( + t.stringLiteral('BUILD_TIME_PARAMS'), + resultParamsNode + ) + ); + } } - } - }); + }); + } } } }, @@ -970,16 +951,18 @@ module.exports = function (b) { const prefixedMediaQueries = {}; - Object.keys(componentExtendedConfig?.tokens?.mediaQueries).forEach( - (key) => { - prefixedMediaQueries[key] = { - key: `@${key}`, - isMediaQuery: true, - }; - } - ); + if (componentExtendedConfig?.tokens?.mediaQueries) { + Object.keys(componentExtendedConfig?.tokens?.mediaQueries).forEach( + (key) => { + prefixedMediaQueries[key] = { + key: `@${key}`, + isMediaQuery: true, + }; + } + ); - Object.assign(reservedKeys, { ...prefixedMediaQueries }); + Object.assign(reservedKeys, { ...prefixedMediaQueries }); + } const attr = jsxOpeningElementPath.node.attributes; attr.forEach((attribute, index) => { diff --git a/packages/react/src/createConfig.ts b/packages/react/src/createConfig.ts index bf411ad7..4c978836 100644 --- a/packages/react/src/createConfig.ts +++ b/packages/react/src/createConfig.ts @@ -132,7 +132,10 @@ export const resolveComponentTheme = (config: any, componentTheme: any) => { component?.componentConfig ); } else { - GluestackStyleSheet.update(component.BUILD_TIME_PARAMS?.orderedResolved); + const toBeInjected = GluestackStyleSheet.update( + component.BUILD_TIME_PARAMS?.orderedResolved + ); + component.BUILD_TIME_PARAMS.toBeInjected = toBeInjected; resolvedTheme = component; } diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx index 16555b2f..02d6833b 100644 --- a/packages/react/src/styled.tsx +++ b/packages/react/src/styled.tsx @@ -985,7 +985,6 @@ export function verboseStyled( // END BASE COLOR MODE RESOLUTION let CONFIG: any = {}; - let isInjected = false; let plugins: any = []; let reservedKeys = { ..._reservedKeys }; @@ -1269,18 +1268,12 @@ export function verboseStyled( const sxStyleIds: any = React.useRef(BUILD_TIME_VERBOSED_STYLE_IDS); if (BUILD_TIME_ORDERED_RESOLVED.length > 0 && !isClient.current) { - if (!isInjected) { - const toBeInjected = GluestackStyleSheet.update( - BUILD_TIME_ORDERED_RESOLVED - ); + const toBeInjected = GluestackStyleSheet.update( + BUILD_TIME_ORDERED_RESOLVED + ); - if (Platform.OS === 'web') { - GluestackStyleSheet.inject( - toBeInjected, - styledContext.inlineStyleMap - ); - } - isInjected = true; + if (Platform.OS === 'web') { + GluestackStyleSheet.inject(toBeInjected, styledContext.inlineStyleMap); } sxStyleIds.current = BUILD_TIME_VERBOSED_STYLE_IDS; From 0b51857101c7a6abf329e4a94a34123c02f3c8ee Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 6 Dec 2023 12:28:39 +0530 Subject: [PATCH 2/3] feat: sync config build for dynamic configs --- .../babel-plugin-styled-resolver/package.json | 8 +- .../src/buildConfig.js | 187 +++++++++------- .../babel-plugin-styled-resolver/src/index.js | 204 +++++++++--------- .../tsconfig.json_old | 29 --- packages/react/package.json | 2 +- 5 files changed, 211 insertions(+), 219 deletions(-) delete mode 100644 packages/babel-plugin-styled-resolver/tsconfig.json_old diff --git a/packages/babel-plugin-styled-resolver/package.json b/packages/babel-plugin-styled-resolver/package.json index 19a28b6e..ceb5265e 100644 --- a/packages/babel-plugin-styled-resolver/package.json +++ b/packages/babel-plugin-styled-resolver/package.json @@ -1,6 +1,6 @@ { "name": "@gluestack-style/babel-plugin-styled-resolver", - "version": "1.0.2", + "version": "1.0.3-alpha.0", "description": "A gluestack-style babel plugin that transpiles your styled function calls and resolves the component styling in build time.", "keywords": [ "css-in-js", @@ -29,6 +29,7 @@ "@types/react": "^18.0.22", "@types/react-native": "^0.69.15", "babel-plugin-transform-remove-console": "^6.9.4", + "esbuild": "^0.19.8", "react": "^18.1.0", "react-dom": "^18.1.0", "react-native": "^0.70.3", @@ -44,10 +45,7 @@ "@babel/plugin-transform-typescript": "^7.20.2", "@babel/preset-typescript": "^7.18.6", "@babel/traverse": "^7.20.5", - "@rollup/plugin-node-resolve": "^15.2.3", - "@rollup/plugin-typescript": "^11.1.5", - "lodash.merge": "^4.6.2", - "rollup": "^4.6.0" + "lodash.merge": "^4.6.2" }, "react-native-builder-bob": { "source": "src", diff --git a/packages/babel-plugin-styled-resolver/src/buildConfig.js b/packages/babel-plugin-styled-resolver/src/buildConfig.js index 214fa440..a04aecbe 100644 --- a/packages/babel-plugin-styled-resolver/src/buildConfig.js +++ b/packages/babel-plugin-styled-resolver/src/buildConfig.js @@ -1,40 +1,9 @@ -/* eslint-disable no-console */ -const rollupTypescriptPlugin = require('@rollup/plugin-typescript'); -const rollup = require('rollup'); -const resolve = require('@rollup/plugin-node-resolve'); const fs = require('fs'); const path = require('path'); +const esbuild = require('esbuild'); -async function buildAndRun(rollupConfig) { - try { - await cleanup(); - const bundle = await rollup.rollup(rollupConfig); - - await bundle.write(rollupConfig.output); - } catch (err) { - console.log(err); - } -} - -function cleanup() { - return new Promise((resolve, reject) => { - if (fs.existsSync(`${process.cwd()}/.gluestack`)) { - fs.rm( - `${process.cwd()}/.gluestack`, - { recursive: true, force: true }, - (err) => { - if (err) { - reject(err); - } else { - resolve(`Removed ${process.cwd()}/.gluestack`); - } - } - ); - } else { - resolve('Preparing for build...'); - } - }); -} +const OUTPUT_FILE = `./.gluestack/config-${process.ppid}.js`; +const MOCK_LIBRARY = `./mock-${process.ppid}.js`; function getConfigPath() { const isConfigJSExist = fs.existsSync( @@ -56,7 +25,7 @@ function getConfigPath() { if (isGlueStackUIConfigTSExist) return './gluestack-ui.config.ts'; } -const globals = `const react = { +const mockLibrary = `const react = { forwardRef: () => {}, createElement: () => {}, }; @@ -91,39 +60,46 @@ const gluestackStyleLegendMotionAnimationDriver = { }; const gluestackStyleMotiAnimationDriver = { }; + +module.exports = { + ...react, + ...reactNative, + ...gluestackStyleReact, + ...gluestackStyleAnimationResolver, + ...gluestackStyleLegendMotionAnimationDriver, + ...gluestackStyleMotiAnimationDriver, +} `; -const generateRollupConfig = (config = {}) => { - const rollupConfig = { - input: getConfigPath(), - output: { - file: `./.gluestack/config-${process.ppid}.js`, // The bundled JavaScript file - format: 'iife', // iife format for Node.js - globals: { - 'react': 'react', - 'react-native': 'reactNative', - '@gluestack-style/react': 'gluestackStyleReact', - '@gluestack-style/animation-resolver': - 'gluestackStyleAnimationResolver', - '@gluestack-style/legend-motion-animation-driver': - 'gluestackStyleLegendMotionAnimationDriver', - '@gluestack-style/moti-animation-driver': - 'gluestackStyleMotiAnimationDriver', - }, - name: 'config', - banner: globals, - footer: 'module.exports = config;', +const getEsBuildConfigOptions = ( + inputDir, + outputDir = OUTPUT_FILE, + mockedLibraryPath = MOCK_LIBRARY +) => { + const entryPoint = inputDir ?? getConfigPath(); + + const esbuildConfigOptions = { + entryPoints: [entryPoint], + bundle: true, + outfile: outputDir, + format: 'iife', + globalName: 'config', + // banner: { + // js: globals, + // }, + alias: { + 'react-native': mockedLibraryPath, + '@gluestack-style/react': mockedLibraryPath, + '@gluestack-style/animation-resolver': mockedLibraryPath, + '@gluestack-style/legend-motion-animation-driver': mockedLibraryPath, + '@gluestack-style/moti-animation-driver': mockedLibraryPath, }, - plugins: [ - resolve({ - extensions: ['.js', '.ts', '.tsx', '.jsx', '.json'], // Add your custom file extensions here - }), - rollupTypescriptPlugin({ - compilerOptions: { lib: ['es5', 'es6', 'dom'], target: 'es5' }, - tsconfig: false, - // typescript: require('some-fork-of-typescript'), - }), - ], + target: 'node18', + footer: { + js: 'module.exports = config;', + }, + resolveExtensions: ['.js', '.ts', '.tsx', '.jsx', '.json'], + platform: 'node', external: [ 'react', 'react-native', @@ -131,23 +107,82 @@ const generateRollupConfig = (config = {}) => { '@gluestack-style/animation-resolver', '@gluestack-style/legend-motion-animation-driver', '@gluestack-style/moti-animation-driver', + mockedLibraryPath, ], - ...config, }; - return rollupConfig; + return esbuildConfigOptions; }; -const getConfig = async (configPath) => { - const rollupConfig = generateRollupConfig(); +function cleanup() { + if (fs.existsSync(`${process.cwd()}/.gluestack`)) { + fs.rmSync( + `${process.cwd()}/.gluestack`, + { recursive: true, force: true }, + (err) => { + if (err) { + console.error(err); + } else { + // eslint-disable-next-line no-console + console.log(`Removed ${process.cwd()}/.gluestack`); + // eslint-disable-next-line no-console + console.log('Preparing for build...'); + } + } + ); + } +} + +function buildConfig(inputDir, outputDir, mockLibraryPath) { try { - await buildAndRun(rollupConfig); - console.log('Config built successfully!'); - const { config } = require(`${process.cwd()}/.gluestack/config-${ - process.ppid - }.js`); - return config; + const esbuildConfigOptions = getEsBuildConfigOptions( + inputDir, + outputDir, + mockLibraryPath + ); + esbuild.buildSync(esbuildConfigOptions); + } catch (err) { + console.error(err); + } +} + +function buildMockLibrary(mockedLibraryPath) { + const gluestackFolderPath = path.join(process.cwd(), './.gluestack'); + const mockLibraryFullPath = path.resolve( + gluestackFolderPath, + mockedLibraryPath + ); + if (!fs.existsSync(gluestackFolderPath)) { + fs.mkdirSync(gluestackFolderPath); + } + + fs.writeFileSync(mockLibraryFullPath, mockLibrary); +} + +function cleanupAndBuildConfig(inputDir, outputDir, mockedLibraryPath) { + try { + cleanup(); + buildMockLibrary(mockedLibraryPath); + buildConfig(inputDir, outputDir, mockedLibraryPath); + } catch (err) { + console.error(err); + } +} + +const getConfig = ( + inputDir, + outputDir = OUTPUT_FILE, + mockLibraryPath = MOCK_LIBRARY +) => { + try { + if (inputDir) { + cleanupAndBuildConfig(inputDir, outputDir, mockLibraryPath); + const configFile = require(`${process.cwd()}/${outputDir}`); + return configFile; + } else { + return {}; + } } catch (err) { - console.log('Error: ', rollupConfig, err); + console.error(err); } }; diff --git a/packages/babel-plugin-styled-resolver/src/index.js b/packages/babel-plugin-styled-resolver/src/index.js index 09808017..49f330e9 100644 --- a/packages/babel-plugin-styled-resolver/src/index.js +++ b/packages/babel-plugin-styled-resolver/src/index.js @@ -7,11 +7,26 @@ const traverse = require('@babel/traverse').default; const types = require('@babel/types'); const { getConfig: buildAndGetConfig } = require('./buildConfig'); -let CONFIG; +let ConfigDefault = {}; + +let configFile; const isConfigExist = fs.existsSync( `${process.cwd()}/.gluestack/config-${process.ppid}.js` ); +if (!isConfigExist) { + const outputDir = `.gluestack/config-${process.ppid}.js`; + const inputDir = getConfigPath(); + + if (inputDir) { + configFile = buildAndGetConfig(inputDir, outputDir); + ConfigDefault = configFile?.config; + } +} else { + configFile = require(`${process.cwd()}/.gluestack/config-${process.ppid}.js`); + ConfigDefault = configFile?.config; +} + const { convertStyledToStyledVerbosed, convertSxToSxVerbosed, @@ -40,11 +55,28 @@ const { checkAndReturnUtilityProp, } = require('@gluestack-style/react/lib/commonjs/core/convert-utility-to-sx'); -const IMPORT_NAME = '@gluestack-style/react'; let configThemePath = []; const BUILD_TIME_GLUESTACK_STYLESHEET = new StyleInjector(); -let ConfigDefault = CONFIG; +function getConfigPath() { + const isConfigJSExist = fs.existsSync( + path.join(process.cwd(), './gluestack-style.config.js') + ); + const isGlueStackUIConfigJSExist = fs.existsSync( + path.join(process.cwd(), './gluestack-ui.config.js') + ); + const isConfigTSExist = fs.existsSync( + path.join(process.cwd(), './gluestack-style.config.ts') + ); + const isGlueStackUIConfigTSExist = fs.existsSync( + path.join(process.cwd(), './gluestack-ui.config.ts') + ); + + if (isConfigJSExist) return './gluestack-style.config.js'; + if (isConfigTSExist) return './gluestack-style.config.ts'; + if (isGlueStackUIConfigJSExist) return './gluestack-ui.config.js'; + if (isGlueStackUIConfigTSExist) return './gluestack-ui.config.ts'; +} const convertExpressionContainerToStaticObject = ( properties, @@ -239,14 +271,12 @@ function getConfig(configPath) { ); } if (isGlueStackUIConfigJSExist) { - configThemePath = ['theme']; return fs.readFileSync( path.join(process.cwd(), './gluestack-ui.config.js'), 'utf8' ); } if (isGlueStackUIConfigTSExist) { - configThemePath = ['theme']; return fs.readFileSync( path.join(process.cwd(), './gluestack-ui.config.ts'), 'utf8' @@ -344,58 +374,6 @@ function getBuildTimeParams( return null; } -function getExportedConfigFromFileString(fileData) { - if (!fileData) { - return {}; - } - - fileData = fileData?.replace(/as const/g, ''); - - const ast = babel.parse(fileData, { - presets: [babelPresetTypeScript], - plugins: ['typescript'], - sourceType: 'module', - comments: false, - }); - - let config = {}; - - traverse(ast, { - CallExpression: (path) => { - const { callee, arguments: args } = path.node; - if ( - types.isIdentifier(callee, { name: 'createConfig' }) && - args.length === 1 && - types.isObjectExpression(args[0]) - ) { - path.replaceWith(args[0]); - } - }, - }); - - traverse(ast, { - ExportNamedDeclaration: (path) => { - path.traverse({ - VariableDeclarator: (variableDeclaratorPath) => { - config = variableDeclaratorPath.node.init; - }, - }); - }, - - Identifier: (path) => { - if (path.node.name === 'undefined') { - //path.remove(); - path.node.name = 'null'; - } - }, - }); - - let objectCode = generate(config).code; - objectCode = objectCode?.replace(/\/\/.*|\/\*[\s\S]*?\*\//g, ''); - objectCode = addQuotesToObjectKeys(objectCode)?.replace(/'/g, '"'); - - return JSON.parse(objectCode); -} function replaceSingleQuotes(str) { let inDoubleQuotes = false; let newStr = ''; @@ -558,13 +536,9 @@ function isImportFromAbsolutePath( return false; } -module.exports = async function (b) { +module.exports = function (b) { const { types: t } = b; - if (!isConfigExist) { - ConfigDefault = await buildAndGetConfig(); - } - function checkWebFileExists(filePath) { if (filePath.includes('node_modules')) { return false; @@ -580,13 +554,11 @@ module.exports = async function (b) { let styledAlias = ''; let styledAliasImportedName = ''; let tempPropertyResolverNode; - let isValidConfig = true; let platform = 'all'; let currentFileName = 'file not found!'; let configPath; let outputLibrary; let componentSXProp; - let componentUtilityProps; const guessingStyledComponents = []; const styled = ['@gluestack-style/react', '@gluestack-ui/themed']; const components = ['@gluestack-ui/themed']; @@ -600,46 +572,69 @@ module.exports = async function (b) { return { name: 'gluestack-babel-styled-resolver', // not required + pre(state) { + let plugin; + + state?.opts?.plugins?.forEach((currentPlugin) => { + if (currentPlugin.key === 'gluestack-babel-styled-resolver') { + plugin = currentPlugin; + } + }); + + if (plugin?.options?.configPath) { + configPath = plugin?.options?.configPath; + } + + if (plugin?.options?.configThemePath) { + configThemePath = plugin?.options?.configThemePath; + } + + const outputDir = `.gluestack/config-${process.ppid + 1}.js`; + const mockLibraryPath = `./mock-${process.ppid + 1}.js`; + + if (configPath) { + if (!fs.existsSync(path.join(process.cwd(), outputDir))) { + configFile = buildAndGetConfig( + configPath, + outputDir, + mockLibraryPath + ); + + if (configThemePath.length > 0) { + configThemePath.forEach((path) => { + configFile = configFile?.[path]; + }); + configThemePath = []; + ConfigDefault = configFile; + } else { + ConfigDefault = configFile?.config; + } + } else { + configFile = require(path.join(process.cwd(), outputDir)); + if (configThemePath.length > 0) { + configThemePath.forEach((path) => { + configFile = configFile?.[path]; + }); + configThemePath = []; + ConfigDefault = configFile; + } else { + ConfigDefault = configFile?.config; + } + } + } + }, visitor: { ImportDeclaration(importPath, state) { currentFileName = state.file.opts.filename; styledAlias = state?.opts?.styledAlias; outputLibrary = state?.opts?.outputLibrary || outputLibrary; - if (state?.opts?.configPath) { - configPath = state?.opts?.configPath; - } - - if (state?.opts?.configThemePath) { - configThemePath = state?.opts?.configThemePath; - } if (state?.opts?.platform) { platform = state?.opts?.platform; } else { platform = 'all'; } - // console.log('\n\nCONFIG >>>>>>', ConfigDefault, '\n\nCONFIG >>>>>>'); - - // `${process.cwd()}/.gluestack/config-${process.ppid}.js` - - // if ( - // configPath && - // !fs.existsSync(path.join(process.cwd(), `.gluestack/config-${process.ppid}.js`)) - // ) { - // // ConfigDefault = getExportedConfigFromFileString( - // // getConfig(configPath) - // // ); - // ConfigDefault = buildAndGetConfig(configPath); - // } - - // configThemePath.forEach((path) => { - // ConfigDefault = ConfigDefault?.[path]; - // }); - // configThemePath = []; - - // console.log(ConfigDefault, '>>>>>>>>>>>>>>>'); - if (!currentFileName.includes('node_modules')) { if (currentFileName.includes('.web.')) { platform = 'web'; @@ -714,7 +709,6 @@ module.exports = async function (b) { styledAliasImportedName || expressionPath?.node?.right?.callee?.name === styledImportName ) { - // console.log(expressionPath.node, '>>>>>'); let componentName = expressionPath?.parent?.id?.name; if (componentName) { @@ -722,8 +716,8 @@ module.exports = async function (b) { } } }, - CallExpression(callExpressionPath) { - if (isValidConfig) { + CallExpression(callExpressionPath, state) { + if (!state.file.opts.filename?.includes('node_modules')) { const calleeName = callExpressionPath.node.callee.name; if ( calleeName === styledAliasImportedName || @@ -926,10 +920,10 @@ module.exports = async function (b) { jsxOpeningElementPath.node.name.name ) ) { - let propsToBePersist = []; + const propsToBePersist = []; let sxPropsWithIdentifier = {}; - let mergedPropertyConfig = { + const mergedPropertyConfig = { ...ConfigDefault?.propertyTokenMap, ...propertyTokenMap, }; @@ -1127,7 +1121,7 @@ module.exports = async function (b) { platform ); - const toBeInjected = BUILD_TIME_GLUESTACK_STYLESHEET.resolve( + BUILD_TIME_GLUESTACK_STYLESHEET.resolve( styledIds, componentExtendedConfig, {}, @@ -1146,13 +1140,12 @@ module.exports = async function (b) { } }); - let styleIdsAst = generateObjectAst(verbosedStyleIds); - - let toBeInjectedAst = generateObjectAst(toBeInjected); + const styleIdsAst = generateObjectAst(verbosedStyleIds); - let orderResolvedArrayExpression = []; + const orderResolvedArrayExpression = []; orderedResolvedTheme.forEach((styledResolved) => { + delete styledResolved.toBeInjected; if (targetPlatform === 'native') { delete styledResolved.original; delete styledResolved.value; @@ -1164,14 +1157,10 @@ module.exports = async function (b) { delete styledResolved.extendedConfig; delete styledResolved.value; } - let orderedResolvedAst = generateObjectAst(styledResolved); + const orderedResolvedAst = generateObjectAst(styledResolved); orderResolvedArrayExpression.push(orderedResolvedAst); }); - let orderedStyleIdsArrayAst = t.arrayExpression( - styledIds?.map((cssId) => t.stringLiteral(cssId)) - ); - jsxOpeningElementPath.node.attributes.push( t.jsxAttribute( t.jsxIdentifier('verbosedStyleIds'), @@ -1202,7 +1191,6 @@ module.exports = async function (b) { } componentSXProp = undefined; - componentUtilityProps = undefined; } }, }, diff --git a/packages/babel-plugin-styled-resolver/tsconfig.json_old b/packages/babel-plugin-styled-resolver/tsconfig.json_old deleted file mode 100644 index 699c0bc7..00000000 --- a/packages/babel-plugin-styled-resolver/tsconfig.json_old +++ /dev/null @@ -1,29 +0,0 @@ -{ - "include": ["./src"], - "exclude": ["node_modules", "example"], - "compilerOptions": { - "emitDeclarationOnly": true, - "noEmit": false, - "baseUrl": ".", - "declaration": true, - "allowUnreachableCode": false, - "allowUnusedLabels": true, - "esModuleInterop": true, - "importsNotUsedAsValues": "error", - "forceConsistentCasingInFileNames": true, - "jsx": "react", - "lib": ["esnext", "dom"], - "module": "esnext", - "moduleResolution": "node", - "noFallthroughCasesInSwitch": true, - "noImplicitReturns": true, - "noImplicitUseStrict": false, - "noStrictGenericChecks": false, - "noUnusedLocals": false, - "noUnusedParameters": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "strict": true, - "target": "esnext" - } -} diff --git a/packages/react/package.json b/packages/react/package.json index a5afe34e..842dbb15 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { "name": "@gluestack-style/react", "description": "A universal & performant styling library for React Native, Next.js & React", - "version": "1.0.20", + "version": "1.0.22-alpha.1", "keywords": [ "React Native", "Next.js", From e6323a0513b0433557c7cc43fe432615641c8f37 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 6 Dec 2023 12:31:14 +0530 Subject: [PATCH 3/3] fix: yarn lock --- yarn.lock | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 290 insertions(+) diff --git a/yarn.lock b/yarn.lock index feeaaff5..c8eb1154 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,6 +58,14 @@ "@babel/highlight" "^7.22.10" chalk "^2.4.2" +"@babel/code-frame@^7.22.13", "@babel/code-frame@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" + integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== + dependencies: + "@babel/highlight" "^7.23.4" + chalk "^2.4.2" + "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9": version "7.22.9" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730" @@ -128,6 +136,27 @@ json5 "^2.2.3" semver "^6.3.1" +"@babel/core@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.5.tgz#6e23f2acbcb77ad283c5ed141f824fd9f70101c7" + integrity sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.5" + "@babel/helper-compilation-targets" "^7.22.15" + "@babel/helper-module-transforms" "^7.23.3" + "@babel/helpers" "^7.23.5" + "@babel/parser" "^7.23.5" + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.23.5" + "@babel/types" "^7.23.5" + convert-source-map "^2.0.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + "@babel/eslint-parser@^7.18.2": version "7.22.11" resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.11.tgz#cceb8c7989c241a16dd14e12a6cd725618f3f58b" @@ -147,6 +176,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.5.tgz#17d0a1ea6b62f351d281350a5f80b87a810c4755" + integrity sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA== + dependencies: + "@babel/types" "^7.23.5" + "@jridgewell/gen-mapping" "^0.3.2" + "@jridgewell/trace-mapping" "^0.3.17" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882" @@ -172,6 +211,17 @@ lru-cache "^5.1.1" semver "^6.3.1" +"@babel/helper-compilation-targets@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52" + integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw== + dependencies: + "@babel/compat-data" "^7.22.9" + "@babel/helper-validator-option" "^7.22.15" + browserslist "^4.21.9" + lru-cache "^5.1.1" + semver "^6.3.1" + "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.10", "@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.5": version "7.22.11" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz#4078686740459eeb4af3494a273ac09148dfb213" @@ -254,6 +304,14 @@ "@babel/template" "^7.22.5" "@babel/types" "^7.22.5" +"@babel/helper-function-name@^7.23.0": + version "7.23.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" + integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== + dependencies: + "@babel/template" "^7.22.15" + "@babel/types" "^7.23.0" + "@babel/helper-hoist-variables@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" @@ -311,6 +369,17 @@ "@babel/helper-split-export-declaration" "^7.22.6" "@babel/helper-validator-identifier" "^7.22.20" +"@babel/helper-module-transforms@^7.23.3": + version "7.23.3" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" + integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== + dependencies: + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-module-imports" "^7.22.15" + "@babel/helper-simple-access" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/helper-validator-identifier" "^7.22.20" + "@babel/helper-optimise-call-expression@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e" @@ -372,6 +441,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== +"@babel/helper-string-parser@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" + integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== + "@babel/helper-validator-identifier@^7.22.19", "@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" @@ -410,6 +484,15 @@ "@babel/traverse" "^7.22.11" "@babel/types" "^7.22.11" +"@babel/helpers@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.5.tgz#52f522840df8f1a848d06ea6a79b79eefa72401e" + integrity sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg== + dependencies: + "@babel/template" "^7.22.15" + "@babel/traverse" "^7.23.5" + "@babel/types" "^7.23.5" + "@babel/highlight@^7.10.4", "@babel/highlight@^7.22.10": version "7.22.10" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.10.tgz#02a3f6d8c1cb4521b2fd0ab0da8f4739936137d7" @@ -419,11 +502,25 @@ chalk "^2.4.2" js-tokens "^4.0.0" +"@babel/highlight@^7.23.4": + version "7.23.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" + integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@babel/parser@^7.1.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.13.16", "@babel/parser@^7.14.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.13", "@babel/parser@^7.20.5", "@babel/parser@^7.20.7", "@babel/parser@^7.22.11", "@babel/parser@^7.22.5", "@babel/parser@^7.9.0": version "7.22.11" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.11.tgz#becf8ee33aad2a35ed5607f521fe6e72a615f905" integrity sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g== +"@babel/parser@^7.22.15", "@babel/parser@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.5.tgz#37dee97c4752af148e1d38c34b856b2507660563" + integrity sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ== + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e" @@ -1405,6 +1502,15 @@ "@babel/parser" "^7.22.5" "@babel/types" "^7.22.5" +"@babel/template@^7.22.15": + version "7.22.15" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38" + integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w== + dependencies: + "@babel/code-frame" "^7.22.13" + "@babel/parser" "^7.22.15" + "@babel/types" "^7.22.15" + "@babel/traverse@^7.1.6", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.0", "@babel/traverse@^7.20.13", "@babel/traverse@^7.20.5", "@babel/traverse@^7.22.11", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.4", "@babel/traverse@^7.9.0": version "7.22.11" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.11.tgz#71ebb3af7a05ff97280b83f05f8865ac94b2027c" @@ -1421,6 +1527,22 @@ debug "^4.1.0" globals "^11.1.0" +"@babel/traverse@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.5.tgz#f546bf9aba9ef2b042c0e00d245990c15508e7ec" + integrity sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w== + dependencies: + "@babel/code-frame" "^7.23.5" + "@babel/generator" "^7.23.5" + "@babel/helper-environment-visitor" "^7.22.20" + "@babel/helper-function-name" "^7.23.0" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.6" + "@babel/parser" "^7.23.5" + "@babel/types" "^7.23.5" + debug "^4.1.0" + globals "^11.1.0" + "@babel/types@7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c" @@ -1448,6 +1570,15 @@ "@babel/helper-validator-identifier" "^7.22.19" to-fast-properties "^2.0.0" +"@babel/types@^7.23.0", "@babel/types@^7.23.5": + version "7.23.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.5.tgz#48d730a00c95109fa4393352705954d74fb5b602" + integrity sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w== + dependencies: + "@babel/helper-string-parser" "^7.23.4" + "@babel/helper-validator-identifier" "^7.22.20" + to-fast-properties "^2.0.0" + "@base2/pretty-print-object@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz#371ba8be66d556812dc7fb169ebc3c08378f69d4" @@ -2056,6 +2187,116 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.1.tgz#d0fce5d07b0620caa282b5131c297bb60f9d87e6" integrity sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww== +"@esbuild/android-arm64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.8.tgz#fb7130103835b6d43ea499c3f30cfb2b2ed58456" + integrity sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA== + +"@esbuild/android-arm@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.8.tgz#b46e4d9e984e6d6db6c4224d72c86b7757e35bcb" + integrity sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA== + +"@esbuild/android-x64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.8.tgz#a13db9441b5a4f4e4fec4a6f8ffacfea07888db7" + integrity sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A== + +"@esbuild/darwin-arm64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.8.tgz#49f5718d36541f40dd62bfdf84da9c65168a0fc2" + integrity sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw== + +"@esbuild/darwin-x64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.8.tgz#75c5c88371eea4bfc1f9ecfd0e75104c74a481ac" + integrity sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q== + +"@esbuild/freebsd-arm64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.8.tgz#9d7259fea4fd2b5f7437b52b542816e89d7c8575" + integrity sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw== + +"@esbuild/freebsd-x64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.8.tgz#abac03e1c4c7c75ee8add6d76ec592f46dbb39e3" + integrity sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg== + +"@esbuild/linux-arm64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.8.tgz#c577932cf4feeaa43cb9cec27b89cbe0df7d9098" + integrity sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ== + +"@esbuild/linux-arm@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.8.tgz#d6014d8b98b5cbc96b95dad3d14d75bb364fdc0f" + integrity sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ== + +"@esbuild/linux-ia32@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.8.tgz#2379a0554307d19ac4a6cdc15b08f0ea28e7a40d" + integrity sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ== + +"@esbuild/linux-loong64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.8.tgz#e2a5bbffe15748b49356a6cd7b2d5bf60c5a7123" + integrity sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ== + +"@esbuild/linux-mips64el@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.8.tgz#1359331e6f6214f26f4b08db9b9df661c57cfa24" + integrity sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q== + +"@esbuild/linux-ppc64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.8.tgz#9ba436addc1646dc89dae48c62d3e951ffe70951" + integrity sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg== + +"@esbuild/linux-riscv64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.8.tgz#fbcf0c3a0b20f40b5fc31c3b7695f0769f9de66b" + integrity sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg== + +"@esbuild/linux-s390x@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.8.tgz#989e8a05f7792d139d5564ffa7ff898ac6f20a4a" + integrity sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg== + +"@esbuild/linux-x64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz#b187295393a59323397fe5ff51e769ec4e72212b" + integrity sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg== + +"@esbuild/netbsd-x64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.8.tgz#c1ec0e24ea82313cb1c7bae176bd5acd5bde7137" + integrity sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw== + +"@esbuild/openbsd-x64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.8.tgz#0c5b696ac66c6d70cf9ee17073a581a28af9e18d" + integrity sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ== + +"@esbuild/sunos-x64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.8.tgz#2a697e1f77926ff09fcc457d8f29916d6cd48fb1" + integrity sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w== + +"@esbuild/win32-arm64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.8.tgz#ec029e62a2fca8c071842ecb1bc5c2dd20b066f1" + integrity sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg== + +"@esbuild/win32-ia32@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.8.tgz#cbb9a3146bde64dc15543e48afe418c7a3214851" + integrity sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw== + +"@esbuild/win32-x64@0.19.8": + version "0.19.8" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.8.tgz#c8285183dbdb17008578dbacb6e22748709b4822" + integrity sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA== + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -2593,6 +2834,19 @@ dependencies: "@legendapp/motion" "^2.2.0" +"@gluestack-style/babel-plugin-styled-resolver@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@gluestack-style/babel-plugin-styled-resolver/-/babel-plugin-styled-resolver-1.0.1.tgz#d2faea8873bd02c3a5d2a425934f5d970cc815f1" + integrity sha512-UQNFCgVZZgJdbJrCPvNpHOtxA3iePo1Xall3eUfOZSSYtlsECiqVdCAFqyRJu+X2oYSPNH2+rt+w7Gjzw5y3kw== + dependencies: + "@babel/core" "^7.20.5" + "@babel/generator" "^7.20.5" + "@babel/parser" "^7.20.5" + "@babel/plugin-transform-typescript" "^7.20.2" + "@babel/preset-typescript" "^7.18.6" + "@babel/traverse" "^7.20.5" + lodash.merge "^4.6.2" + "@gluestack-style/babel-plugin-styled-resolver@^0.1.15-alpha.0": version "0.1.15-alpha.0" resolved "https://registry.yarnpkg.com/@gluestack-style/babel-plugin-styled-resolver/-/babel-plugin-styled-resolver-0.1.15-alpha.0.tgz#776e0ba60cbdaeefcd966b6708dd0408d4a57213" @@ -2622,6 +2876,14 @@ inline-style-prefixer "^6.0.1" normalize-css-color "^1.0.2" +"@gluestack-style/react@^1.0.1", "@gluestack-style/react@^1.0.7": + version "1.0.22" + resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-1.0.22.tgz#466cabaac6ee0d37de476cf4be0e05c33a73eb2b" + integrity sha512-TfLXpkZ997zyQKTFwD7HEUhazn7slaD+X4IBbXJBrxGoYuYDAi/rXXmTrLeaVIKR7hCndSOfgAYyqbR7SR88+g== + dependencies: + inline-style-prefixer "^6.0.1" + normalize-css-color "^1.0.2" + "@gluestack-ui/actionsheet@^0.2.16", "@gluestack-ui/actionsheet@^0.2.7", "@gluestack-ui/actionsheet@latest": version "0.2.16" resolved "https://registry.yarnpkg.com/@gluestack-ui/actionsheet/-/actionsheet-0.2.16.tgz#052a733966c517450a3cd6f832932ccf77924867" @@ -10746,6 +11008,34 @@ es6-shim@^0.35.5: resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.8.tgz#89216f6fbf8bacba3f897c8c0e814d2a41c05fb7" integrity sha512-Twf7I2v4/1tLoIXMT8HlqaBSS5H2wQTs2wx3MNYCI8K1R1/clXyCazrcVCPm/FuO9cyV8+leEaZOWD5C253NDg== +esbuild@^0.19.8: + version "0.19.8" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.8.tgz#ad05b72281d84483fa6b5345bd246c27a207b8f1" + integrity sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w== + optionalDependencies: + "@esbuild/android-arm" "0.19.8" + "@esbuild/android-arm64" "0.19.8" + "@esbuild/android-x64" "0.19.8" + "@esbuild/darwin-arm64" "0.19.8" + "@esbuild/darwin-x64" "0.19.8" + "@esbuild/freebsd-arm64" "0.19.8" + "@esbuild/freebsd-x64" "0.19.8" + "@esbuild/linux-arm" "0.19.8" + "@esbuild/linux-arm64" "0.19.8" + "@esbuild/linux-ia32" "0.19.8" + "@esbuild/linux-loong64" "0.19.8" + "@esbuild/linux-mips64el" "0.19.8" + "@esbuild/linux-ppc64" "0.19.8" + "@esbuild/linux-riscv64" "0.19.8" + "@esbuild/linux-s390x" "0.19.8" + "@esbuild/linux-x64" "0.19.8" + "@esbuild/netbsd-x64" "0.19.8" + "@esbuild/openbsd-x64" "0.19.8" + "@esbuild/sunos-x64" "0.19.8" + "@esbuild/win32-arm64" "0.19.8" + "@esbuild/win32-ia32" "0.19.8" + "@esbuild/win32-x64" "0.19.8" + escalade@^3.0.2, escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"