@eui/cli 21.0.0-alpha.27 → 21.0.0-alpha.29

package/lib/build.js

@@ -119,6 +119,11 @@ const copyAngular = (targetPath, cliConfig, overwrite = true) => {
       }
       return Promise.resolve();
     })
+    .then(() => {
+      if (cliConfig.packageManager === 'pnpm') {
+        utils.copy(path.join(config.pnpmOptionPath, 'package.json'), path.join(targetPath, 'package.json'));
+      }    
+    })
     .catch((e) => {
       throw e;
     })

package/lib/cli.js

@@ -9,7 +9,7 @@ const defaultConfig = {
   appFeatures: [],
   groupId: 'ec.europa.digit',
   artifactId: 'myapp',
-  useYarn: true,
+  packageManager: 'yarn',
   npmInstall: true,
   appStart: true,
 };
@@ -101,9 +101,28 @@ module.exports.start = (options) => {
     {
       name: 'npmInstall',
       type: 'confirm',
-      message: 'Yarn install dependencies when the app is generated :',
+      message: 'Install dependencies when the app is generated :',
       default: defaultConfig.npmInstall
-    }
+    },
+
+    {
+      type: 'list',
+      name: 'packageManager',
+      message: 'Package manager for installation :',
+      choices: [
+        { name: 'Yarn 1.x (default)', value: 'yarn' },
+        { name: 'Pnpm - experimental', value: 'pnpm' },
+      ],
+      default: 0,
+      when: function (answers) {
+        return (answers.npmInstall);
+      },      
+      validate: function (value) {
+        if (value.length) {
+          return true;
+        }
+      }
+    },    
   ])
     .then((answers) => {
       let outputConfig;
@@ -117,6 +136,5 @@ module.exports.start = (options) => {
     .catch((e) => {
       throw e;
     })
-
 }
 

package/lib/config.js

@@ -19,6 +19,7 @@ module.exports.optionsPath = {
     "ecl-ec": path.join(skeletonsPath, '_angular/options/ecl-ec'),
     "ecl-eu": path.join(skeletonsPath, '_angular/options/ecl-eu'),
 };
+module.exports.pnpmOptionPath = path.join(skeletonsPath, '_angular/options/pnpm');
 
 module.exports.version = version;
 

package/lib/install.js

@@ -30,7 +30,12 @@ const install = (cliConfig, targetPath) => {
 
   return Promise.resolve()
     .then(() => {
-      return execSync("yarn", { cwd: wd, stdio: "inherit" });
+      if (cliConfig.packageManager === 'pnpm') {
+        return execSync("pnpm install", { cwd: wd, stdio: "inherit" });
+        
+      } else {
+        return execSync("yarn", { cwd: wd, stdio: "inherit" });
+      }
     })
 
     .catch((e) => {

package/lib/skeletons/_angular/base/angular.json

@@ -21,7 +21,7 @@
             },
             "architect": {
                 "build": {
-                    "builder": "@angular-devkit/build-angular:application",
+                    "builder": "@angular/build:application",
                     "options": {
                         "outputPath": "dist",
                         "index": "src/index.html",
@@ -105,7 +105,7 @@
                     "defaultConfiguration": "production"
                 },
                 "serve": {
-                    "builder": "@angular-devkit/build-angular:dev-server",
+                    "builder": "@angular/build:dev-server",
                     "options": {
                         "buildTarget": "app:build"
                     },
@@ -122,29 +122,6 @@
                         }
                     },
                     "defaultConfiguration": "development"
-                },
-                "lint": {
-                    "builder": "@angular-eslint/builder:lint",
-                    "options": {
-                        "lintFilePatterns": ["src/**/*.ts", "src/**/*.html"],
-                        "eslintConfig": "src/.eslintrc.json"
-                    }
-                },
-                "test": {
-                    "builder": "@angular-devkit/build-angular:karma",
-                    "options": {
-                        "polyfills": ["zone.js", "zone.js/testing"],
-                        "tsConfig": "src/tsconfig.spec.json",
-                        "karmaConfig": "src/karma.conf.js",
-                        "inlineStyleLanguage": "scss",
-                        "assets": [
-                            {
-                                "glob": "**/*",
-                                "input": "node_modules/@eui/core/assets/",
-                                "output": "./assets"
-                            }
-                        ]
-                    }
                 }
             }
         }

package/lib/skeletons/_angular/base/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.27",
+    "version": "21.0.0-alpha.29",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",
@@ -21,7 +21,7 @@
     },
     "private": true,
     "dependencies": {
-        "@eui/deps-base": "21.0.0-alpha.27"
+        "@eui/deps-base": "21.0.0-alpha.29"
     },
     "devDependencies": {
         "npm-run-all": "4.1.5",
@@ -31,5 +31,9 @@
         "body-parser": "1.20.3",
         "express": "4.21.2"
     },
-    "resolutions": {}
+    "resolutions": {
+        "semver": ">=7.5.2",
+        "dompurify": ">=3.2.4",
+        "tmp": ">0.2.4"
+    }
 }

