@o3r/core 12.1.0-prerelease.85 → 12.1.0-prerelease.86

package/README.md

@@ -104,40 +104,51 @@ Today the following presets are available.
 
 ### Preset Basic
 
-This preset is the default one, it does not add any additional modules.
+This preset does not add any additional modules.
+
+### Preset Recommended
+
+This preset is adding recommended Otter modules and features. This preset is the default one.
+
+* [@o3r/eslint-config](https://www.npmjs.com/package/@o3r/eslint-config) (or [@o3r/eslint-config-otter](https://www.npmjs.com/package/@o3r/eslint-config-otter) for legacy configuration)
+* [@o3r/testing](https://www.npmjs.com/package/@o3r/testing)
+* [@o3r/workspace](https://www.npmjs.com/package/@o3r/workspace) specific features:
+  * Renovate configuration
+  * VSCode Tooling
+  * pre-commit checks
 
 ### Preset CMS
 
 Will add all the modules allowing the allowing the full managing of an application by the CMS.
-It includes the following modules:
+On top of the Otter recommended modules, it includes the following ones:
 
-* @o3r/localization
-* @o3r/styling
-* @o3r/components
-* @o3r/configuration
-* @o3r/dynamic-content
-* @o3r/rules-engine
+* [@o3r/localization](https://www.npmjs.com/package/@o3r/localization)
+* [@o3r/styling](https://www.npmjs.com/package/@o3r/styling)
+* [@o3r/components](https://www.npmjs.com/package/@o3r/components)
+* [@o3r/configuration](https://www.npmjs.com/package/@o3r/configuration)
+* [@o3r/dynamic-content](https://www.npmjs.com/package/@o3r/dynamic-content)
+* [@o3r/rules-engine](https://www.npmjs.com/package/@o3r/rules-engine)
 
 ### Preset All
 
 Will add all official modules provided by the Otter Framework.
-Currently the list of modules is the following:
-
-* @o3r/analytics
-* @o3r/apis-manager
-* @o3r/application
-* @o3r/components
-* @o3r/configuration
-* @o3r/dynamic-content
-* @o3r/eslint-config-otter
-* @o3r/eslint-plugin
-* @o3r/forms
-* @o3r/localization
-* @o3r/logger
-* @o3r/rules-engine
-* @o3r/store-sync
-* @o3r/stylelint-plugin
-* @o3r/styling
+On top of the Otter recommended modules, it includes the following ones:
+
+* [@o3r/analytics](https://www.npmjs.com/package/@o3r/analytics)
+* [@o3r/apis-manager](https://www.npmjs.com/package/@o3r/apis-manager)
+* [@o3r/application](https://www.npmjs.com/package/@o3r/application)
+* [@o3r/components](https://www.npmjs.com/package/@o3r/components)
+* [@o3r/configuration](https://www.npmjs.com/package/@o3r/configuration)
+* [@o3r/dynamic-content](https://www.npmjs.com/package/@o3r/dynamic-content)
+* [@o3r/eslint-config-otter](https://www.npmjs.com/package/@o3r/eslint-config-otter)
+* [@o3r/eslint-plugin](https://www.npmjs.com/package/@o3r/eslint-plugin)
+* [@o3r/forms](https://www.npmjs.com/package/@o3r/forms)
+* [@o3r/localization](https://www.npmjs.com/package/@o3r/localization)
+* [@o3r/logger](https://www.npmjs.com/package/@o3r/logger)
+* [@o3r/rules-engine](https://www.npmjs.com/package/@o3r/rules-engine)
+* [@o3r/store-sync](https://www.npmjs.com/package/@o3r/store-sync)
+* [@o3r/stylelint-plugin](https://www.npmjs.com/package/@o3r/stylelint-plugin)
+* [@o3r/styling](https://www.npmjs.com/package/@o3r/styling)
 
 ## External (Custom) Preset
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/core",
-  "version": "12.1.0-prerelease.85",
+  "version": "12.1.0-prerelease.86",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
     "@ngrx/entity": "^19.0.0",
     "@ngrx/store": "^19.0.0",
     "@nx/angular": "~20.4.0",
-    "@o3r/telemetry": "^12.1.0-prerelease.85",
+    "@o3r/telemetry": "^12.1.0-prerelease.86",
     "@schematics/angular": "^19.0.0",
     "chokidar": "^4.0.3",
     "globby": "^11.1.0",
@@ -78,7 +78,7 @@
     }
   },
   "dependencies": {
-    "@o3r/schematics": "^12.1.0-prerelease.85",
+    "@o3r/schematics": "^12.1.0-prerelease.86",
     "tslib": "^2.6.2",
     "uuid": "^11.0.5"
   },
@@ -91,7 +91,7 @@
     "@ngrx/store": "~19.0.0",
     "@ngrx/store-devtools": "~19.0.0",
     "@nx/eslint-plugin": "~20.4.0",
-    "@o3r/store-sync": "^12.1.0-prerelease.85",
+    "@o3r/store-sync": "^12.1.0-prerelease.86",
     "@stylistic/eslint-plugin": "~3.1.0",
     "@types/jest": "~29.5.2",
     "@typescript-eslint/eslint-plugin": "~8.26.0",

package/schematics/add-modules/schema.d.ts

@@ -3,7 +3,7 @@ import type { PresetNames } from '../ng-add/schema';
 export interface NgAddModulesSchematicsSchema extends SchematicOptionObject {
     /** Project name */
     projectName?: string | undefined;
-    /** reset of module list to automatically install */
+    /** Preset of module list to automatically install */
     preset?: PresetNames | undefined;
     /** Preset of non-official module list to automatically install */
     externalPresets?: string | undefined;

package/schematics/add-modules/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/add-modules/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,4BAA6B,SAAQ,qBAAqB;IACzE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oDAAoD;IACpD,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAEjC,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/add-modules/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,4BAA6B,SAAQ,qBAAqB;IACzE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,qDAAqD;IACrD,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAEjC,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC"}

package/schematics/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAmGpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,IAAI,EACL,MAAM,4BAA4B,CAAC;AAuGpC;;;GAGG;AACH,eAAO,MAAM,KAAK,wBAAgC,CAAC"}

package/schematics/ng-add/index.js

@@ -10,6 +10,7 @@ const schematics_3 = require("@o3r/schematics");
 const dependencies_1 = require("@schematics/angular/utility/dependencies");
 const presets_1 = require("../shared/presets");
 const index_1 = require("./project-setup/index");
+const utils_1 = require("./utils");
 const workspacePackageName = '@o3r/workspace';
 const o3rDevDependencies = [
     '@o3r/schematics'
@@ -55,7 +56,7 @@ function ngAddFn(options) {
             (0, schematics_2.registerPackageCollectionSchematics)(corePackageJsonContent),
             async (t, c) => {
                 const { preset, externalPresets, ...forwardOptions } = options;
-                const presetOptions = { projectName: forwardOptions.projectName, exactO3rVersion: forwardOptions.exactO3rVersion, forwardOptions };
+                const presetOptions = { projectName: forwardOptions.projectName, exactO3rVersion: forwardOptions.exactO3rVersion, forwardOptions, isUsingEslintLegacy: (0, utils_1.isUsingLegacyConfig)(t) };
                 const presetRunner = await presets_1.presets[preset](presetOptions);
                 const externalPresetRunner = externalPresets ? await (0, presets_1.getExternalPreset)(externalPresets, t, c)(presetOptions) : undefined;
                 const modules = [...new Set([...(presetRunner.modules || []), ...(externalPresetRunner?.modules || [])])];

package/schematics/ng-add/project-setup/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/project-setup/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAML,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAQzB,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,WAAW,CAAC;AAenB;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,qBAAqB,EAAE,yBAAyB,wBAAwB,KAAG,IA+ClH,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/ng-add/project-setup/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAML,KAAK,wBAAwB,EAC9B,MAAM,iBAAiB,CAAC;AAQzB,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,WAAW,CAAC;AAWnB;;;;;GAKG;AACH,eAAO,MAAM,cAAc,GAAI,SAAS,qBAAqB,EAAE,yBAAyB,wBAAwB,KAAG,IAoDlH,CAAC"}

package/schematics/ng-add/project-setup/index.js

@@ -9,14 +9,13 @@ const index_1 = require("../../rule-factories/index");
 const update_builders_names_1 = require("../updates-for-v8/cms-adapters/update-builders-names");
 const update_generators_names_1 = require("../updates-for-v8/generators/update-generators-names");
 const replaced_packages_1 = require("../updates-for-v8/replaced-packages");
-const index_2 = require("../utils/index");
 /**
  * Enable all the otter features requested by the user
  * Install all the related dependencies and import the features inside the application
  * @param options installation options to pass to the all the other packages' installation
  * @param dependenciesSetupConfig
  */
-const prepareProject = (options, dependenciesSetupConfig) => async (tree, context) => {
+const prepareProject = (options, dependenciesSetupConfig) => (tree, context) => {
     const coreSchematicsFolder = path.resolve(__dirname, '..');
     const corePackageJsonPath = path.resolve(coreSchematicsFolder, '..', '..', 'package.json');
     const corePackageJsonContent = JSON.parse(fs.readFileSync(corePackageJsonPath, { encoding: 'utf8' }));
@@ -24,14 +23,12 @@ const prepareProject = (options, dependenciesSetupConfig) => async (tree, contex
         context.logger.error('Could not find @o3r/core package. Are you sure it is installed?');
     }
     const o3rCoreVersion = corePackageJsonContent.version;
-    const installOtterLinter = await (0, index_2.shouldOtterLinterBeInstalled)(context, tree);
     const workspaceConfig = (0, schematics_2.getWorkspaceConfig)(tree);
     const workspaceProject = (options.projectName && workspaceConfig?.projects?.[options.projectName]) || undefined;
     const projectType = workspaceProject?.projectType;
     const depsInfo = (0, schematics_2.getO3rPeerDeps)(corePackageJsonPath);
     const internalPackagesToInstallWithNgAdd = Array.from(new Set([
         ...(projectType === 'application' ? ['@o3r/application'] : []),
-        ...(installOtterLinter ? [`@o3r/eslint-config${(0, index_2.isUsingFlatConfig)(tree) ? '' : '-otter'}`] : []),
         ...depsInfo.o3rPeerDeps
     ]));
     const projectDirectory = workspaceProject?.root;
@@ -47,6 +44,13 @@ const prepareProject = (options, dependenciesSetupConfig) => async (tree, contex
         };
     });
     (dependenciesSetupConfig.ngAddToRun ||= []).push(...internalPackagesToInstallWithNgAdd);
+    let hasEslint = false;
+    try {
+        const eslintPackage = 'eslint';
+        require.resolve(eslintPackage);
+        hasEslint = true;
+    }
+    catch { }
     const appLibRules = [
         (0, update_builders_names_1.updateBuildersNames)(),
         (0, update_generators_names_1.updateOtterGeneratorsNames)(),
@@ -57,7 +61,7 @@ const prepareProject = (options, dependenciesSetupConfig) => async (tree, contex
         (0, schematics_2.removePackages)(replaced_packages_1.packagesToRemove),
         (0, index_1.o3rBasicUpdates)(options.projectName, o3rCoreVersion, projectType),
         // task that should run after the schematics should be after the ng-add task as they will wait for the package installation before running the other dependencies
-        !options.skipLinter && installOtterLinter ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)()
+        !options.skipLinter && hasEslint ? (0, schematics_2.applyEsLintFix)() : (0, schematics_1.noop)()
     ];
     return (0, schematics_1.chain)(appLibRules);
 };

package/schematics/ng-add/schema.d.ts

@@ -1,5 +1,5 @@
 import type { SchematicOptionObject } from '@o3r/schematics';
-export type PresetNames = 'basic' | 'cms' | 'all';
+export type PresetNames = 'basic' | 'recommended' | 'cms' | 'all';
 export interface NgAddSchematicsSchema extends SchematicOptionObject {
     /** Preset of module list to automatically install */
     preset: PresetNames;

package/schematics/ng-add/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC;AAElD,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,qDAAqD;IACrD,MAAM,EAAE,WAAW,CAAC;IAEpB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IAErB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;IAEtB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,aAAa,GAAG,KAAK,GAAG,KAAK,CAAC;AAElE,MAAM,WAAW,qBAAsB,SAAQ,qBAAqB;IAClE,qDAAqD;IACrD,MAAM,EAAE,WAAW,CAAC;IAEpB,kEAAkE;IAClE,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IAEpB,+BAA+B;IAC/B,WAAW,EAAE,OAAO,CAAC;IAErB,iDAAiD;IACjD,MAAM,EAAE,OAAO,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAElD,0CAA0C;IAC1C,OAAO,EAAE,OAAO,CAAC;IAEjB,8DAA8D;IAC9D,WAAW,EAAE,OAAO,CAAC;IAErB,sEAAsE;IACtE,YAAY,EAAE,OAAO,CAAC;IAEtB,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B"}

package/schematics/ng-add/schema.json

@@ -7,9 +7,10 @@
     "preset": {
       "description": "Preset of module list to automatically install",
       "type": "string",
-      "default": "basic",
+      "default": "recommended",
       "enum": [
         "basic",
+        "recommended",
         "cms",
         "all"
       ],
@@ -18,6 +19,7 @@
         "type": "list",
         "items": [
           { "value": "basic", "label": "BASIC - Minimum plugin list to install for a basic Otter application. (details on https://www.npmjs.com/package/@o3r/core#preset-basic)" },
+          { "value": "recommended", "label": "RECOMMENDED - Add the recommended Otter modules. (details on https://www.npmjs.com/package/@o3r/core#preset-recommended)" },
           { "value": "cms", "label": "CMS - Add the Otter modules allowing the full administration of the application via the CMS. (details on https://www.npmjs.com/package/@o3r/core#preset-cms)" },
           { "value": "all", "label": "ALL - Add all the available Otter modules. (details on https://www.npmjs.com/package/@o3r/core#preset-all)" }
         ]

package/schematics/ng-add/utils/linter/index.d.ts

@@ -1,14 +1,7 @@
-import { SchematicContext, type Tree } from '@angular-devkit/schematics';
+import { type Tree } from '@angular-devkit/schematics';
 /**
- * If the ESLint FlatConfig is used in the repository
+ * Is the ESLint legacy config used in the repository
  * @param tree
  */
-export declare const isUsingFlatConfig: (tree: Tree) => boolean;
-/**
- * Checks if `eslint` package is installed. If so, ask the user for otter linter rules install.
- * Otherwise displays a message to inform the user that otter linter rules can be added later.
- * @param context Schematics context
- * @param tree
- */
-export declare const shouldOtterLinterBeInstalled: (context: SchematicContext, tree: Tree) => Promise<boolean>;
+export declare const isUsingLegacyConfig: (tree: Tree) => boolean;
 //# sourceMappingURL=index.d.ts.map

package/schematics/ng-add/utils/linter/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/utils/linter/index.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,gBAAgB,EAChB,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,MAAM,IAAI,YAAgF,CAAC;AAE7H;;;;;GAKG;AACH,eAAO,MAAM,4BAA4B,GAAU,SAAS,gBAAgB,EAAE,MAAM,IAAI,KAAG,OAAO,CAAC,OAAO,CAezG,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../schematics/ng-add/utils/linter/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,MAAM,IAAI,YAQ7C,CAAC"}

package/schematics/ng-add/utils/linter/index.js

@@ -1,34 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.shouldOtterLinterBeInstalled = exports.isUsingFlatConfig = void 0;
-const prompt_1 = require("@angular/cli/src/utilities/prompt");
+exports.isUsingLegacyConfig = void 0;
 /**
- * If the ESLint FlatConfig is used in the repository
+ * Is the ESLint legacy config used in the repository
  * @param tree
  */
-const isUsingFlatConfig = (tree) => tree.root.subfiles.some((file) => /eslint\.config\.[mc]?[jt]s$/.test(file));
-exports.isUsingFlatConfig = isUsingFlatConfig;
-/**
- * Checks if `eslint` package is installed. If so, ask the user for otter linter rules install.
- * Otherwise displays a message to inform the user that otter linter rules can be added later.
- * @param context Schematics context
- * @param tree
- */
-const shouldOtterLinterBeInstalled = async (context, tree) => {
+const isUsingLegacyConfig = (tree) => {
     const linterPackageName = 'eslint';
-    let useOtterLinter = false;
     try {
         require.resolve(`${linterPackageName}/package.json`);
-        if (context.interactive) {
-            useOtterLinter = await (0, prompt_1.askConfirmation)(`You already have ESLint installed. Would you like to add otter config rules for ESLint?
-Otherwise, you can add them later via this command: ng add @o3r/eslint-config${(0, exports.isUsingFlatConfig)(tree) ? '' : '-otter'}`, true);
-        }
     }
     catch {
-        context.logger.info(`ESLint package not installed. Skipping Otter linter phase!
-You can add Otter linter config rules later to the project via this command: ng add @o3r/eslint-config`);
+        return false;
     }
-    return useOtterLinter;
+    return !!tree.root.subfiles.some((file) => /\.eslintrc\.(?:json|js|ya?ml)?$/.test(file));
 };
-exports.shouldOtterLinterBeInstalled = shouldOtterLinterBeInstalled;
+exports.isUsingLegacyConfig = isUsingLegacyConfig;
 //# sourceMappingURL=index.js.map

package/schematics/shared/presets/basic.preset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"basic.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/basic.preset.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAgB,WAAW;;EAI1B"}
+{"version":3,"file":"basic.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/basic.preset.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,wBAAgB,WAAW;;EAO1B"}

package/schematics/shared/presets/basic.preset.js

@@ -1,13 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.basicPreset = basicPreset;
+const schematics_1 = require("@angular-devkit/schematics");
+const schematics_2 = require("@o3r/schematics");
 const helpers_1 = require("./helpers");
+const skipWorkspaceFeature = {
+    skipVscodeTools: true,
+    skipRenovate: true,
+    skipPreCommitChecks: true
+};
 /**
  * Default preset with the basic of Otter Framework (no additional modules)
  */
 function basicPreset() {
     return {
-        rule: (0, helpers_1.defaultPresetRuleFactory)([])
+        rule: (0, schematics_1.chain)([
+            (0, schematics_2.setupSchematicsParamsForProject)({ '@o3r/workspace:ng-add': skipWorkspaceFeature }),
+            (0, helpers_1.defaultPresetRuleFactory)([])
+        ])
     };
 }
 //# sourceMappingURL=basic.preset.js.map

package/schematics/shared/presets/helpers.js

@@ -11,7 +11,7 @@ const schematics_2 = require("@o3r/schematics");
  * @param options
  */
 function defaultPresetRuleFactory(moduleToInstall, options = {}) {
-    return (tree, _context) => {
+    return (tree) => {
         const corePackageJsonContent = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', '..', 'package.json'), { encoding: 'utf8' }));
         const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
         if (moduleToInstall.length === 0) {

package/schematics/shared/presets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,oBAAoB,CAAC;AAE5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,OAIrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,OAAO,EACR,MAAM,oBAAoB,CAAC;AAK5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AAEnC,eAAO,MAAM,OAAO,EAAE,OAKrB,CAAC"}

package/schematics/shared/presets/index.js

@@ -5,10 +5,12 @@ const tslib_1 = require("tslib");
 const all_preset_1 = require("./all.preset");
 const basic_preset_1 = require("./basic.preset");
 const cms_preset_1 = require("./cms.preset");
+const recommended_preset_1 = require("./recommended.preset");
 tslib_1.__exportStar(require("./external.preset"), exports);
 tslib_1.__exportStar(require("./preset.interface"), exports);
 exports.presets = {
     basic: basic_preset_1.basicPreset,
+    recommended: recommended_preset_1.recommendedPreset,
     cms: cms_preset_1.cmsPreset,
     all: all_preset_1.allPreset
 };

package/schematics/shared/presets/preset.interface.d.ts

@@ -11,6 +11,11 @@ export interface PresetOptions {
     dependenciesSetupConfig?: SetupDependenciesOptions;
     /** Use a pinned version for otter packages */
     exactO3rVersion?: boolean;
+    /**
+     * Is using Eslint legacy configuration.
+     * This option should be removed when @o3r/eslint-config-otter won't be supported anymore.
+     */
+    isUsingEslintLegacy?: boolean;
 }
 /** Definition of the modules preset */
 export interface Preset {

package/schematics/shared/presets/preset.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preset.interface.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/preset.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAE7B,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oDAAoD;IACpD,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,uDAAuD;IACvD,uBAAuB,CAAC,EAAE,wBAAwB,CAAC;IAEnD,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,uCAAuC;AACvC,MAAM,WAAW,MAAM;IACrB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,4CAA4C;IAC5C,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,0DAA0D;AAC1D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAEjF,kBAAkB;AAClB,MAAM,MAAM,OAAO,GAAG;KAAG,CAAC,IAAI,WAAW,GAAG,aAAa;CAAE,CAAC"}
+{"version":3,"file":"preset.interface.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/preset.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EACV,WAAW,EACZ,MAAM,qBAAqB,CAAC;AAE7B,oCAAoC;AACpC,MAAM,WAAW,aAAa;IAC5B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,oDAAoD;IACpD,cAAc,CAAC,EAAE,qBAAqB,CAAC;IAEvC,uDAAuD;IACvD,uBAAuB,CAAC,EAAE,wBAAwB,CAAC;IAEnD,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,uCAAuC;AACvC,MAAM,WAAW,MAAM;IACrB,8CAA8C;IAC9C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB,4CAA4C;IAC5C,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,0DAA0D;AAC1D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;AAEjF,kBAAkB;AAClB,MAAM,MAAM,OAAO,GAAG;KAAG,CAAC,IAAI,WAAW,GAAG,aAAa;CAAE,CAAC"}

package/schematics/shared/presets/recommended.preset.d.ts

@@ -0,0 +1,10 @@
+import type { PresetOptions } from './preset.interface';
+/**
+ * Preset with Otter recommended modules
+ * @param options
+ */
+export declare function recommendedPreset(options: PresetOptions): {
+    modules: string[];
+    rule: import("@angular-devkit/schematics").Rule;
+};
+//# sourceMappingURL=recommended.preset.d.ts.map

package/schematics/shared/presets/recommended.preset.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"recommended.preset.d.ts","sourceRoot":"","sources":["../../../../schematics/shared/presets/recommended.preset.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,aAAa;;;EAUvD"}

package/schematics/shared/presets/recommended.preset.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recommendedPreset = recommendedPreset;
+const helpers_1 = require("./helpers");
+/**
+ * Preset with Otter recommended modules
+ * @param options
+ */
+function recommendedPreset(options) {
+    const modules = [
+        options.isUsingEslintLegacy ? '@o3r/eslint-config-otter' : '@o3r/eslint-config',
+        '@o3r/testing'
+    ];
+    return {
+        modules,
+        rule: (0, helpers_1.defaultPresetRuleFactory)(modules, options)
+    };
+}
+//# sourceMappingURL=recommended.preset.js.map