@eui/tools 6.3.5 → 6.3.7

package/.version.properties

@@ -1 +1 @@
-6.3.5
+6.3.7

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 6.3.7 (2023-02-01)
+
+##### Chores
+
+* **cli:**
+  * adapted remote init for virtual setup - MWP-8812 [MWP-8812](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-8812)  ([6090688e](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/6090688ef793d7efbe467b7a1bcbea2b50dfdefd))
+
+* * *
+* * *
+## 6.3.6 (2023-02-01)
+
+##### Chores
+
+* **other:**
+  * avoid source-map generation at remote serve time - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([532dbd61](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/532dbd610126f7dcf498316e1869314ac8fb77c6))
+  * added vendor file to remote serve for local testing - MWP-9204 [MWP-9204](https://webgate.ec.europa.eu/CITnet/jira/browse/MWP-9204)  ([79cd8b2a](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/79cd8b2abf0919b16b71a35de1f2dc1211f2308e))
+
+* * *
+* * *
 ## 6.3.5 (2023-02-01)
 
 ##### Bug Fixes

package/bin/scripts/csdr-upgrade-deps.js

@@ -3,7 +3,7 @@
 const installUtils = require('../../scripts/csdr/install/install-utils');
 const tools = require('../../scripts/utils/tools');
 
-const { pkg } = tools.getArgs();
+const { pkg, remote } = tools.getArgs();
 
 Promise.resolve()
   .then(() => {
@@ -11,7 +11,11 @@ Promise.resolve()
     if (pkg) {
       return installUtils.localDev.installPackage(pkg);
     } else {
-      return installUtils.localDev.install();
+      if (remote) {
+        return installUtils.localDev.installRemote(remote);
+      } else {
+        return installUtils.localDev.install();
+      }
     }
 
   })

package/package.json

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

package/scripts/csdr/cli/package-build-frontend.js

@@ -74,6 +74,10 @@ const replaceContent = (targetPath, name, scope, fullName) => {
 const generateVirtualRemote = ({fullName, targetPath, rootPackagePath, pkg, args = constants.DEFAULT_CONFIG}) => {
 
   tools.logInfo('Generate virtual remote');
+  console.log(fullName);
+  console.log(targetPath);
+  console.log(rootPackagePath);
+  console.log(pkg);
 
   const remoteTargetPath = path.join(process.cwd(), 'packages', 'csdr-remotes-config', 'assets', fullName);
 
@@ -90,6 +94,8 @@ const generateVirtualRemote = ({fullName, targetPath, rootPackagePath, pkg, args
       // for the moment the virtual remotes are only activated for v15+
       if (args.pkgFrontendVersion == constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15) {
         tools.copydir(constants.FRONTEND_SKELETON_REMOTE_EUI15_PATH, targetPath, true);
+      } else if (args.pkgFrontendVersion == constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10) {
+        tools.copydir(constants.FRONTEND_SKELETON_REMOTE_EUI10_PATH, targetPath, true);
       }
 
       // REPLACING PLACEHOLDERS
@@ -100,7 +106,8 @@ const generateVirtualRemote = ({fullName, targetPath, rootPackagePath, pkg, args
       tools.logInfo('Adding CSDR config entry');
       configUtils.register.registerCsdrPackage(
         pkg, args.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE,
-        args.pkgScope, args.pkgName, args.pkgFrontendVersion
+        args.pkgScope, args.pkgName, args.pkgFrontendVersion,
+        args.isVirtualRemote
       );
 
       // REPLACE EXTENSIONS (package.json, .gitignore as the interfere with build of tools if release without name changes)
@@ -294,7 +301,7 @@ module.exports.generate = (args = constants.DEFAULT_CONFIG) => {
 
   return Promise.resolve()
     .then(() => {
-      if (args.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI15 && args.isVirtualRemote) {
+      if (args.isVirtualRemote) {
         return generateVirtualRemote({fullName, targetPath, rootPackagePath, pkg, args});
       } else {
         return generateDefault({fullName, targetPath, rootPackagePath, pkg, args});

package/scripts/csdr/cli/package-prompt.js

@@ -126,6 +126,19 @@ module.exports.prompt = () => {
             );
           }
         },
+        {
+          name: 'isVirtualRemote',
+          type: 'confirm',
+          message: 'Is this a virtual remote ?',
+          default: constants.DEFAULT_CONFIG.isVirtualRemote,
+          when: function (answers) {
+            return (
+              answers.pkgType === constants.CONFIG_OPTIONS.pkgType.FRONTEND &&
+              answers.pkgFrontendType === constants.CONFIG_OPTIONS.pkgFrontendType.REMOTE &&
+              answers.pkgFrontendVersion === constants.CONFIG_OPTIONS.pkgFrontendVersion.EUI10
+            );
+          }
+        },
         {
           name: 'isCsdrRepo',
           type: 'confirm',

package/scripts/csdr/cli/skeletons/virtual-remote/10.x/angular-config.json

@@ -0,0 +1,9 @@
+{
+    "styles": [
+        "./node_modules/@eui/styles/dist/styles/eui-primeng.css",
+        "./node_modules/@eui/styles/dist/styles/eui.css",
+        "./node_modules/@eui/styles/dist/styles/eui-next.css",
+        "./node_modules/@eui/styles/dist/styles/eui-components.css",
+        "./node_modules/@eui/styles/dist/assets/fonts/font-awesome/font-awesome.min.css"
+    ]
+}

package/scripts/csdr/cli/skeletons/virtual-remote/10.x/dependencies.json

@@ -0,0 +1,20 @@
+{
+    "base": {
+    },
+    "composite": {
+        "@eui/deps-base": "^10.0.0",
+        "@module.scope@/@module.name@": "^1.0.0",
+        "@csdr/core": "^2.0.0",
+        "@csdr/integration": "^2.0.0"
+    },
+    "INT": {
+    },
+    "ACC": {
+    },
+    "DLT": {
+    },
+    "TRN": {
+    },
+    "PROD": {
+    }
+}

package/scripts/csdr/config/register.js

@@ -66,7 +66,7 @@ module.exports.registerCsdrProject = (name, isFullSkeleton) => {
 
 // Register newly created package
 
-module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName, euiVersionNumber) => {
+module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName, euiVersionNumber, isVirtualRemote) => {
 
   const csdrConfigPackage = {
     "name": "@module.full.name@",
@@ -111,7 +111,31 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
     }
   }
 
-  const csdrConfigRemotePackageV15 = {
+
+  const csdrConfigRemotePackageV10Virtual = {
+    "npmPkg": "@module.npmPkg.name@",
+    "euiVersion": "10.x",
+    "build": {
+      "compiledTranslations": true,
+      "translationScopes": "eui,csdr,cc,mywp",
+      "envTargetActive": true,
+      "skipLint": true,
+      "skipTest": true,
+      "sonarScanner": false
+    },
+    "release": {
+       "team": "cc-ui-rm"
+    },
+    "slack": {
+      "channel": "csdr-timeline-mwp-remotes-cc"
+    },
+    "externalSources": {
+      "npmPkg": "@module.rootPkg.scope@/@module.rootPkg.name@",
+      "folder": "assets/remote-sources"
+    }
+  }
+
+  const csdrConfigRemotePackageV15Virtual = {
     "npmPkg": "@module.npmPkg.name@",
     "euiVersion": "15.x",
     "build": {
@@ -140,7 +164,9 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
 
   if (isRemote) {
     if (euiVersionNumber >= 15) {
-      packageDef = JSON.stringify(csdrConfigRemotePackageV15);
+      packageDef = JSON.stringify(csdrConfigRemotePackageV15Virtual);
+    } else if (euiVersionNumber >= 10 && isVirtualRemote) {
+      packageDef = JSON.stringify(csdrConfigRemotePackageV10Virtual);
     } else {
       packageDef = JSON.stringify(csdrConfigRemotePackage);
     }
@@ -155,7 +181,7 @@ module.exports.registerCsdrPackage = (pkg, isRemote, rootPkgScope, rootPkgName,
   replaceModule = tools.replaceAll(replaceModule, '@module.rootPkg.name@', rootPkgName);
 
   let file = path.join(process.cwd(), '.csdr', '.euirc-csdr-packages.json');
-  if (isRemote && euiVersionNumber >= 15) {
+  if (isRemote && isVirtualRemote) {
     file = path.join(process.cwd(), '.csdr', '.euirc-csdr-remotes.json');
   }
   let jsonFile = require(file);

package/scripts/csdr/init/remotes/10.x/base/angular.json

@@ -0,0 +1,90 @@
+{
+    "$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": "ngx-build-plus:build",
+          "options": {
+              "deployUrl": "/mwp/assets/elements/@remote.name@/bundles/",
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "scripts": [
+              "./node_modules/@webcomponents/custom-elements/src/native-shim.js"
+            ],
+            "assets": [
+              "src/assets"
+            ],
+              "styles": [
+                  "./node_modules/@eui/styles/dist/styles/eui-primeng.css",
+                  "./node_modules/@eui/styles/dist/styles/eui.css",
+                  "./node_modules/@eui/styles/dist/styles/eui-next.css",
+                  "./node_modules/@eui/styles/dist/styles/eui-components.css",
+                  "./node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css",
+                  "./node_modules/@eui/styles/dist/assets/fonts/font-awesome/font-awesome.min.css",
+                  "./node_modules/@eui/styles/dist/assets/fonts/flag-icons/css/flag-icon.min.css"
+              ]
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true
+            },
+            "serve-dist": {
+              "outputPath": "serve-dist",
+              "wath": true
+            }
+          }
+        },
+        "serve": {
+          "builder": "./node_modules/@angular-devkit/build-angular:dev-server",
+          "options": {
+              "deployUrl": "/assets/elements/@remote.name@/bundles/",
+              "browserTarget": "@remote.name@:build:serve-dist"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "@remote.name@:build:production"
+            }
+          }
+        },
+        "test": {
+          "builder": "./node_modules/@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "scripts": []
+          }
+        }
+      }
+      }
+    },
+    "cli": {
+      "analytics": false
+    }
+  }

package/scripts/csdr/init/remotes/10.x/base/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/10.x/base/package.json_TO_REPLACE

@@ -0,0 +1,10 @@
+{
+    "name": "generated",
+    "version": "1.0.0-SNAPSHOT.0",
+    "files": [
+        "bundles"
+    ],
+    "dependencies": {},
+    "resolutions": {
+    }
+}

package/scripts/csdr/init/remotes/10.x/base/tsconfig.app.json

@@ -0,0 +1,20 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "module": "es2015",
+    "target": "es2015",
+      "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/15.x/base/angular.json

@@ -54,7 +54,7 @@
                 "optimization": false,
                 "vendorChunk": true,
                 "extractLicenses": false,
-                "sourceMap": true,
+                "sourceMap": false,
                 "namedChunks": true
               },
               "production": {

package/scripts/csdr/init/remotes.js

@@ -61,8 +61,9 @@ module.exports.generateVirtualRemote = (remoteName, cloneRemote = true) => {
 
       // constructing the remote folder
       const remotePath = path.join(process.cwd(), 'remotes', remote.name);
-      const remoteSkeletonPath = path.join(__dirname, 'remotes', remote.euiVersion, 'base');
-      const remoteSkeletonFullPath = path.join(__dirname, 'remotes', remote.euiVersion, 'full');
+      const remoteSkeletonRootPath = path.join(__dirname, 'remotes', remote.euiVersion);
+      const remoteSkeletonPath = path.join(remoteSkeletonRootPath, 'base');
+      const remoteSkeletonFullPath = path.join(remoteSkeletonRootPath, 'full');
 
       tools.logInfo(`Copying base sources => ${remoteSkeletonPath} ==> ${remotePath}`);
 

package/scripts/utils/remotes/remotes-utils.js

@@ -19,11 +19,14 @@ module.exports.concatFiles = (workingPath, euiVersionNumber = 10) => {
         ...(euiVersionNumber >= 15 ? ['runtime.js'] : []),
         'polyfills.js',
         'scripts.js',
+        ...(tools.isFileExists(path.join(workingPath, 'vendor.js')) ? ['vendor.js'] : []),
         'main-old.js'
       ].map(f => path.join(workingPath, f));
 
       const outFilePath = path.join(workingPath, 'main.js');
 
+      console.log(files);
+
       return concat(files, outFilePath);
     })