package/lib/skeletons/_angular/base-mobile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "eui-angular-app",
-    "version": "21.0.0-alpha.27",
+    "version": "21.0.0-alpha.29",
     "license": "EUPL-1.1",
     "scripts": {
         "ng": "ng",

package/lib/skeletons/_angular/options/pnpm/package.json

@@ -0,0 +1,72 @@
+{
+    "name": "eui-angular-app",
+    "version": "21.0.0-alpha.29",
+    "license": "EUPL-1.1",
+    "scripts": {
+        "ng": "ng",
+        "start-mock-server": "nodemon --watch ./mock ./mock/server.js",
+        "start-serve": "eui-cli serve-app --configuration=proxy-mock",
+        "start": "npm-run-all --parallel start-mock-server start-serve",
+        "start-proxy": "eui-cli serve-app --configuration=proxy",
+        "start-local": "eui-cli serve-app",
+        "build": "eui-cli build-app",
+        "build-dev": "eui-cli build-app --configuration=development --configEnvTarget=dev",
+        "build-prod": "eui-cli build-app --configuration=production-optimized --configEnvTarget=prod --skipLint --skipTest",
+        "app:inject-config": "eui-cli inject-config-app",
+        "generate-changelog": "eui-cli generate-changelog",
+        "generate-sprite": "eui-cli generate-sprite"
+    },
+    "private": true,
+    "dependencies": {
+        "@angular/animations": "21.0.0-next.5",
+        "@angular/common": "21.0.0-next.5",
+        "@angular/compiler": "21.0.0-next.5",
+        "@angular/core": "21.0.0-next.5",
+        "@angular/forms": "21.0.0-next.5",
+        "@angular/platform-browser": "21.0.0-next.5",
+        "@angular/platform-browser-dynamic": "21.0.0-next.5",
+        "@angular/router": "21.0.0-next.5",
+        "@angular/elements": "21.0.0-next.5",
+        "@angular/language-service": "21.0.0-next.5",
+        "@angular/service-worker": "21.0.0-next.5",
+        "@angular/cdk": "21.0.0-next.5",
+        "@angular/material": "21.0.0-next.5",
+        "@angular/material-moment-adapter": "21.0.0-next.5",
+        "rxjs": "7.8.2",
+        "tslib": "2.8.1",
+        "zone.js": "0.15.1",
+        "@types/lodash": "4.17.20",
+        "intl": "1.2.5",
+        "deepmerge-ts": "7.1.5",
+        "@ngx-translate/core": "15.0.0",
+        "@ngx-translate/http-loader": "8.0.0",
+        "reselect": "5.1.1",
+        "ngx-mask": "20.0.3",
+        "cleave.js": "1.6.0",
+        "hammerjs": "2.0.8",
+        "pikaday": "1.8.2",
+        "lodash-es": "4.17.21",
+        "localforage": "1.10.0",
+        "@eui/base": "21.0.0-alpha.29",
+        "@eui/core": "21.0.0-alpha.29",
+        "@eui/styles": "21.0.0-alpha.29",
+        "@eui/components": "21.0.0-alpha.29",
+        "@eui/ecl": "21.0.0-alpha.29",
+        "@eui/showcase": "21.0.0-alpha.29"
+    },
+    "devDependencies": {
+        "@angular/build": "21.0.0-next.5",
+        "@angular/compiler-cli": "21.0.0-next.5",
+        "@angular/cli": "21.0.0-next.5",
+        "@eui/cli": "21.0.0-alpha.29",
+        "ng-packagr": "21.0.0-next.3",
+        "typescript": "5.9.2",
+        "npm-run-all": "4.1.5",
+        "json-server": "1.0.0-beta.3",
+        "nodemon": "3.1.10",
+        "lowdb": "1.0.0",
+        "body-parser": "2.2.0",
+        "express": "5.1.0",
+        "uuid": "13.0.0"
+    }
+}

package/lib/utils.js

@@ -173,6 +173,10 @@ module.exports.remove = (path) => {
   fse.removeSync(path);
 }
 
+module.exports.copy = (origin, dest) => {
+  fse.copySync(origin, dest);
+}
+
 const log = (msg, type) => {
   var msgContent;
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/cli",
-    "version": "21.0.0-alpha.27",
+    "version": "21.0.0-alpha.29",
     "tag": "next",
     "license": "EUPL-1.1",
     "description": "eUI CLI app generator & tools",