@nrwl/angular 16.0.0-beta.0 → 16.0.0-beta.2

package/generators.json

@@ -1,319 +1,4 @@
 {
-  "name": "Nx Angular",
-  "version": "0.1",
-  "extends": ["@schematics/angular", "@nrwl/workspace"],
-  "schematics": {
-    "add-linting": {
-      "factory": "./src/generators/add-linting/compat",
-      "schema": "./src/generators/add-linting/schema.json",
-      "description": "Adds linting configuration to an Angular project.",
-      "hidden": true
-    },
-    "application": {
-      "factory": "./src/generators/application/application.compat#applicationSchematic",
-      "schema": "./src/generators/application/schema.json",
-      "aliases": ["app"],
-      "x-type": "application",
-      "description": "Creates an Angular application."
-    },
-    "component": {
-      "factory": "./src/generators/component/component.compat",
-      "schema": "./src/generators/component/schema.json",
-      "aliases": ["c"],
-      "description": "Generate an Angular Component."
-    },
-    "component-cypress-spec": {
-      "factory": "./src/generators/component-cypress-spec/compat",
-      "schema": "./src/generators/component-cypress-spec/schema.json",
-      "description": "Creates a Cypress spec for a UI component that has a story.",
-      "hidden": true
-    },
-    "component-story": {
-      "factory": "./src/generators/component-story/compat",
-      "schema": "./src/generators/component-story/schema.json",
-      "description": "Creates a `stories.ts` file for a component.",
-      "hidden": true
-    },
-    "component-test": {
-      "factory": "./src/generators/component-test/compat",
-      "schema": "./src/generators/component-test/schema.json",
-      "description": "Creates a cypress component test file for a component."
-    },
-    "convert-tslint-to-eslint": {
-      "factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionSchematic",
-      "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
-      "description": "Converts a project from TSLint to ESLint."
-    },
-    "init": {
-      "factory": "./src/generators/init/init.compat#initSchematic",
-      "schema": "./src/generators/init/schema.json",
-      "description": "Initializes the `@nrwl/angular` plugin.",
-      "hidden": true
-    },
-    "library": {
-      "factory": "./src/generators/library/library.compat#librarySchematic",
-      "schema": "./src/generators/library/schema.json",
-      "aliases": ["lib"],
-      "x-type": "library",
-      "description": "Creates an Angular library."
-    },
-    "library-secondary-entry-point": {
-      "factory": "./src/generators/library-secondary-entry-point/compat",
-      "schema": "./src/generators/library-secondary-entry-point/schema.json",
-      "aliases": ["secondary-entry-point", "entry-point"],
-      "description": "Creates a secondary entry point for an Angular publishable library."
-    },
-    "remote": {
-      "factory": "./src/generators/remote/remote.compat",
-      "schema": "./src/generators/remote/schema.json",
-      "x-type": "application",
-      "description": "Generate a Remote Angular Module Federation Application."
-    },
-    "move": {
-      "factory": "./src/generators/move/move#angularMoveSchematic",
-      "schema": "./src/generators/move/schema.json",
-      "aliases": ["mv"],
-      "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration."
-    },
-    "convert-to-with-mf": {
-      "factory": "./src/generators/convert-to-with-mf/convert-to-with-mf.compat",
-      "schema": "./src/generators/convert-to-with-mf/schema.json",
-      "description": "Converts an old micro frontend configuration to use the new `withModuleFederation` helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n{% callout type=\"warning\" title=\"Overrides\" %}This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!{% /callout %}"
-    },
-    "host": {
-      "factory": "./src/generators/host/host.compat",
-      "schema": "./src/generators/host/schema.json",
-      "x-type": "application",
-      "description": "Generate a Host Angular Module Federation Application."
-    },
-    "ng-add": {
-      "factory": "./src/generators/ng-add/compat",
-      "schema": "./src/generators/ng-add/schema.json",
-      "description": "Migrates an Angular CLI workspace to Nx or adds the Angular plugin to an Nx workspace.",
-      "hidden": true
-    },
-    "ngrx": {
-      "factory": "./src/generators/ngrx/compat",
-      "schema": "./src/generators/ngrx/schema.json",
-      "description": "Adds NgRx support to an application or library."
-    },
-    "scam-to-standalone": {
-      "factory": "./src/generators/scam-to-standalone/compat",
-      "schema": "./src/generators/scam-to-standalone/schema.json",
-      "description": "Convert an existing Single Component Angular Module (SCAM) to a Standalone Component."
-    },
-    "scam": {
-      "factory": "./src/generators/scam/scam.compat",
-      "schema": "./src/generators/scam/schema.json",
-      "description": "Generate a component with an accompanying Single Component Angular Module (SCAM)."
-    },
-    "scam-directive": {
-      "factory": "./src/generators/scam-directive/scam-directive.compat",
-      "schema": "./src/generators/scam-directive/schema.json",
-      "description": "Generate a directive with an accompanying Single Component Angular Module (SCAM)."
-    },
-    "scam-pipe": {
-      "factory": "./src/generators/scam-pipe/scam-pipe.compat",
-      "schema": "./src/generators/scam-pipe/schema.json",
-      "description": "Generate a pipe with an accompanying Single Component Angular Module (SCAM)."
-    },
-    "setup-mf": {
-      "factory": "./src/generators/setup-mf/setup-mf.compat",
-      "schema": "./src/generators/setup-mf/schema.json",
-      "description": "Generate a Module Federation configuration for a given Angular application."
-    },
-    "setup-ssr": {
-      "factory": "./src/generators/setup-ssr/setup-ssr.compat",
-      "schema": "./src/generators/setup-ssr/schema.json",
-      "description": "Generate Angular Universal (SSR) setup for an Angular application."
-    },
-    "setup-tailwind": {
-      "factory": "./src/generators/setup-tailwind/setup-tailwind.compat",
-      "schema": "./src/generators/setup-tailwind/schema.json",
-      "description": "Configures Tailwind CSS for an application or a buildable/publishable library."
-    },
-    "stories": {
-      "factory": "./src/generators/stories/compat",
-      "schema": "./src/generators/stories/schema.json",
-      "description": "Creates stories/specs for all components declared in a project."
-    },
-    "storybook-configuration": {
-      "factory": "./src/generators/storybook-configuration/compat",
-      "schema": "./src/generators/storybook-configuration/schema.json",
-      "description": "Adds Storybook configuration to a project."
-    },
-    "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/compat",
-      "schema": "./src/generators/cypress-component-configuration/schema.json",
-      "description": "Setup Cypress component testing for a project."
-    },
-    "web-worker": {
-      "factory": "./src/generators/web-worker/compat",
-      "schema": "./src/generators/web-worker/schema.json",
-      "description": "Creates a Web Worker."
-    }
-  },
-  "generators": {
-    "add-linting": {
-      "factory": "./src/generators/add-linting/add-linting",
-      "schema": "./src/generators/add-linting/schema.json",
-      "description": "Adds linting configuration to an Angular project.",
-      "hidden": true
-    },
-    "application": {
-      "factory": "./src/generators/application/application",
-      "schema": "./src/generators/application/schema.json",
-      "aliases": ["app"],
-      "x-type": "application",
-      "description": "Creates an Angular application."
-    },
-    "component": {
-      "factory": "./src/generators/component/component",
-      "schema": "./src/generators/component/schema.json",
-      "aliases": ["c"],
-      "description": "Generate an Angular Component."
-    },
-    "component-cypress-spec": {
-      "factory": "./src/generators/component-cypress-spec/component-cypress-spec",
-      "schema": "./src/generators/component-cypress-spec/schema.json",
-      "description": "Creates a Cypress spec for a UI component that has a story.",
-      "hidden": true
-    },
-    "component-story": {
-      "factory": "./src/generators/component-story/component-story",
-      "schema": "./src/generators/component-story/schema.json",
-      "description": "Creates a stories.ts file for a component.",
-      "hidden": true
-    },
-    "component-test": {
-      "factory": "./src/generators/component-test/component-test",
-      "schema": "./src/generators/component-test/schema.json",
-      "description": "Creates a cypress component test file for a component."
-    },
-    "convert-tslint-to-eslint": {
-      "factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionGenerator",
-      "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
-      "description": "Converts a project from TSLint to ESLint."
-    },
-    "directive": {
-      "factory": "./src/generators/directive/directive",
-      "schema": "./src/generators/directive/schema.json",
-      "aliases": ["d"],
-      "description": "Generate an Angular directive."
-    },
-    "init": {
-      "factory": "./src/generators/init/init",
-      "schema": "./src/generators/init/schema.json",
-      "description": "Initializes the `@nrwl/angular` plugin.",
-      "hidden": true
-    },
-    "library": {
-      "factory": "./src/generators/library/library",
-      "schema": "./src/generators/library/schema.json",
-      "aliases": ["lib"],
-      "x-type": "library",
-      "description": "Creates an Angular library."
-    },
-    "library-secondary-entry-point": {
-      "factory": "./src/generators/library-secondary-entry-point/library-secondary-entry-point",
-      "schema": "./src/generators/library-secondary-entry-point/schema.json",
-      "aliases": ["secondary-entry-point", "entry-point"],
-      "description": "Creates a secondary entry point for an Angular publishable library."
-    },
-    "remote": {
-      "factory": "./src/generators/remote/remote",
-      "schema": "./src/generators/remote/schema.json",
-      "x-type": "application",
-      "description": "Generate a Remote Angular Module Federation Application."
-    },
-    "move": {
-      "factory": "./src/generators/move/move#angularMoveGenerator",
-      "schema": "./src/generators/move/schema.json",
-      "aliases": ["mv"],
-      "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration."
-    },
-    "convert-to-with-mf": {
-      "factory": "./src/generators/convert-to-with-mf/convert-to-with-mf",
-      "schema": "./src/generators/convert-to-with-mf/schema.json",
-      "description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n{% callout type=\"warning\" title=\"Overrides\" %}This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!{% /callout %}"
-    },
-    "host": {
-      "factory": "./src/generators/host/host",
-      "schema": "./src/generators/host/schema.json",
-      "x-type": "application",
-      "description": "Generate a Host Angular Module Federation Application."
-    },
-    "ng-add": {
-      "factory": "./src/generators/ng-add/ng-add",
-      "schema": "./src/generators/ng-add/schema.json",
-      "description": "Migrates an Angular CLI workspace to Nx or adds the Angular plugin to an Nx workspace.",
-      "hidden": true
-    },
-    "ngrx": {
-      "factory": "./src/generators/ngrx/ngrx",
-      "schema": "./src/generators/ngrx/schema.json",
-      "description": "Adds NgRx support to an application or library."
-    },
-    "pipe": {
-      "factory": "./src/generators/pipe/pipe",
-      "schema": "./src/generators/pipe/schema.json",
-      "description": "Generate an Angular Pipe",
-      "aliases": ["p"]
-    },
-    "scam-to-standalone": {
-      "factory": "./src/generators/scam-to-standalone/scam-to-standalone",
-      "schema": "./src/generators/scam-to-standalone/schema.json",
-      "description": "Convert an existing Single Component Angular Module (SCAM) to a Standalone Component."
-    },
-    "scam": {
-      "factory": "./src/generators/scam/scam",
-      "schema": "./src/generators/scam/schema.json",
-      "description": "Generate a component with an accompanying Single Component Angular Module (SCAM)."
-    },
-    "scam-directive": {
-      "factory": "./src/generators/scam-directive/scam-directive",
-      "schema": "./src/generators/scam-directive/schema.json",
-      "description": "Generate a directive with an accompanying Single Component Angular Module (SCAM)."
-    },
-    "scam-pipe": {
-      "factory": "./src/generators/scam-pipe/scam-pipe",
-      "schema": "./src/generators/scam-pipe/schema.json",
-      "description": "Generate a pipe with an accompanying Single Component Angular Module (SCAM)."
-    },
-    "setup-mf": {
-      "factory": "./src/generators/setup-mf/setup-mf",
-      "schema": "./src/generators/setup-mf/schema.json",
-      "description": "Generate a Module Federation configuration for a given Angular application."
-    },
-    "setup-ssr": {
-      "factory": "./src/generators/setup-ssr/setup-ssr",
-      "schema": "./src/generators/setup-ssr/schema.json",
-      "description": "Generate Angular Universal (SSR) setup for an Angular application."
-    },
-    "setup-tailwind": {
-      "factory": "./src/generators/setup-tailwind/setup-tailwind",
-      "schema": "./src/generators/setup-tailwind/schema.json",
-      "description": "Configures Tailwind CSS for an application or a buildable/publishable library."
-    },
-    "stories": {
-      "factory": "./src/generators/stories/stories",
-      "schema": "./src/generators/stories/schema.json",
-      "description": "Creates stories/specs for all components declared in a project."
-    },
-    "storybook-configuration": {
-      "factory": "./src/generators/storybook-configuration/storybook-configuration",
-      "schema": "./src/generators/storybook-configuration/schema.json",
-      "description": "Adds Storybook configuration to a project."
-    },
-    "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration",
-      "schema": "./src/generators/cypress-component-configuration/schema.json",
-      "description": "Setup Cypress component testing for a project."
-    },
-    "web-worker": {
-      "factory": "./src/generators/web-worker/web-worker",
-      "schema": "./src/generators/web-worker/schema.json",
-      "description": "Creates a Web Worker."
-    }
-  }
+  "extends": ["@nx/angular"],
+  "schematics": {}
 }

