@eui/tools 6.7.4 → 6.8.0

package/.version.properties

@@ -1 +1 @@
-6.7.4
+6.8.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.8.0 (2023-03-09)
+
+##### New Features
+
+* **other:**
+  * adapted build scripts for eUI 16 - EUI-7240 [EUI-7240](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7240)  ([c3693b58](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/c3693b5893a812038e3031ae4b9ef59c2cc09bcd))
+
+* * *
+* * *
+## 6.7.5 (2023-03-09)
+
+##### Chores
+
+* **other:**
+  * adapted csdr app phase 3 - finalized custom init json - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121)  ([d64762e8](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d64762e8de1716e46d227186bbdbc1adf17efd22))
+
+* * *
+* * *
 ## 6.7.4 (2023-03-09)
 
 ##### Bug Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@eui/tools",
-    "version": "6.7.4",
+    "version": "6.8.0",
     "tag": "latest",
     "license": "EUPL-1.1",
     "description": "eUI common tools and scripts",

package/scripts/app/public/index.html

@@ -36,7 +36,7 @@
                                 <label class="col-sm-2 col-form-label">App</label>
                                 <div class="col-sm-10">
                                     <select disabled class="form-select" v-model="selectedProject">
-                                        <option value="my-workplace">MyWorkplace</option>
+                                        <option value="my-workplace-host-playground-custom">MyWorkplace</option>
                                     </select>
                                 </div>
                             </div>
@@ -63,7 +63,7 @@
                             <thead>
                                 <tr>
                                     <th scope="col">Remote</th>
-                                    <th scope="col">Participant</th>
+                                    <!-- <th scope="col">Participant</th> -->
                                     <th scope="col">Full SK</th>
                                     <th scope="col">Local</th>
                                     <th scope="col">Installed</th>
@@ -72,9 +72,9 @@
                             <tbody>
                                 <tr v-for="remote in remotes">
                                     <td>{{ remote.name }}</td>
-                                    <td>
+                                    <!-- <td>
                                         <div :class="{ 'text-primary fw-bold': remote.participant }">{{ remote.participant }}</div>
-                                    </td>
+                                    </td> -->
                                     <td>
                                         <div :class="{ 'text-success fw-bold': remote.fullSkeletonSources }">
                                             {{ remote.fullSkeletonSources }}
@@ -87,6 +87,7 @@
                                                 type="checkbox"
                                                 :value="remote.name"
                                                 :id="remote.name"
+                                                :disabled="isInstallRemoteSelected(remote.name)"
                                                 v-model="selectedRemotes" />
                                         </div>
                                     </td>
@@ -97,6 +98,7 @@
                                                 type="checkbox"
                                                 :value="remote.name"
                                                 :id="remote.name"
+                                                :disabled="isRemoteSelected(remote.name)"
                                                 v-model="selectedInstalledRemotes" />
                                         </div>
                                     </td>
@@ -108,12 +110,12 @@
 
                 <div class="col-6">
                     <h5 class="mt-5 mb-3">
-                        Selected local remotes (intialized as sources):
+                        Selected remotes - intialized as sources:
                         <span class="text-primary fw-bold">{{ selectedRemotes.length }}</span>
                     </h5>
                     {{ selectedRemotes }}
                     <h5 class="mt-5 mb-3">
-                        Selected local remotes (intialized as dependencies):
+                        Selected "to-be-installed" remotes - intialized as dependencies:
                         <span class="text-primary fw-bold">{{ selectedInstalledRemotes.length }}</span>
                     </h5>
                     {{ selectedInstalledRemotes }}
@@ -151,7 +153,7 @@
                             </p>
                             <p>
                                 Execute after the
-                                <strong>npm run init -- --custom</strong> from your command line to follow progress of installation
+                                <strong>npm run init -- --custom [--git local]</strong> from your command line to follow progress of installation
                             </p>
                         </div>
                     </div>

package/scripts/app/public/index.js

