@o3r/create 10.0.0-next.9 → 10.0.0-prerelease.2

package/README.md

@@ -1,6 +1,6 @@
 <h1 align="center">Otter project initializer</h1>
 <p align="center">
-  <img src="https://raw.githubusercontent.com/AmadeusITGroup/otter/main/.attachments/otter.png" alt="Super cute Otter!" width="40%"/>
+  <img src="https://raw.githubusercontent.com/AmadeusITGroup/otter/main/assets/logo/otter.png" alt="Super cute Otter!" width="40%"/>
 </p>
 
 ## Create an Otter application

package/index.js

@@ -3,9 +3,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_child_process_1 = require("node:child_process");
 const node_path_1 = require("node:path");
+const node_fs_1 = require("node:fs");
 const minimist = require("minimist");
-const { properties } = require(require.resolve('@schematics/angular/ng-new/schema').replace(/\.js$/, '.json'));
-const { version } = require((0, node_path_1.resolve)(__dirname, 'package.json'));
+const { properties } = JSON.parse((0, node_fs_1.readFileSync)(require.resolve('@schematics/angular/ng-new/schema').replace(/\.js$/, '.json'), { encoding: 'utf-8' }));
+const { version } = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(__dirname, 'package.json'), { encoding: 'utf-8' }));
 const logo = `
 
                         &BPPPB                    &                    &BPGB&
@@ -68,9 +69,14 @@ const logo = `
 `;
 const binPath = (0, node_path_1.join)(require.resolve('@angular/cli/package.json'), '../bin/ng.js');
 const args = process.argv.slice(2).filter((a) => a !== '--create-application');
+// Default styling to Sass
 if (!args.some((a) => a.startsWith('--style'))) {
     args.push('--style', 'scss');
 }
+// Default Preset to Basic
+if (!args.some((a) => a.startsWith('--preset'))) {
+    args.push('--preset', 'basic');
+}
 const hasPackageManagerArg = args.some((a) => a.startsWith('--package-manager'));
 if (!hasPackageManagerArg) {
     const packageManager = process.env.npm_config_user_agent?.split('/')[0];
@@ -95,12 +101,22 @@ const isNgNewOptions = (arg) => {
         return entries.some(([key]) => [`--${key}`, `--no-${key}`, `--${key.replaceAll(/([A-Z])/g, '-$1').toLowerCase()}`, `--no-${key.replaceAll(/([A-Z])/g, '-$1').toLowerCase()}`].includes(arg));
     }
     else if (arg.startsWith('-')) {
-        return entries.some(([_, { alias }]) => alias && arg === `-${alias}`);
+        return entries.some(([, { alias }]) => alias && arg === `-${alias}`);
     }
     return true;
 };
+const schematicsCliOptions = Object.entries(argv)
+    .filter(([key]) => key !== '_')
+    .map(([key, value]) => value === true && [key] || value === false && key.length > 1 && [`no-${key}`] || [key, value])
+    .map(([key, value]) => {
+    const optionKey = key.length > 1 ? `--${key}` : `-${key}`;
+    return typeof value === 'undefined' ? [optionKey] : [optionKey, value];
+});
 const createNgProject = () => {
-    const { error } = (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'new', ...args.filter(isNgNewOptions)], {
+    const options = schematicsCliOptions
+        .filter(([key]) => isNgNewOptions(key))
+        .flat();
+    const { error } = (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'new', ...argv._, ...options, '--skip-install'], {
         stdio: 'inherit'
     });
     if (error) {
@@ -109,9 +125,11 @@ const createNgProject = () => {
         process.exit(1);
     }
 };
-const addOtterCore = (relativeDirectory = '.') => {
+const addOtterFramework = (relativeDirectory = '.') => {
     const cwd = (0, node_path_1.resolve)(process.cwd(), relativeDirectory);
-    const { error } = (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'add', `@o3r/core@${version || 'latest'}`, ...args.filter((arg) => arg.startsWith('-'))], {
+    const options = schematicsCliOptions
+        .flat();
+    const { error } = (0, node_child_process_1.spawnSync)(process.execPath, [binPath, 'add', `@o3r/core@${version || 'latest'}`, ...options], {
         stdio: 'inherit',
         cwd
     });
@@ -124,4 +142,4 @@ const addOtterCore = (relativeDirectory = '.') => {
 const projectFolder = argv._[0]?.replaceAll(' ', '-').toLowerCase() || '.';
 console.info(logo);
 createNgProject();
-addOtterCore(projectFolder);
+addOtterFramework(projectFolder);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@o3r/create",
-  "version": "10.0.0-next.9",
+  "version": "10.0.0-prerelease.2",
   "description": "Create a new Otter based application",
   "keywords": [
     "create",
@@ -15,43 +15,46 @@
     "prepare:publish": "prepare-publish ./dist"
   },
   "dependencies": {
-    "@angular/cli": "~16.2.0",
-    "@schematics/angular": "~16.2.0",
-    "minimist": "^1.2.6"
+    "@angular/cli": "~17.0.3",
+    "@schematics/angular": "~17.0.3",
+    "minimist": "^1.2.6",
+    "tslib": "^2.5.3"
   },
   "devDependencies": {
-    "@angular-eslint/eslint-plugin": "~16.1.0",
-    "@angular-eslint/eslint-plugin-template": "~16.1.0",
-    "@nx/jest": "~16.8.0",
-    "@nx/js": "~16.8.0",
-    "@nx/linter": "~16.8.0",
-    "@o3r/build-helpers": "^10.0.0-next.9",
-    "@o3r/dev-tools": "^10.0.0-next.9",
-    "@o3r/eslint-config-otter": "^10.0.0-next.9",
-    "@o3r/eslint-plugin": "^10.0.0-next.9",
+    "@angular-eslint/eslint-plugin": "~17.2.0",
+    "@angular-eslint/eslint-plugin-template": "~17.2.0",
+    "@nx/eslint": "~17.2.0",
+    "@nx/eslint-plugin": "~17.2.0",
+    "@nx/jest": "~17.2.0",
+    "@nx/js": "~17.2.0",
+    "@o3r/build-helpers": "^10.0.0-prerelease.2",
+    "@o3r/eslint-config-otter": "^10.0.0-prerelease.2",
+    "@o3r/eslint-plugin": "^10.0.0-prerelease.2",
+    "@o3r/test-helpers": "^10.0.0-prerelease.2",
     "@types/jest": "~29.5.2",
     "@types/minimist": "^1.2.2",
-    "@types/node": "^18.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "^5.59.9",
-    "cpy-cli": "^4.2.0",
+    "@types/node": "^20.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.11.0",
+    "cpy-cli": "^5.0.0",
     "eslint": "^8.42.0",
     "eslint-import-resolver-node": "^0.3.4",
-    "eslint-plugin-jest": "~27.2.3",
-    "eslint-plugin-jsdoc": "~46.8.0",
+    "eslint-plugin-jest": "~27.6.0",
+    "eslint-plugin-jsdoc": "~48.0.0",
     "eslint-plugin-prefer-arrow": "~1.2.3",
-    "eslint-plugin-unicorn": "^47.0.0",
+    "eslint-plugin-unicorn": "^50.0.0",
     "jest": "~29.7.0",
     "jest-junit": "~16.0.0",
-    "nx": "~16.8.0",
+    "jsonc-eslint-parser": "~2.4.0",
+    "nx": "~17.2.0",
     "rimraf": "^5.0.1",
     "rxjs": "^7.8.1",
     "ts-jest": "~29.1.1",
-    "type-fest": "^3.12.0",
-    "typescript": "~5.1.6"
+    "type-fest": "^4.3.1",
+    "typescript": "~5.2.2"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=18.0.0"
   },
   "contributors": [
     {
@@ -116,5 +119,6 @@
   ],
   "bugs": "https://github.com/AmadeusITGroup/otter/issues",
   "repository": "https://github.com/AmadeusITGroup/otter",
-  "license": "BSD-3-Clause"
+  "license": "BSD-3-Clause",
+  "homepage": "https://amadeusitgroup.github.io/otter/"
 }