package/index.d.ts

@@ -1 +1 @@
-export { fetch, navigation, optimisticUpdate, pessimisticUpdate, } from './src/runtime/nx/data-persistence';
+export * from '@nx/angular';

package/index.js

@@ -1,9 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pessimisticUpdate = exports.optimisticUpdate = exports.navigation = exports.fetch = void 0;
-var data_persistence_1 = require("./src/runtime/nx/data-persistence");
-Object.defineProperty(exports, "fetch", { enumerable: true, get: function () { return data_persistence_1.fetch; } });
-Object.defineProperty(exports, "navigation", { enumerable: true, get: function () { return data_persistence_1.navigation; } });
-Object.defineProperty(exports, "optimisticUpdate", { enumerable: true, get: function () { return data_persistence_1.optimisticUpdate; } });
-Object.defineProperty(exports, "pessimisticUpdate", { enumerable: true, get: function () { return data_persistence_1.pessimisticUpdate; } });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("@nx/angular"), exports);
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/angular/index.ts"],"names":[],"mappings":";;;AAAA,sEAK2C;AAJzC,yGAAA,KAAK,OAAA;AACL,8GAAA,UAAU,OAAA;AACV,oHAAA,gBAAgB,OAAA;AAChB,qHAAA,iBAAiB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages-legacy/angular/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B"}

