@nrwl/cypress 15.8.0-beta.0 → 15.8.0-beta.2
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/package.json +6 -5
- package/src/executors/cypress/cypress.impl.d.ts +1 -1
- package/src/executors/cypress/cypress.impl.js +39 -25
- package/src/executors/cypress/cypress.impl.js.map +1 -1
- package/src/generators/cypress-project/cypress-project.d.ts +3 -3
- package/src/generators/cypress-project/cypress-project.js +6 -2
- package/src/generators/cypress-project/cypress-project.js.map +1 -1
- package/src/generators/migrate-to-cypress-11/conversion.util.js +13 -6
- package/src/generators/migrate-to-cypress-11/conversion.util.js.map +1 -1
- package/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.js.map +1 -1
- package/src/plugins/preprocessor-vite.d.ts +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/cypress",
|
|
3
|
-
"version": "15.8.0-beta.
|
|
3
|
+
"version": "15.8.0-beta.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
|
|
6
6
|
"repository": {
|
|
@@ -34,9 +34,10 @@
|
|
|
34
34
|
"migrations": "./migrations.json"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@nrwl/devkit": "15.8.0-beta.
|
|
38
|
-
"@nrwl/
|
|
39
|
-
"@nrwl/
|
|
37
|
+
"@nrwl/devkit": "15.8.0-beta.2",
|
|
38
|
+
"@nrwl/js": "15.8.0-beta.2",
|
|
39
|
+
"@nrwl/linter": "15.8.0-beta.2",
|
|
40
|
+
"@nrwl/workspace": "15.8.0-beta.2",
|
|
40
41
|
"@phenomnomnominal/tsquery": "4.1.1",
|
|
41
42
|
"dotenv": "~10.0.0",
|
|
42
43
|
"semver": "7.3.4"
|
|
@@ -53,5 +54,5 @@
|
|
|
53
54
|
"access": "public"
|
|
54
55
|
},
|
|
55
56
|
"types": "./index.d.ts",
|
|
56
|
-
"gitHead": "
|
|
57
|
+
"gitHead": "5a67ea3e0f445870130c2e9110f07062a47c22bf"
|
|
57
58
|
}
|
|
@@ -9,32 +9,39 @@ const ct_helpers_1 = require("../../utils/ct-helpers");
|
|
|
9
9
|
const cypress_version_1 = require("../../utils/cypress-version");
|
|
10
10
|
const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies.
|
|
11
11
|
function cypressExecutor(options, context) {
|
|
12
|
-
var e_1,
|
|
12
|
+
var _a, e_1, _b, _c;
|
|
13
13
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
14
|
options = normalizeOptions(options, context);
|
|
15
15
|
// this is used by cypress component testing presets to build the executor contexts with the correct configuration options.
|
|
16
16
|
process.env.NX_CYPRESS_TARGET_CONFIGURATION = context.configurationName;
|
|
17
17
|
let success;
|
|
18
18
|
try {
|
|
19
|
-
for (var
|
|
20
|
-
|
|
19
|
+
for (var _d = true, _e = tslib_1.__asyncValues(startDevServer(options, context)), _f; _f = yield _e.next(), _a = _f.done, !_a;) {
|
|
20
|
+
_c = _f.value;
|
|
21
|
+
_d = false;
|
|
21
22
|
try {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
const baseUrl = _c;
|
|
24
|
+
try {
|
|
25
|
+
success = yield runCypress(baseUrl, options);
|
|
26
|
+
if (!options.watch)
|
|
27
|
+
break;
|
|
28
|
+
}
|
|
29
|
+
catch (e) {
|
|
30
|
+
devkit_1.logger.error(e.message);
|
|
31
|
+
success = false;
|
|
32
|
+
if (!options.watch)
|
|
33
|
+
break;
|
|
34
|
+
}
|
|
25
35
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
success = false;
|
|
29
|
-
if (!options.watch)
|
|
30
|
-
break;
|
|
36
|
+
finally {
|
|
37
|
+
_d = true;
|
|
31
38
|
}
|
|
32
39
|
}
|
|
33
40
|
}
|
|
34
41
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
35
42
|
finally {
|
|
36
43
|
try {
|
|
37
|
-
if (
|
|
44
|
+
if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
|
|
38
45
|
}
|
|
39
46
|
finally { if (e_1) throw e_1.error; }
|
|
40
47
|
}
|
|
@@ -109,7 +116,7 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1
|
|
|
109
116
|
function startDevServer(opts, context) {
|
|
110
117
|
var _a, _b, _c;
|
|
111
118
|
return tslib_1.__asyncGenerator(this, arguments, function* startDevServer_1() {
|
|
112
|
-
var e_2,
|
|
119
|
+
var _d, e_2, _e, _f;
|
|
113
120
|
// no dev server, return the provisioned base url
|
|
114
121
|
if (!opts.devServerTarget || opts.skipServe) {
|
|
115
122
|
yield yield tslib_1.__await(opts.baseUrl);
|
|
@@ -119,27 +126,34 @@ function startDevServer(opts, context) {
|
|
|
119
126
|
const devServerTargetOpts = (0, devkit_1.readTargetOptions)({ project, target, configuration }, context);
|
|
120
127
|
const targetSupportsWatchOpt = Object.keys(devServerTargetOpts).includes('watch');
|
|
121
128
|
try {
|
|
122
|
-
for (var
|
|
129
|
+
for (var _g = true, _h = tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)({ project, target, configuration },
|
|
123
130
|
// @NOTE: Do not forward watch option if not supported by the target dev server,
|
|
124
131
|
// this is relevant for running Cypress against dev server target that does not support this option,
|
|
125
132
|
// for instance @nguniversal/builders:ssr-dev-server.
|
|
126
|
-
targetSupportsWatchOpt ? { watch: opts.watch } : {}, context))),
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
!output.
|
|
132
|
-
|
|
133
|
-
(
|
|
134
|
-
|
|
133
|
+
targetSupportsWatchOpt ? { watch: opts.watch } : {}, context))), _j; _j = yield tslib_1.__await(_h.next()), _d = _j.done, !_d;) {
|
|
134
|
+
_f = _j.value;
|
|
135
|
+
_g = false;
|
|
136
|
+
try {
|
|
137
|
+
const output = _f;
|
|
138
|
+
if (!output.success && !opts.watch)
|
|
139
|
+
throw new Error('Could not compile application files');
|
|
140
|
+
if (!opts.baseUrl &&
|
|
141
|
+
!output.baseUrl &&
|
|
142
|
+
!((_a = output.info) === null || _a === void 0 ? void 0 : _a.baseUrl) &&
|
|
143
|
+
((_b = output.info) === null || _b === void 0 ? void 0 : _b.port)) {
|
|
144
|
+
output.baseUrl = `http://localhost:${output.info.port}`;
|
|
145
|
+
}
|
|
146
|
+
yield yield tslib_1.__await(opts.baseUrl || output.baseUrl || ((_c = output.info) === null || _c === void 0 ? void 0 : _c.baseUrl));
|
|
147
|
+
}
|
|
148
|
+
finally {
|
|
149
|
+
_g = true;
|
|
135
150
|
}
|
|
136
|
-
yield yield tslib_1.__await(opts.baseUrl || output.baseUrl || ((_c = output.info) === null || _c === void 0 ? void 0 : _c.baseUrl));
|
|
137
151
|
}
|
|
138
152
|
}
|
|
139
153
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
140
154
|
finally {
|
|
141
155
|
try {
|
|
142
|
-
if (
|
|
156
|
+
if (!_g && !_d && (_e = _h.return)) yield tslib_1.__await(_e.call(_h));
|
|
143
157
|
}
|
|
144
158
|
finally { if (e_2) throw e_2.error; }
|
|
145
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,yBAAuB;AACvB,2BAA4C;AAC5C,+BAA+C;AAC/C,uDAA6D;AAC7D,iEAAsE;AAEtE,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,+DAA+D;AAuCnG,SAA8B,eAAe,CAC3C,OAA+B,EAC/B,OAAwB;;;QAExB,OAAO,GAAG,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC7C,2HAA2H;QAC3H,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,OAAO,CAAC,iBAAiB,CAAC;QACxE,IAAI,OAAO,CAAC;;YAEZ,KAA4B,
|
|
1
|
+
{"version":3,"file":"cypress.impl.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/executors/cypress/cypress.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { Tree } from '@nrwl/devkit';
|
|
1
|
+
import { GeneratorCallback, Tree } from '@nrwl/devkit';
|
|
2
2
|
import { Schema } from './schema';
|
|
3
3
|
export interface CypressProjectSchema extends Schema {
|
|
4
4
|
projectName: string;
|
|
5
5
|
projectRoot: string;
|
|
6
6
|
}
|
|
7
|
-
export declare function addLinter(host: Tree, options: CypressProjectSchema): Promise<
|
|
8
|
-
export declare function cypressProjectGenerator(host: Tree, schema: Schema): Promise<
|
|
7
|
+
export declare function addLinter(host: Tree, options: CypressProjectSchema): Promise<GeneratorCallback>;
|
|
8
|
+
export declare function cypressProjectGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
|
|
9
9
|
export default cypressProjectGenerator;
|
|
10
10
|
export declare const cypressProjectSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const linter_1 = require("@nrwl/linter");
|
|
7
7
|
const run_tasks_in_serial_1 = require("@nrwl/workspace/src/utilities/run-tasks-in-serial");
|
|
8
|
-
const
|
|
8
|
+
const js_1 = require("@nrwl/js");
|
|
9
9
|
const global_eslint_config_1 = require("@nrwl/linter/src/generators/init/global-eslint-config");
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const cypress_version_1 = require("../../utils/cypress-version");
|
|
@@ -17,7 +17,7 @@ function createFiles(tree, options) {
|
|
|
17
17
|
// else use v9 folder
|
|
18
18
|
const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
|
|
19
19
|
const cypressFiles = cypressVersion && cypressVersion < 10 ? 'v9-and-under' : 'v10-and-after';
|
|
20
|
-
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files', cypressFiles), options.projectRoot, Object.assign(Object.assign({ tmpl: '' }, options), { project: options.project || 'Project', ext: options.js ? 'js' : 'ts', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0,
|
|
20
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files', cypressFiles), options.projectRoot, Object.assign(Object.assign({ tmpl: '' }, options), { project: options.project || 'Project', ext: options.js ? 'js' : 'ts', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.projectRoot), bundler: options.bundler }));
|
|
21
21
|
if (cypressVersion && cypressVersion < 7) {
|
|
22
22
|
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.projectRoot, 'cypress.json'), (json) => {
|
|
23
23
|
json.pluginsFile = './src/plugins/index';
|
|
@@ -189,6 +189,10 @@ exports.addLinter = addLinter;
|
|
|
189
189
|
function cypressProjectGenerator(host, schema) {
|
|
190
190
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
191
191
|
const options = normalizeOptions(host, schema);
|
|
192
|
+
yield (0, js_1.initGenerator)(host, {
|
|
193
|
+
js: schema.js,
|
|
194
|
+
skipFormat: true,
|
|
195
|
+
});
|
|
192
196
|
const tasks = [];
|
|
193
197
|
const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
|
|
194
198
|
// if there is an installed cypress version, then we don't call
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"cypress-project.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/cypress-project/cypress-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.updatePluginFile = exports.addConfigToTsConfig = exports.writeNewConfig = exports.updateImports = exports.updateProjectPaths = exports.createSupportFileImport = exports.createNewCypressConfig = exports.findCypressConfigs = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
-
const tsquery_1 = require("@phenomnomnominal/tsquery");
|
|
7
6
|
const path_1 = require("path");
|
|
8
|
-
|
|
7
|
+
let tsModule;
|
|
8
|
+
let tsquery;
|
|
9
9
|
const validFilesEndingsToUpdate = [
|
|
10
10
|
'.js',
|
|
11
11
|
'.jsx',
|
|
@@ -156,14 +156,21 @@ function updateProjectPaths(tree, projectConfig, { cypressConfigTs, cypressConfi
|
|
|
156
156
|
}
|
|
157
157
|
exports.updateProjectPaths = updateProjectPaths;
|
|
158
158
|
function updateImports(tree, filePath, oldImportPath, newImportPath) {
|
|
159
|
+
if (!tsquery) {
|
|
160
|
+
tsquery = require('@phenomnomnominal/tsquery').tsquery;
|
|
161
|
+
}
|
|
162
|
+
if (!tsModule) {
|
|
163
|
+
tsModule = require('typescript');
|
|
164
|
+
}
|
|
165
|
+
const { isCallExpression, isExportDeclaration, isImportDeclaration } = tsModule;
|
|
159
166
|
const endOfImportSelector = `StringLiteral[value=/${oldImportPath}$/]`;
|
|
160
167
|
const fileContent = tree.read(filePath, 'utf-8');
|
|
161
|
-
const newContent =
|
|
168
|
+
const newContent = tsquery.replace(fileContent, endOfImportSelector, (node) => {
|
|
162
169
|
// if node.parent is an CallExpression require() ||ImportDeclaration
|
|
163
170
|
if ((node === null || node === void 0 ? void 0 : node.parent) &&
|
|
164
|
-
(
|
|
165
|
-
|
|
166
|
-
|
|
171
|
+
(isCallExpression(node.parent) ||
|
|
172
|
+
isImportDeclaration(node.parent) ||
|
|
173
|
+
isExportDeclaration(node.parent))) {
|
|
167
174
|
return `'${node.text.replace(oldImportPath, newImportPath)}'`;
|
|
168
175
|
}
|
|
169
176
|
return node.text;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion.util.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/conversion.util.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB
|
|
1
|
+
{"version":3,"file":"conversion.util.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/conversion.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-to-cypress-11.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts"],"names":[],"mappings":";;;;AAAA,6EAGiD;AACjD,yCAUsB;AACtB,iGAA8F;
|
|
1
|
+
{"version":3,"file":"migrate-to-cypress-11.js","sourceRoot":"","sources":["../../../../../../packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.ts"],"names":[],"mappings":";;;;AAAA,6EAGiD;AACjD,yCAUsB;AACtB,iGAA8F;AAE9F,uDAO2B;AAE3B,SAAsB,qBAAqB,CAAC,IAAU;;QACpD,IAAA,6CAA2B,EAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,IAAA,yCAAuB,GAAE,IAAI,EAAE,EAAE;YACnC,eAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;YAC/D,OAAO;SACR;QACD,mEAAmE;QACnE,gDAAgD;QAChD,oEAAoE;QACpE,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAGnC,CAAC;QAEJ,IAAA,+CAAsB,EACpB,IAAI,EACJ,uBAAuB,EACvB,CAAC,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE;;YACnD,IAAI;gBACF,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAElE,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,GAClD,IAAA,oCAAkB,EAAC,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBAEjE,IAAI,CAAC,qBAAqB,IAAI,CAAC,mBAAmB,EAAE;oBAClD,OAAO;iBACR;gBACD,oEAAoE;gBACpE,IACE,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC;oBAClC,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EACjC;oBACA,IAAI,cAAc,GAAG,IAAA,wCAAsB,EACzC,IAAI,EACJ,aAAa,EACb,qBAAqB,CACtB,CAAC;oBACF,cAAc,GAAG,IAAA,kCAAgB,EAC/B,IAAI,EACJ,aAAa,EACb,cAAc,CACf,CAAC;oBACF,IAAA,gCAAc,EAAC,IAAI,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAAC;oBAE1D,sBAAsB,CAAC,GAAG,CAAC,qBAAqB,EAAE,cAAc,CAAC,CAAC;oBAClE,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;iBACpC;gBACD,uGAAuG;gBACvG,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC;oBACnC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAChC;oBACA,MAAM,cAAc,GAAG,sBAAsB,CAAC,GAAG,CAC/C,qBAAqB,CACtB,CAAC;oBAEF,IAAA,oCAAkB,EAAC,IAAI,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC;oBACxD,IAAA,qCAAmB,EACjB,IAAI,EACJ,CAAC,aAAa;wBACZ,CAAC,CAAC,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,OAAO,0CAAG,MAAM,CAAC,0CAAE,cAAc,0CAAG,aAAa,CAAC,0CAC5D,QAAQ;wBACd,CAAC,CAAC,MAAA,MAAA,MAAA,aAAa,CAAC,OAAO,0CAAG,MAAM,CAAC,0CAAE,OAAO,0CAAE,QAAQ,CAAC;wBACrD,IAAA,0BAAiB,EAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EACxD,mBAAmB,CACpB,CAAC;oBAEF,IAAI,aAAa,EAAE;wBACjB,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,mCACtD,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,aAAa,CAAC,KAC9D,aAAa,EAAE,mBAAmB,GACnC,CAAC;qBACH;yBAAM;wBACL,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,mCAChC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,KACxC,aAAa,EAAE,mBAAmB,GACnC,CAAC;qBACH;oBAED,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;oBAE1D,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;iBAC9D;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,eAAM,CAAC,KAAK,CAAC,IAAA,qBAAY,EAAA;mCACE,WAAW,IAAI,MAAM;;;GAGrD,CAAC,CAAC;gBACG,MAAM,CAAC,CAAC;aACT;QACH,CAAC,CACF,CAAC;QAEF,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;YAC/B,eAAM,CAAC,IAAI,CAAC,IAAA,qBAAY,EAAA;;;;;KAKvB,CAAC,CAAC;SACJ;QACD,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAhHD,sDAgHC;AAED,kBAAe,qBAAqB,CAAC"}
|