@eui/tools 6.2.13 → 6.2.15

package/.version.properties

@@ -1 +1 @@
-6.2.13
+6.2.15

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.2.15 (2022-11-12)
+
+##### Bug Fixes
+
+* **other:**
+  * local-dev sync on virtual remotes - added 15.x resolutions (issues with https for slack output) - tsconfig root not generated - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([75b0e212](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/75b0e212d67bb780c60b65d417ac4b7ab1e3f65f))
+
+* * *
+* * *
+## 6.2.14 (2022-11-12)
+
+##### Chores
+
+* **other:**
+  * virtual remotes skeleton files not published package.json renamed - MWP-9010 [MWP-9010](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9010)  ([427e7321](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/427e73212c4a77dde42393317f0c49b8ec3fa88c))
+
+* * *
+* * *
 ## 6.2.13 (2022-11-12)
 
 ##### Bug Fixes

package/package.json

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

package/scripts/csdr/config/remotes.js

@@ -18,13 +18,12 @@ module.exports.getRemote = (remoteName, euiVersion) => {
   }
 
 
-
-  tools.logTitle(`Getting remote config for ${remoteName} version ${euiVersion}`);
-
   if (!euiVersion) {
-    throw new error('euiVersion should be provided as parameter');
+    throw new Error('euiVersion should be provided as parameter');
   }
 
+  tools.logTitle(`Getting remote config for ${remoteName} version ${euiVersion}`);
+
   const remotesConfig = require(path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json'));
   const remoteConfig = remotesConfig[remoteName];
 

package/scripts/csdr/config/sync.js

@@ -27,6 +27,7 @@ module.exports.run = () => {
   const pkgFolders = tools.getFolders(path.join(process.cwd(), 'packages'));
   const prjFolders = tools.getFolders(path.join(process.cwd(), 'apps'));
   const hostFolders = tools.getFolders(path.join(process.cwd(), 'hosts'));
+  const remoteFolders = tools.getFolders(path.join(process.cwd(), 'remotes'));
 
   const csdrProjects = innerProjects.getCsdrProjects();
 
@@ -68,7 +69,7 @@ module.exports.run = () => {
   // update the local config file
   const config = {
     projects: projects,
-    packages: pkgFolders
+    packages: [...pkgFolders, ...remoteFolders]
   };
 
   tools.writeJsonFileSync(path.join(process.cwd(), '.csdr', '.euirc.json'), config);

package/scripts/csdr/init/init.js

@@ -109,13 +109,6 @@ module.exports.init = () => {
       }
     })
 
-    // Importing packages and generating definitions
-    .then(() => {
-      if (!finalResponse.remote) {
-        return initUtils.packages.importPackages(finalResponse);
-      }
-    })
-
     // Importing external sources
     .then(() => {
       if (finalResponse.project) {
@@ -134,6 +127,11 @@ module.exports.init = () => {
       }
     })
 
+    // Importing packages and generating definitions
+    .then(() => {
+      return initUtils.packages.importPackages(finalResponse);
+    })
+
     // adapt and inject particular root data/config for eUI version detected on project
     // if multiple versions of eUI are detected on the same project, an exception is thrown
     .then(() => {

package/scripts/csdr/init/remotes/15.x/angular.json

@@ -0,0 +1,79 @@
+{
+    "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+    "version": 1,
+    "newProjectRoot": "apps",
+    "projects": {
+      "@remote.name@": {
+        "root": ".",
+        "sourceRoot": "src",
+        "projectType": "application",
+        "prefix": "app",
+        "schematics": {},
+        "architect": {
+          "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+            "options": {
+              "outputPath": "dist",
+              "index": "src/index.html",
+              "main": "src/main.ts",
+              "polyfills": "src/polyfills.ts",
+              "tsConfig": "tsconfig.app.json",
+              "sourceMap": {
+                "scripts": true,
+                "styles": false,
+                "hidden": true,
+                "vendor": true
+              },
+              "scripts": [
+                "./node_modules/@webcomponents/custom-elements/src/native-shim.js"
+              ],
+              "assets": [
+                "src/assets",
+                {
+                    "glob": "**/*",
+                    "input": "node_modules/@eui/core/assets/",
+                    "output": "./assets"
+                },
+                {
+                    "glob": "**/*",
+                    "input": "node_modules/@eui/styles-base/dist/assets/",
+                    "output": "./assets"
+                }
+              ],
+              "styles": [
+                  "node_modules/@eui/styles/dist/styles/eui.css",
+                  "node_modules/@eui/styles/dist/styles/eui-extra-utilities.css",
+                  "node_modules/@eui/styles/dist/styles/eui-legacy-bootstrap.css",
+                  "node_modules/@eui/styles/dist/styles/eui-legacy-icons-font.css",
+                  "node_modules/@eui/styles/dist/styles/eui-legacy-utilities.css"
+              ]
+            },
+            "configurations": {
+              "production": {
+                "fileReplacements": [
+                  {
+                    "replace": "src/environments/environment.ts",
+                    "with": "src/environments/environment.prod.ts"
+                  }
+                ],
+                "optimization": true,
+                "outputHashing": "all",
+                "sourceMap": true,
+                "namedChunks": false,
+                "aot": true,
+                "extractLicenses": true,
+                "vendorChunk": false,
+                "buildOptimizer": true
+              },
+              "serve-dist": {
+                "outputPath": "serve-dist"
+              }
+            }
+          }
+        }
+      }
+    },
+    "cli": {
+      "analytics": false
+    }
+  }

package/scripts/csdr/init/remotes/15.x/browserslist

@@ -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/remotes/15.x/tsconfig.app.json

@@ -0,0 +1,24 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "target": "ES2022",
+    "module": "ES2022",
+    "lib": [
+      "ES2022",
+      "dom"
+    ],
+    "types": [
+        "node"
+    ],
+    "paths": {
+        "os": ["./node_modules/empty-module/index.js"],
+        "node-fetch": ["./node_modules/empty-module/index.js"],
+        "zipkin": ["./node_modules/zipkin/dist/zipkin.js"]
+    }
+  },
+  "exclude": [
+    "src/test.ts",
+    "**/*.spec.ts"
+  ]
+}

package/scripts/csdr/init/remotes.js

@@ -80,6 +80,11 @@ module.exports.generateVirtualRemote = (remoteName, euiVersion) => {
         }
       });
 
+      // replace package.json (different extension when eUI tools published to avoid npm publish clashing)
+      if (tools.isFileExists(path.join(remotePath, 'package.json_TO_REPLACE'))) {
+        tools.move(path.join(remotePath, 'package.json_TO_REPLACE'), path.join(remotePath, 'package.json'));
+      }
+
       // generating angular json
       const angularJsonPath = path.join(remotePath, 'angular.json');
       let angularJson = tools.getJsonFileContent(angularJsonPath);

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

@@ -1,2 +1,6 @@
 {
+    "@types/node": ">=14.14.10",
+    "https-proxy-agent": ">=2.2.3",
+    "mem": ">=4.3.0 <=8.1.1",
+    "zone.js": ">=0.11.5"
 }

package/scripts/csdr/install/local-dev.js

@@ -13,7 +13,13 @@ const innerPackages = require('./packages');
 
 module.exports.installPackage = (pkgName) => {
 
-  const pkg = configUtils.packages.getPackage(pkgName, false, true);
+  const { euiVersion } = tools.getArgs();
+
+  const pkg = configUtils.remotes.getRemote(pkgName, euiVersion);
+
+  if (!pkg) {
+    pkg = configUtils.packages.getPackage(pkgName, false, true);
+  }
 
   return Promise.resolve()
     .then(() => {