package/mf/index.d.ts

@@ -1 +1 @@
-export { setRemoteUrlResolver, setRemoteDefinitions, loadRemoteModule, } from './mf';
+export * from '@nx/angular/mf';

package/mf/index.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadRemoteModule = exports.setRemoteDefinitions = exports.setRemoteUrlResolver = void 0;
-var mf_1 = require("./mf");
-Object.defineProperty(exports, "setRemoteUrlResolver", { enumerable: true, get: function () { return mf_1.setRemoteUrlResolver; } });
-Object.defineProperty(exports, "setRemoteDefinitions", { enumerable: true, get: function () { return mf_1.setRemoteDefinitions; } });
-Object.defineProperty(exports, "loadRemoteModule", { enumerable: true, get: function () { return mf_1.loadRemoteModule; } });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("@nx/angular/mf"), exports);
 //# sourceMappingURL=index.js.map

package/mf/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/angular/mf/index.ts"],"names":[],"mappings":";;;AAAA,2BAIc;AAHZ,0GAAA,oBAAoB,OAAA;AACpB,0GAAA,oBAAoB,OAAA;AACpB,sGAAA,gBAAgB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages-legacy/angular/mf/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B"}

package/module-federation/index.d.ts

@@ -1,2 +1 @@
-export { withModuleFederation } from '../src/utils/mf/with-module-federation';
-export { withModuleFederationForSSR } from '../src/utils/mf/with-module-federation-ssr';
+export * from '@nx/angular/module-federation';

