@webiny/project-aws 6.0.0-rc.4 → 6.0.0-rc.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_templates/appTemplates/admin/tsconfig.json +4 -1
- package/_templates/appTemplates/api/graphql/tsconfig.json +4 -1
- package/_templates/appTemplates/api/migration/tsconfig.json +4 -1
- package/_templates/extensions/ApiLambdaFunction/tsconfig.json +4 -1
- package/_templates/extensions/OpenSearch/coreDdbToEsHandler/dynamoToElastic/tsconfig.json +4 -1
- package/extensions/ProjectAws.js +2 -3
- package/extensions/ProjectAws.js.map +1 -1
- package/package.json +12 -11
- package/pulumi/utils/lambdaEnvVariables.js +3 -2
- package/pulumi/utils/lambdaEnvVariables.js.map +1 -1
package/extensions/ProjectAws.js
CHANGED
|
@@ -3,8 +3,7 @@ import { AdminAfterDeploy, AdminBeforeBuild, AdminBeforeWatch, AfterDeploy, ApiA
|
|
|
3
3
|
import { createPathResolver } from "@webiny/project";
|
|
4
4
|
import { CliCommand } from "@webiny/cli-core/extensions/index.js";
|
|
5
5
|
import { CorePulumi } from "@webiny/project/extensions/index.js";
|
|
6
|
-
|
|
7
|
-
|
|
6
|
+
import { McpExtension } from "@webiny/mcp";
|
|
8
7
|
const p = createPathResolver(import.meta.dirname);
|
|
9
8
|
export const ProjectAws = () => {
|
|
10
9
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Project, null), /*#__PURE__*/React.createElement(ProjectDecorator, {
|
|
@@ -46,7 +45,7 @@ export const ProjectAws = () => {
|
|
|
46
45
|
src: p("ProjectAws/BlueGreenDeployments/EnsureVariantBeforeDeploy.js")
|
|
47
46
|
}), /*#__PURE__*/React.createElement(AfterDeploy, {
|
|
48
47
|
src: p("ProjectAws/BlueGreenDeployments/PrintDeploymentInfoAfterDeploy.js")
|
|
49
|
-
}));
|
|
48
|
+
}), /*#__PURE__*/React.createElement(McpExtension, null));
|
|
50
49
|
};
|
|
51
50
|
|
|
52
51
|
//# sourceMappingURL=ProjectAws.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","AdminAfterDeploy","AdminBeforeBuild","AdminBeforeWatch","AfterDeploy","ApiAfterDeploy","BeforeDeploy","DatabaseSetup","ExtensionDefinitions","Project","ProjectDecorator","ProjectImplementation","createPathResolver","CliCommand","CorePulumi","p","import","meta","dirname","ProjectAws","createElement","Fragment","src","setupName","singleton"],"sources":["ProjectAws.tsx"],"sourcesContent":["import React from \"react\";\nimport {\n AdminAfterDeploy,\n AdminBeforeBuild,\n AdminBeforeWatch,\n AfterDeploy,\n ApiAfterDeploy,\n BeforeDeploy,\n DatabaseSetup,\n ExtensionDefinitions,\n Project,\n ProjectDecorator,\n ProjectImplementation\n} from \"@webiny/project/extensions/index.js\";\nimport { createPathResolver } from \"@webiny/project\";\nimport { CliCommand } from \"@webiny/cli-core/extensions/index.js\";\nimport { CorePulumi } from \"@webiny/project/extensions/index.js\";\
|
|
1
|
+
{"version":3,"names":["React","AdminAfterDeploy","AdminBeforeBuild","AdminBeforeWatch","AfterDeploy","ApiAfterDeploy","BeforeDeploy","DatabaseSetup","ExtensionDefinitions","Project","ProjectDecorator","ProjectImplementation","createPathResolver","CliCommand","CorePulumi","McpExtension","p","import","meta","dirname","ProjectAws","createElement","Fragment","src","setupName","singleton"],"sources":["ProjectAws.tsx"],"sourcesContent":["import React from \"react\";\nimport {\n AdminAfterDeploy,\n AdminBeforeBuild,\n AdminBeforeWatch,\n AfterDeploy,\n ApiAfterDeploy,\n BeforeDeploy,\n DatabaseSetup,\n ExtensionDefinitions,\n Project,\n ProjectDecorator,\n ProjectImplementation\n} from \"@webiny/project/extensions/index.js\";\nimport { createPathResolver } from \"@webiny/project\";\nimport { CliCommand } from \"@webiny/cli-core/extensions/index.js\";\nimport { CorePulumi } from \"@webiny/project/extensions/index.js\";\nimport { McpExtension } from \"@webiny/mcp\";\n\nconst p = createPathResolver(import.meta.dirname);\n\nexport const ProjectAws = () => {\n return (\n <>\n <Project />\n <ProjectDecorator src={p(\"ProjectAws/BuildAppWorkspace.js\")} />\n\n {/* Database Setup - default to DynamoDB only */}\n <DatabaseSetup setupName=\"ddb\" />\n\n {/* Set database setup output value in Core stack */}\n <CorePulumi src={p(\"ProjectAws/SetDatabaseSetupOutput.js\")} />\n\n {/* Stack Output Services */}\n <ProjectImplementation src={p(\"ProjectAws/CoreStackOutputService.js\")} singleton />\n <ProjectImplementation src={p(\"ProjectAws/ApiStackOutputService.js\")} singleton />\n <ProjectImplementation src={p(\"ProjectAws/AdminStackOutputService.js\")} singleton />\n\n <ProjectImplementation src={p(\"../features/InvokeLambdaFunction.js\")} singleton />\n <ProjectImplementation src={p(\"../features/ApiGqlClient.js\")} singleton />\n\n <AdminAfterDeploy src={p(\"ProjectAws/UploadAdminAppToS3.js\")} />\n\n {/* We'll bring this back once needed. */}\n {/* <ApiAfterDeploy src={p(\"ProjectAws/ExecuteDataMigrations.js\")} /> */}\n\n <ApiAfterDeploy src={p(\"ProjectAws/AutoInstall/AutoInstallAfterApiDeploy.js\")} />\n <ExtensionDefinitions src={p(\"definitions.js\")} />\n <ExtensionDefinitions src={p(\"ProjectAws/definitions.js\")} />\n\n {/* Admin env vars */}\n <AdminBeforeBuild src={p(\"ProjectAws/SetAdminEnvVars/SetAdminEnvVarsBeforeBuild.js\")} />\n <AdminBeforeWatch src={p(\"ProjectAws/SetAdminEnvVars/SetAdminEnvVarsBeforeWatch.js\")} />\n\n {/* Blue-green */}\n <CliCommand src={p(\"ProjectAws/BlueGreenDeployments/SetPrimaryVariantCliCommand.js\")} />\n <BeforeDeploy src={p(\"ProjectAws/BlueGreenDeployments/EnsureVariantBeforeDeploy.js\")} />\n <AfterDeploy\n src={p(\"ProjectAws/BlueGreenDeployments/PrintDeploymentInfoAfterDeploy.js\")}\n />\n\n {/* MCP */}\n <McpExtension />\n </>\n );\n};\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SACIC,gBAAgB,EAChBC,gBAAgB,EAChBC,gBAAgB,EAChBC,WAAW,EACXC,cAAc,EACdC,YAAY,EACZC,aAAa,EACbC,oBAAoB,EACpBC,OAAO,EACPC,gBAAgB,EAChBC,qBAAqB,QAClB,qCAAqC;AAC5C,SAASC,kBAAkB,QAAQ,iBAAiB;AACpD,SAASC,UAAU,QAAQ,sCAAsC;AACjE,SAASC,UAAU,QAAQ,qCAAqC;AAChE,SAASC,YAAY,QAAQ,aAAa;AAE1C,MAAMC,CAAC,GAAGJ,kBAAkB,CAACK,MAAM,CAACC,IAAI,CAACC,OAAO,CAAC;AAEjD,OAAO,MAAMC,UAAU,GAAGA,CAAA,KAAM;EAC5B,oBACIpB,KAAA,CAAAqB,aAAA,CAAArB,KAAA,CAAAsB,QAAA,qBACItB,KAAA,CAAAqB,aAAA,CAACZ,OAAO,MAAE,CAAC,eACXT,KAAA,CAAAqB,aAAA,CAACX,gBAAgB;IAACa,GAAG,EAAEP,CAAC,CAAC,iCAAiC;EAAE,CAAE,CAAC,eAG/DhB,KAAA,CAAAqB,aAAA,CAACd,aAAa;IAACiB,SAAS,EAAC;EAAK,CAAE,CAAC,eAGjCxB,KAAA,CAAAqB,aAAA,CAACP,UAAU;IAACS,GAAG,EAAEP,CAAC,CAAC,sCAAsC;EAAE,CAAE,CAAC,eAG9DhB,KAAA,CAAAqB,aAAA,CAACV,qBAAqB;IAACY,GAAG,EAAEP,CAAC,CAAC,sCAAsC,CAAE;IAACS,SAAS;EAAA,CAAE,CAAC,eACnFzB,KAAA,CAAAqB,aAAA,CAACV,qBAAqB;IAACY,GAAG,EAAEP,CAAC,CAAC,qCAAqC,CAAE;IAACS,SAAS;EAAA,CAAE,CAAC,eAClFzB,KAAA,CAAAqB,aAAA,CAACV,qBAAqB;IAACY,GAAG,EAAEP,CAAC,CAAC,uCAAuC,CAAE;IAACS,SAAS;EAAA,CAAE,CAAC,eAEpFzB,KAAA,CAAAqB,aAAA,CAACV,qBAAqB;IAACY,GAAG,EAAEP,CAAC,CAAC,qCAAqC,CAAE;IAACS,SAAS;EAAA,CAAE,CAAC,eAClFzB,KAAA,CAAAqB,aAAA,CAACV,qBAAqB;IAACY,GAAG,EAAEP,CAAC,CAAC,6BAA6B,CAAE;IAACS,SAAS;EAAA,CAAE,CAAC,eAE1EzB,KAAA,CAAAqB,aAAA,CAACpB,gBAAgB;IAACsB,GAAG,EAAEP,CAAC,CAAC,kCAAkC;EAAE,CAAE,CAAC,eAKhEhB,KAAA,CAAAqB,aAAA,CAAChB,cAAc;IAACkB,GAAG,EAAEP,CAAC,CAAC,qDAAqD;EAAE,CAAE,CAAC,eACjFhB,KAAA,CAAAqB,aAAA,CAACb,oBAAoB;IAACe,GAAG,EAAEP,CAAC,CAAC,gBAAgB;EAAE,CAAE,CAAC,eAClDhB,KAAA,CAAAqB,aAAA,CAACb,oBAAoB;IAACe,GAAG,EAAEP,CAAC,CAAC,2BAA2B;EAAE,CAAE,CAAC,eAG7DhB,KAAA,CAAAqB,aAAA,CAACnB,gBAAgB;IAACqB,GAAG,EAAEP,CAAC,CAAC,0DAA0D;EAAE,CAAE,CAAC,eACxFhB,KAAA,CAAAqB,aAAA,CAAClB,gBAAgB;IAACoB,GAAG,EAAEP,CAAC,CAAC,0DAA0D;EAAE,CAAE,CAAC,eAGxFhB,KAAA,CAAAqB,aAAA,CAACR,UAAU;IAACU,GAAG,EAAEP,CAAC,CAAC,gEAAgE;EAAE,CAAE,CAAC,eACxFhB,KAAA,CAAAqB,aAAA,CAACf,YAAY;IAACiB,GAAG,EAAEP,CAAC,CAAC,8DAA8D;EAAE,CAAE,CAAC,eACxFhB,KAAA,CAAAqB,aAAA,CAACjB,WAAW;IACRmB,GAAG,EAAEP,CAAC,CAAC,mEAAmE;EAAE,CAC/E,CAAC,eAGFhB,KAAA,CAAAqB,aAAA,CAACN,YAAY,MAAE,CACjB,CAAC;AAEX,CAAC","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webiny/project-aws",
|
|
3
|
-
"version": "6.0.0-rc.
|
|
3
|
+
"version": "6.0.0-rc.5",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"repository": {
|
|
@@ -18,14 +18,15 @@
|
|
|
18
18
|
"@pulumi/aws": "^7.20.0",
|
|
19
19
|
"@pulumi/pulumi": "^3.223.0",
|
|
20
20
|
"@pulumi/random": "4.19.1",
|
|
21
|
-
"@webiny/api-headless-cms": "6.0.0-rc.
|
|
22
|
-
"@webiny/aws-layers": "6.0.0-rc.
|
|
23
|
-
"@webiny/aws-sdk": "6.0.0-rc.
|
|
24
|
-
"@webiny/cli-core": "6.0.0-rc.
|
|
25
|
-
"@webiny/data-migration": "6.0.0-rc.
|
|
26
|
-
"@webiny/
|
|
27
|
-
"@webiny/
|
|
28
|
-
"@webiny/
|
|
21
|
+
"@webiny/api-headless-cms": "6.0.0-rc.5",
|
|
22
|
+
"@webiny/aws-layers": "6.0.0-rc.5",
|
|
23
|
+
"@webiny/aws-sdk": "6.0.0-rc.5",
|
|
24
|
+
"@webiny/cli-core": "6.0.0-rc.5",
|
|
25
|
+
"@webiny/data-migration": "6.0.0-rc.5",
|
|
26
|
+
"@webiny/mcp": "6.0.0-rc.5",
|
|
27
|
+
"@webiny/project": "6.0.0-rc.5",
|
|
28
|
+
"@webiny/pulumi": "6.0.0-rc.5",
|
|
29
|
+
"@webiny/utils": "6.0.0-rc.5",
|
|
29
30
|
"chalk": "4.1.2",
|
|
30
31
|
"find-up": "5.0.0",
|
|
31
32
|
"invariant": "2.2.4",
|
|
@@ -38,7 +39,7 @@
|
|
|
38
39
|
"devDependencies": {
|
|
39
40
|
"@types/lodash": "4.17.24",
|
|
40
41
|
"@types/ncp": "2.0.8",
|
|
41
|
-
"@webiny/build-tools": "6.0.0-rc.
|
|
42
|
+
"@webiny/build-tools": "6.0.0-rc.5",
|
|
42
43
|
"typescript": "5.9.3"
|
|
43
44
|
},
|
|
44
45
|
"adio": {
|
|
@@ -56,5 +57,5 @@
|
|
|
56
57
|
]
|
|
57
58
|
}
|
|
58
59
|
},
|
|
59
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "8f9b60f1193682a21e037e6f771b19f1dfd65045"
|
|
60
61
|
}
|
|
@@ -5,9 +5,10 @@ if (process.env.DEBUG === "true") {
|
|
|
5
5
|
}
|
|
6
6
|
export let sealEnvVariables;
|
|
7
7
|
const magicPrefixes = ["WEBINY_", "WEBINY_API_",
|
|
8
|
-
// Added WCP vars separately. We don't need any other `WCP_PROJECT_` variables, apart from these
|
|
8
|
+
// Added WCP vars separately. We don't need any other `WCP_PROJECT_` variables, apart from these.
|
|
9
|
+
// WEBINY_PROJECT_API_KEY is the new naming (preferred), WCP_PROJECT_ENVIRONMENT_API_KEY is for backward compatibility.
|
|
9
10
|
// This will be later removed because we'll be using `Api.BuildParam` extension.
|
|
10
|
-
"WCP_PROJECT_ENVIRONMENT", "WCP_PROJECT_ENVIRONMENT_API_KEY", "OKTA_", "AUTH0_"];
|
|
11
|
+
"WEBINY_PROJECT_API_KEY", "WCP_PROJECT_ENVIRONMENT", "WCP_PROJECT_ENVIRONMENT_API_KEY", "OKTA_", "AUTH0_"];
|
|
11
12
|
const variablesPromise = new Promise(resolve => {
|
|
12
13
|
sealEnvVariables = () => {
|
|
13
14
|
// Apart from a couple of basic environment variables like DEBUG,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["pulumi","variablesRegistry","process","env","DEBUG","NODE_OPTIONS","sealEnvVariables","magicPrefixes","variablesPromise","Promise","resolve","baseVariables","Object","keys","reduce","current","environmentVariableName","hasMagicPrefix","some","prefix","startsWith","undefined","String","PULUMI_APPS","assign","getCommonLambdaEnvVariables","output","setCommonLambdaEnvVariables","variables","withCommonLambdaEnvVariables","app","decorateProgram","program","addHandler"],"sources":["lambdaEnvVariables.ts"],"sourcesContent":["import * as pulumi from \"@pulumi/pulumi\";\nimport type { PulumiApp } from \"@webiny/pulumi\";\n\ntype EnvVariables = Record<string, string | pulumi.Output<string>>;\n\nconst variablesRegistry: EnvVariables = {};\n\nif (process.env.DEBUG === \"true\") {\n variablesRegistry.NODE_OPTIONS = \"--enable-source-maps\";\n}\n\nexport let sealEnvVariables: () => void;\n\nconst magicPrefixes = [\n \"WEBINY_\",\n \"WEBINY_API_\",\n // Added WCP vars separately. We don't need any other `WCP_PROJECT_` variables, apart from these
|
|
1
|
+
{"version":3,"names":["pulumi","variablesRegistry","process","env","DEBUG","NODE_OPTIONS","sealEnvVariables","magicPrefixes","variablesPromise","Promise","resolve","baseVariables","Object","keys","reduce","current","environmentVariableName","hasMagicPrefix","some","prefix","startsWith","undefined","String","PULUMI_APPS","assign","getCommonLambdaEnvVariables","output","setCommonLambdaEnvVariables","variables","withCommonLambdaEnvVariables","app","decorateProgram","program","addHandler"],"sources":["lambdaEnvVariables.ts"],"sourcesContent":["import * as pulumi from \"@pulumi/pulumi\";\nimport type { PulumiApp } from \"@webiny/pulumi\";\n\ntype EnvVariables = Record<string, string | pulumi.Output<string>>;\n\nconst variablesRegistry: EnvVariables = {};\n\nif (process.env.DEBUG === \"true\") {\n variablesRegistry.NODE_OPTIONS = \"--enable-source-maps\";\n}\n\nexport let sealEnvVariables: () => void;\n\nconst magicPrefixes = [\n \"WEBINY_\",\n \"WEBINY_API_\",\n // Added WCP vars separately. We don't need any other `WCP_PROJECT_` variables, apart from these.\n // WEBINY_PROJECT_API_KEY is the new naming (preferred), WCP_PROJECT_ENVIRONMENT_API_KEY is for backward compatibility.\n // This will be later removed because we'll be using `Api.BuildParam` extension.\n \"WEBINY_PROJECT_API_KEY\",\n \"WCP_PROJECT_ENVIRONMENT\",\n \"WCP_PROJECT_ENVIRONMENT_API_KEY\",\n \"OKTA_\",\n \"AUTH0_\"\n];\n\nconst variablesPromise = new Promise<EnvVariables>(resolve => {\n sealEnvVariables = () => {\n // Apart from a couple of basic environment variables like DEBUG,\n // we also take into consideration variables that have `WEBINY_` and `WCP_` prefix in their names.\n const baseVariables = Object.keys(process.env).reduce<EnvVariables>(\n (current, environmentVariableName) => {\n const hasMagicPrefix = magicPrefixes.some(prefix =>\n environmentVariableName.startsWith(prefix)\n );\n\n if (hasMagicPrefix && process.env[environmentVariableName] !== undefined) {\n current[environmentVariableName] = String(process.env[environmentVariableName]);\n }\n return current;\n },\n {\n // Among other things, this determines the amount of information we reveal on runtime errors.\n // https://www.webiny.com/docs/how-to-guides/environment-variables/#debug-environment-variable\n DEBUG: String(process.env.DEBUG),\n // This flag means that Lambda was deployed using the new Pulumi Apps architecture.\n PULUMI_APPS: \"true\"\n }\n );\n\n resolve(Object.assign({}, baseVariables, variablesRegistry));\n };\n});\n\nexport function getCommonLambdaEnvVariables(): pulumi.Output<EnvVariables> {\n return pulumi.output(variablesPromise);\n}\n\nfunction setCommonLambdaEnvVariables(variables: EnvVariables) {\n Object.assign(variablesRegistry, variables);\n}\n\nexport interface SetCommonLambdaEnvVariables {\n (variables: EnvVariables): void;\n}\n\nexport interface WithCommonLambdaEnvVariables {\n /**\n * Set ENV variables that wil be assigned to all Lambda functions in the current Pulumi app.\n */\n setCommonLambdaEnvVariables: SetCommonLambdaEnvVariables;\n}\n\n/**\n * Augment the given app with `setCommonLambdaEnvVariables` functionality.\n * @param {PulumiApp} app\n */\nexport function withCommonLambdaEnvVariables<T extends PulumiApp>(\n app: T\n): T & WithCommonLambdaEnvVariables {\n app.decorateProgram<{ setCommonLambdaEnvVariables: typeof setCommonLambdaEnvVariables }>(\n async (program, app) => {\n const output = await program({\n ...app,\n setCommonLambdaEnvVariables\n });\n\n // Once the program is executed, we need to seal the variables (this will resolve the pulumi.output promise).\n app.addHandler(() => {\n sealEnvVariables();\n });\n\n return output;\n }\n );\n\n // Augment the original PulumiApp.\n return {\n ...app,\n setCommonLambdaEnvVariables\n };\n}\n"],"mappings":"AAAA,OAAO,KAAKA,MAAM,MAAM,gBAAgB;AAKxC,MAAMC,iBAA+B,GAAG,CAAC,CAAC;AAE1C,IAAIC,OAAO,CAACC,GAAG,CAACC,KAAK,KAAK,MAAM,EAAE;EAC9BH,iBAAiB,CAACI,YAAY,GAAG,sBAAsB;AAC3D;AAEA,OAAO,IAAIC,gBAA4B;AAEvC,MAAMC,aAAa,GAAG,CAClB,SAAS,EACT,aAAa;AACb;AACA;AACA;AACA,wBAAwB,EACxB,yBAAyB,EACzB,iCAAiC,EACjC,OAAO,EACP,QAAQ,CACX;AAED,MAAMC,gBAAgB,GAAG,IAAIC,OAAO,CAAeC,OAAO,IAAI;EAC1DJ,gBAAgB,GAAGA,CAAA,KAAM;IACrB;IACA;IACA,MAAMK,aAAa,GAAGC,MAAM,CAACC,IAAI,CAACX,OAAO,CAACC,GAAG,CAAC,CAACW,MAAM,CACjD,CAACC,OAAO,EAAEC,uBAAuB,KAAK;MAClC,MAAMC,cAAc,GAAGV,aAAa,CAACW,IAAI,CAACC,MAAM,IAC5CH,uBAAuB,CAACI,UAAU,CAACD,MAAM,CAC7C,CAAC;MAED,IAAIF,cAAc,IAAIf,OAAO,CAACC,GAAG,CAACa,uBAAuB,CAAC,KAAKK,SAAS,EAAE;QACtEN,OAAO,CAACC,uBAAuB,CAAC,GAAGM,MAAM,CAACpB,OAAO,CAACC,GAAG,CAACa,uBAAuB,CAAC,CAAC;MACnF;MACA,OAAOD,OAAO;IAClB,CAAC,EACD;MACI;MACA;MACAX,KAAK,EAAEkB,MAAM,CAACpB,OAAO,CAACC,GAAG,CAACC,KAAK,CAAC;MAChC;MACAmB,WAAW,EAAE;IACjB,CACJ,CAAC;IAEDb,OAAO,CAACE,MAAM,CAACY,MAAM,CAAC,CAAC,CAAC,EAAEb,aAAa,EAAEV,iBAAiB,CAAC,CAAC;EAChE,CAAC;AACL,CAAC,CAAC;AAEF,OAAO,SAASwB,2BAA2BA,CAAA,EAAgC;EACvE,OAAOzB,MAAM,CAAC0B,MAAM,CAAClB,gBAAgB,CAAC;AAC1C;AAEA,SAASmB,2BAA2BA,CAACC,SAAuB,EAAE;EAC1DhB,MAAM,CAACY,MAAM,CAACvB,iBAAiB,EAAE2B,SAAS,CAAC;AAC/C;AAaA;AACA;AACA;AACA;AACA,OAAO,SAASC,4BAA4BA,CACxCC,GAAM,EAC0B;EAChCA,GAAG,CAACC,eAAe,CACf,OAAOC,OAAO,EAAEF,GAAG,KAAK;IACpB,MAAMJ,MAAM,GAAG,MAAMM,OAAO,CAAC;MACzB,GAAGF,GAAG;MACNH;IACJ,CAAC,CAAC;;IAEF;IACAG,GAAG,CAACG,UAAU,CAAC,MAAM;MACjB3B,gBAAgB,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,OAAOoB,MAAM;EACjB,CACJ,CAAC;;EAED;EACA,OAAO;IACH,GAAGI,GAAG;IACNH;EACJ,CAAC;AACL","ignoreList":[]}
|