@eui/tools 5.3.1 → 5.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/.version.properties +1 -1
  2. package/CHANGELOG.md +27 -0
  3. package/package.json +1 -1
  4. package/sandbox.js +3 -0
  5. package/scripts/csdr/install/build-app.js +1 -1
  6. package/scripts/csdr/release/app/release-app.js +3 -1
  7. package/scripts/utils/pre-build/projects.js +8 -6
package/.version.properties CHANGED
@@ -1 +1 @@
1
- 5.3.1
1
+ 5.3.4
package/CHANGELOG.md CHANGED
@@ -1,3 +1,30 @@
1
+ ## 5.3.4 (2022-05-31)
2
+
3
+ ##### Bug Fixes
4
+
5
+ * **other:**
6
+ * adapted openid injection to standalone installation path - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106) ([8ba4de88](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/8ba4de880bf8d8881c3d21db0d409218b4be85f5))
7
+
8
+ * * *
9
+ * * *
10
+ ## 5.3.3 (2022-05-31)
11
+
12
+ ##### Bug Fixes
13
+
14
+ * **other:**
15
+ * app with masterBranchOnly build - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106) ([d66e3076](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d66e3076fc4f90adc11fc59b3d8068995537c237))
16
+
17
+ * * *
18
+ * * *
19
+ ## 5.3.2 (2022-05-31)
20
+
21
+ ##### Bug Fixes
22
+
23
+ * **other:**
24
+ * typo in standalone build part - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106) ([180bce21](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/180bce21a29deb9cae6687aa74e1f821e80e6533))
25
+
26
+ * * *
27
+ * * *
1
28
  ## 5.3.1 (2022-05-31)
2
29
 
3
30
  ##### Bug Fixes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "5.3.1",
3
+ "version": "5.3.4",
4
4
  "tag": "latest",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
package/sandbox.js CHANGED
@@ -879,4 +879,7 @@ Promise.resolve()
879
879
  .then(() => {
880
880
  const prj = configUtils.projects.getProject('rsp-starter-kit');
881
881
  console.log(prj);
882
+ const nodeModulesPath = prj.paths.nodeModulesPath;
883
+ const test = path.join(nodeModulesPath, '/@eui/base/assets/openid/openid-login.js');
884
+ console.log(test);
882
885
  })
package/scripts/csdr/install/build-app.js CHANGED
@@ -11,7 +11,7 @@ module.exports.install = (prj, envTarget, compositeType) => {
11
11
  return Promise.resolve()
12
12
  // checking remotes
13
13
  .then(() => {
14
- if (prj.standAlone) {
14
+ if (prj.standalone) {
15
15
  return innerProjects.installDepsStandalone(prj);
16
16
  } else {
17
17
  return innerProjects.installDeps(prj, envTarget, compositeType);
package/scripts/csdr/release/app/release-app.js CHANGED
@@ -344,7 +344,9 @@ module.exports.run = () => {
344
344
  // for env-target based builds, no need to merge anything back as it only contains a master branch for sources
345
345
  if (!envTarget) {
346
346
  if (!isSnapshot && !isSupportBranch && !isSupportSnapshotBranch) {
347
- return utils.git.mergeMasterToDevelop(project, project.folder);
347
+ if (project.build && !project.build.masterBranchOnly) {
348
+ return utils.git.mergeMasterToDevelop(project, project.folder);
349
+ }
348
350
  }
349
351
  }
350
352
  })
package/scripts/utils/pre-build/projects.js CHANGED
@@ -89,24 +89,26 @@ module.exports.preBuild = (project, envTarget, build, configEnvTarget) => {
89
89
  if ((project.build && project.build.openid) || openid) {
90
90
  tools.logInfo('Executing scripts files replacement for openId Connect');
91
91
 
92
+ const nodeModulesPath = project.paths.nodeModulesPath;
92
93
  let rootTargetFolder = 'src';
93
- tools.logInfo(`Copying node_modules/oidc-client/dist/oidc-client.min.js to ${rootTargetFolder}/assets/oidc-client.min.js`);
94
+
95
+ tools.logInfo(`Copying ${nodeModulesPath}/oidc-client/dist/oidc-client.min.js to ${rootTargetFolder}/assets/oidc-client.min.js`);
94
96
  tools.copy(
95
- path.join(process.cwd(), 'node_modules/oidc-client/dist/oidc-client.min.js'),
97
+ path.join(nodeModulesPath, '/oidc-client/dist/oidc-client.min.js'),
96
98
  path.join(project.paths.angularPath, `${rootTargetFolder}/assets/oidc-client.min.js`)
97
99
  );
98
100
  tools.logSuccess();
99
101
 
100
- tools.logInfo(`Copying node_modules/jsrsasign/lib/jsrsasign-all-min.js to ${rootTargetFolder}/assets/jsrsasign-all-min.js`);
102
+ tools.logInfo(`Copying ${nodeModulesPath}/jsrsasign/lib/jsrsasign-all-min.js to ${rootTargetFolder}/assets/jsrsasign-all-min.js`);
101
103
  tools.copy(
102
- path.join(process.cwd(), 'node_modules/jsrsasign/lib/jsrsasign-all-min.js'),
104
+ path.join(nodeModulesPath, '/jsrsasign/lib/jsrsasign-all-min.js'),
103
105
  path.join(project.paths.angularPath, `${rootTargetFolder}/assets/jsrsasign-all-min.js`)
104
106
  );
105
107
  tools.logSuccess();
106
108
 
107
- tools.logInfo(`Copying node_modules/@eui/base/assets/openid/openid-login.js to ${rootTargetFolder}/assets/openid-login.js`);
109
+ tools.logInfo(`Copying ${nodeModulesPath}/@eui/base/assets/openid/openid-login.js to ${rootTargetFolder}/assets/openid-login.js`);
108
110
  tools.copy(
109
- path.join(process.cwd(), 'node_modules/@eui/base/assets/openid/openid-login.js'),
111
+ path.join(nodeModulesPath, '/@eui/base/assets/openid/openid-login.js'),
110
112
  path.join(project.paths.angularPath, `${rootTargetFolder}/assets/openid-login.js`)
111
113
  );
112
114
  tools.logSuccess();