package/module-federation/index.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withModuleFederationForSSR = exports.withModuleFederation = void 0;
-var with_module_federation_1 = require("../src/utils/mf/with-module-federation");
-Object.defineProperty(exports, "withModuleFederation", { enumerable: true, get: function () { return with_module_federation_1.withModuleFederation; } });
-var with_module_federation_ssr_1 = require("../src/utils/mf/with-module-federation-ssr");
-Object.defineProperty(exports, "withModuleFederationForSSR", { enumerable: true, get: function () { return with_module_federation_ssr_1.withModuleFederationForSSR; } });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("@nx/angular/module-federation"), exports);
 //# sourceMappingURL=index.js.map

package/module-federation/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/angular/module-federation/index.ts"],"names":[],"mappings":";;;AAAA,iFAA8E;AAArE,8HAAA,oBAAoB,OAAA;AAC7B,yFAAwF;AAA/E,wIAAA,0BAA0B,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages-legacy/angular/module-federation/index.ts"],"names":[],"mappings":";;;AAAA,wEAA8C"}

package/ng-package.json

@@ -3,7 +3,10 @@
   "lib": {
     "entryFile": "index.ts"
   },
+  "dest": "../../build/packages/angular-legacy",
+  "deleteDestPath": false,
   "allowedNonPeerDependencies": [
+    "@nx/",
     "@nrwl/",
     "@angular-devkit",
     "@angular-eslint/",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nrwl/angular",
-  "version": "16.0.0-beta.0",
+  "version": "16.0.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
     "url": "https://github.com/nrwl/nx.git",
-    "directory": "packages/angular"
+    "directory": "packages-legacy/angular"
   },
   "keywords": [
     "Monorepo",
@@ -59,49 +59,16 @@
   "homepage": "https://nx.dev",
   "builders": "./executors.json",
   "schematics": "./generators.json",
-  "ng-update": {
-    "requirements": {},
-    "migrations": "./migrations.json"
-  },
   "dependencies": {
-    "@nrwl/cypress": "16.0.0-beta.0",
-    "@nrwl/devkit": "16.0.0-beta.0",
-    "@nrwl/jest": "16.0.0-beta.0",
-    "@nrwl/js": "16.0.0-beta.0",
-    "@nrwl/linter": "16.0.0-beta.0",
-    "@nrwl/webpack": "16.0.0-beta.0",
-    "@nrwl/workspace": "16.0.0-beta.0",
-    "@phenomnomnominal/tsquery": "~5.0.1",
-    "chalk": "^4.1.0",
-    "chokidar": "^3.5.1",
-    "enquirer": "^2.3.6",
-    "http-server": "^14.1.0",
-    "ignore": "^5.0.4",
-    "magic-string": "~0.26.2",
-    "minimatch": "3.0.5",
-    "semver": "7.3.4",
-    "ts-node": "10.9.1",
-    "tsconfig-paths": "^4.1.2",
-    "tslib": "^2.3.0",
-    "webpack": "^5.75.0",
-    "webpack-merge": "5.7.3"
-  },
-  "peerDependencies": {
-    "@angular-devkit/build-angular": ">= 14.0.0 < 16.0.0",
-    "@angular-devkit/core": ">= 14.0.0 < 16.0.0",
-    "@angular-devkit/schematics": ">= 14.0.0 < 16.0.0",
-    "@nguniversal/builders": ">= 14.0.0 < 16.0.0",
-    "@schematics/angular": ">= 14.0.0 < 16.0.0",
-    "rxjs": "^6.5.3 || ^7.5.0"
-  },
-  "peerDependenciesMeta": {
-    "@nguniversal/builders": {
-      "optional": true
-    }
+    "@nx/angular": "16.0.0-beta.2",
+    "tslib": "^2.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
+  "nx-migrations": {
+    "migrations": "@nx/angular/migrations.json"
+  },
   "module": "fesm2015/nrwl-angular.mjs",
   "es2020": "fesm2020/nrwl-angular.mjs",
   "esm2020": "esm2020/nrwl-angular.mjs",
@@ -109,5 +76,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "1e31d4726f2c623ede0c515429aa842e943dba47"
+  "gitHead": "0d7dbbc5254390f53a28d94de536da916ed06a70"
 }

package/plugins/component-testing.d.ts

@@ -1,38 +1 @@
-import { NxComponentTestingOptions } from '@nrwl/cypress/plugins/cypress-preset';
-import type { BrowserBuilderSchema } from '../src/builders/webpack-browser/schema';
-/**
- * Angular nx preset for Cypress Component Testing
- *
- * This preset contains the base configuration
- * for your component tests that nx recommends.
- * including a devServer that supports nx workspaces.
- * you can easily extend this within your cypress config via spreading the preset
- * @example
- * export default defineConfig({
- *   component: {
- *     ...nxComponentTestingPreset(__filename)
- *     // add your own config here
- *   }
- * })
- *
- * @param pathToConfig will be used for loading project options and to construct the output paths for videos and screenshots
- * @param options override options
- */
-export declare function nxComponentTestingPreset(pathToConfig: string, options?: NxComponentTestingOptions): {
-    specPattern: string[];
-    devServer: {
-        options: {
-            projectConfig: {
-                root: string;
-                sourceRoot: string;
-                buildOptions: BrowserBuilderSchema;
-            };
-        };
-        framework: "angular";
-        bundler: "webpack";
-    };
-    videosFolder: string;
-    screenshotsFolder: string;
-    video: boolean;
-    chromeWebSecurity: boolean;
-};
+export * from '@nx/angular/plugins/component-testing';