@@ -40,14 +40,14 @@ new Vue({
             if (Object.keys(finalRes).length !== 0) {
                 this.selectedApp = finalRes.project;
                 this.selectedEuiVersion = finalRes.euiVersion;
-                this.selectedLocalRemotes = finalRes.remotes;
+                this.selectedRemotes = finalRes.remotes;
                 this.selectedInstalledRemotes = finalRes.installedRemotes;
                 this.deps = finalRes.deps;
                 this.packages = finalRes.packages;
             }
         },
         async getPackages() {
-            const res = await fetch("http://localhost:3000/api/remotes/packages", getRequestBody(this.selectedLocalRemotes));
+            const res = await fetch("http://localhost:3000/api/remotes/packages", getRequestBody(this.selectedRemotes));
             const finalRes = await res.json();
             this.packages = finalRes.packages.filter(
                 (p) => p.indexOf("csdr-") < 0 && p.indexOf("cc-shared-ui") < 0 && p.indexOf("mywp-shared-ui") < 0
@@ -55,7 +55,7 @@ new Vue({
             this.deps = finalRes.deps;
         },
         reset() {
-            this.selectedLocalRemotes = [];
+            this.selectedRemotes = [];
             this.selectedInstalledRemotes = [];
             this.packages = [];
             this.deps = [];
@@ -83,9 +83,15 @@ new Vue({
             }
             this.saveConfigSubmitted = true;
         },
+        isRemoteSelected(remoteName) {
+          return this.selectedRemotes.includes(remoteName);
+        },
+        isInstallRemoteSelected(remoteName) {
+          return this.selectedInstalledRemotes.includes(remoteName);
+        }
     },
     watch: {
-        selectedLocalRemotes: {
+        selectedRemotes: {
             handler: function (val) {
                 this.saveConfigOK = false;
                 this.saveConfigSubmitted = false;

package/scripts/app/routes/index.js

@@ -21,16 +21,16 @@ router.get('/remotes', function (req, res) {
     })
     .then((fetchedRemotes) => {
       let remotes = tools.sortArray(fetchedRemotes, 'name');
-      remotes = remotes.map((r) => {
+      remotes = remotes.filter((r) => {
         let participant = false;
         if (r.fullSkeletonSources) {
           if (r.skeletonConfig.options && r.skeletonConfig.options.participant) {
             participant = true;
           }
         }
-        return {
-          ...r,
-          participant,
+
+        if (r.fullSkeletonSources && !participant) {
+          return true;
         }
       })
       res.send(remotes);

package/scripts/csdr/config/angular.js

@@ -93,6 +93,9 @@ module.exports.registerAngularPackage = (pkg, isReset) => {
   if (packageEuiVersion === '15.x') {
     projectDef = JSON.stringify(angularPackageDefV15);
   }
+  if (packageEuiVersion === '16.x') {
+    projectDef = JSON.stringify(angularPackageDefV15);
+  }
 
   let srcRoot = '/src', srcRootTesting = '';
   if (pkg.build && typeof pkg.build.srcRootDefault === 'boolean' && pkg.build.srcRootDefault === false) {
@@ -124,11 +127,15 @@ module.exports.registerAngularPackageSubEntry = (subEntryName, subEntryPath, pkg
     projectDef = JSON.stringify(angularPackageSubEntryDef15);
     projectDef = projectDef.replace('"main":"packages/eui/packages/components/@subEntry.path@/test.ts",', '');
   }
+  if (packageEuiVersion === '16.x') {
+    projectDef = JSON.stringify(angularPackageSubEntryDef15);
+    projectDef = projectDef.replace('"main":"packages/eui/packages/components/@subEntry.path@/test.ts",', '');
+  }
   projectDef = tools.replaceAll(projectDef, '@subEntry.path@', subEntryName)
   projectDef = tools.replaceAll(projectDef, '@subEntry.package.name@', 'ng-package.json');
   projectDef = tools.replaceAll(projectDef, '@tsconfig@', pkg.tsConfigFileName);
 
-  if (packageEuiVersion === '15.x') {
+  if (packageEuiVersion === '15.x' || packageEuiVersion === '16.x') {
     // if tsconfig is missing add it
     const tsConfigSpecPath = path.join(process.cwd(), JSON.parse(projectDef).architect.test.options.tsConfig);
     // check if tsconfig exists otherwise created it
@@ -218,7 +225,7 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
         if (euiVersion === '13.x') {
           projectDef = JSON.stringify(angularProjectDefFullSkeletonV13);
           tools.logInfo(`----using angularProjectDefFullSkeletonV13`);
-        } else if (euiVersion === '14.x' || euiVersion === '15.x') {
+        } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x') {
           projectDef = JSON.stringify(angularProjectDefFullSkeletonV14);
           tools.logInfo(`----using angularProjectDefFullSkeletonV14`);
         } else {
@@ -230,7 +237,7 @@ module.exports.registerAngularProjectDef = (project, build = false, element = fa
         if (euiVersion === '13.x') {
           projectDef = JSON.stringify(angularProjectDefV13);
           tools.logInfo(`----using angularProjectDefV13`);
-        } else if (euiVersion === '14.x' || euiVersion === '15.x') {
+        } else if (euiVersion === '14.x' || euiVersion === '15.x' || euiVersion === '16.x') {
           projectDef = JSON.stringify(angularProjectDefV14);
           tools.logInfo(`----using angularProjectDefV14`);
         } else {

package/scripts/csdr/config/remotes.js

@@ -151,29 +151,36 @@ module.exports.isLocalRemote = (npmPkg) => {
 }
 
 module.exports.getRemotesPackages = (remotes) => {
-  let packages = [], deps = [];
+  let packages = [], deps = {};
 
-    remotes.forEach((r) => {
+  remotes.forEach((r) => {
     const remote = this.getRemote(r);
-    const npmPkgs = Object.keys(remote.dependencies.composite);
 
-    deps = [...deps, ...npmPkgs];
+    // check sub-entry declared rootNpmPkg in config, in that case we take the real root npmPkg
+    const rootNpmPkg = remote.skeletonConfig.rootNpmPkg;
+    let rootNpmPkgName = rootNpmPkg;
+    if (rootNpmPkg.split('/').length > 2) {
+      rootNpmPkgName = rootNpmPkg.substr(0, rootNpmPkg.lastIndexOf('/'));
+    }
 
-    npmPkgs.forEach((npmPkg) => {
-      const pkg = innerPackages.getPackageByNpmPkg(npmPkg, true);
-      if (pkg) {
-        packages.push(pkg.name);
+    // adding dependencies except the rootPkg dep (as it's installed as source)
+    const npmPkgs = Object.keys(remote.dependencies.composite);
+    npmPkgs.forEach((n) => {
+      if (n !== rootNpmPkgName) {
+        deps[n] = remote.dependencies.composite[n];
       }
-    })
-  })
+    });
+
+    // adding the deps-base if the remote as any
+    deps = { ...deps, ...remote.dependencies.base };
 
-  packages = packages.filter((pkg) => {
-    return pkg.indexOf('eui') < 0;
+    // adding the package root as source
+    const pkg = innerPackages.getPackageByNpmPkg(rootNpmPkgName, true);
+    packages.push(pkg.name);
   });
 
   return {
-    deps: tools.removeArrayDuplicates(deps),
+    deps,
     packages: tools.removeArrayDuplicates(packages)
   }
 }
-

package/scripts/csdr/init/init-custom.js

@@ -2,6 +2,7 @@
 
 const tools = require('../../utils/tools');
 const configUtils = require('../config/config-utils');
+const installUtils = require('../install/install-utils');
 
 const innerInitProject = require('./init-project');
 const innerRemotes = require('./remotes');
@@ -41,10 +42,8 @@ module.exports.init = (finalResponse) => {
     })
 
     .then(() => {
-      // this is only executed for local dev installation,
-      // in case of release the initialisation is managed by the application / package themselves
       if (!build && !skipInstall) {
-        return installUtils.localDev.install();
+        return installUtils.localDev.install(customConfig.deps);
       }
     })
 

package/scripts/csdr/init/resources/16.x/browserslistrc

@@ -0,0 +1,6 @@
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR

package/scripts/csdr/init/resources/16.x/resolutions.json

@@ -0,0 +1,2 @@
+{
+}