@eui/tools 6.3.20 → 6.3.22

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 (33) hide show
  1. package/.version.properties +1 -1
  2. package/CHANGELOG.md +18 -0
  3. package/bin/eui-scripts.js +2 -0
  4. package/package.json +3 -2
  5. package/sandbox.js +22 -11
  6. package/scripts/csdr/audit/audit-utils.js +0 -1
  7. package/scripts/csdr/config/angular.js +3 -3
  8. package/scripts/csdr/config/global.js +0 -2
  9. package/scripts/csdr/config/packages.js +0 -11
  10. package/scripts/csdr/metadata/app-history.js +5 -13
  11. package/scripts/csdr/metadata/app.js +21 -19
  12. package/scripts/csdr/metadata/commit.js +3 -3
  13. package/scripts/csdr/metadata/common.js +0 -23
  14. package/scripts/csdr/metadata/package-history.js +6 -15
  15. package/scripts/csdr/metadata/package-versions.js +1 -1
  16. package/scripts/csdr/metadata/package.js +11 -144
  17. package/scripts/csdr/release/package/common.js +5 -5
  18. package/scripts/csdr/release/package/ui.js +0 -5
  19. package/scripts/csdr/version/package-common.js +2 -2
  20. package/scripts/index.js +2 -1
  21. package/scripts/utils/build/package/angular.js +15 -15
  22. package/scripts/utils/build/package/element.js +1 -1
  23. package/scripts/utils/build/package/maven.js +2 -2
  24. package/scripts/utils/build/package/nodeJs.js +5 -5
  25. package/scripts/utils/build/package/styles.js +7 -7
  26. package/scripts/utils/changelog-utils.js +1 -1
  27. package/scripts/utils/clean/clean-utils.js +4 -4
  28. package/scripts/utils/lint/app/lint-app-utils.js +8 -22
  29. package/scripts/utils/pre-build/translations/projects.js +1 -1
  30. package/scripts/utils/publish/maven.js +1 -1
  31. package/scripts/utils/sonar/sonar-utils.js +6 -6
  32. package/scripts/utils/test/test-utils.js +4 -4
  33. package/scripts/csdr/audit/deps.js +0 -89
@@ -1 +1 @@
1
- 6.3.20
1
+ 6.3.22
package/CHANGELOG.md CHANGED
@@ -1,3 +1,21 @@
1
+ ## 6.3.22 (2023-02-08)
2
+
3
+ ##### Chores
4
+
5
+ * **other:**
6
+ * add lint-app for project linting - EUI-6799 [EUI-6799](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-6799) ([7f883d57](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/7f883d57d7db4891927e1f27c653be04c67ec056))
7
+
8
+ * * *
9
+ * * *
10
+ ## 6.3.21 (2023-02-07)
11
+
12
+ ##### Chores
13
+
14
+ * **other:**
15
+ * refactoring phase 1 - remove global devops-metadata calls and storage - EUI-7121 [EUI-7121](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-7121) ([8c561bcf](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/8c561bcfd157e46fbd2a3559f84b4d07e62aa5cc))
16
+
17
+ * * *
18
+ * * *
1
19
  ## 6.3.20 (2023-02-06)
2
20
 
3
21
  ##### Bug Fixes
@@ -21,6 +21,7 @@ const scriptIndex = args.findIndex(
21
21
  x === 'serve-element' ||
22
22
  x === 'serve-remote' ||
23
23
  x === 'serve-mock' ||
24
+ x === 'lint-app' ||
24
25
  x === 'start-symfony' ||
25
26
  x === 'a11y-app' ||
26
27
  x === 'commit' ||
@@ -63,6 +64,7 @@ switch (script) {
63
64
  case 'serve-element':
64
65
  case 'serve-remote':
65
66
  case 'serve-mock':
67
+ case 'lint-app':
66
68
  case 'start-symfony':
67
69
  case 'a11y-app':
68
70
  case 'commit':
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "6.3.20",
3
+ "version": "6.3.22",
4
4
  "tag": "latest",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
@@ -46,6 +46,7 @@
46
46
  "svg-sprite": "2.0.2",
47
47
  "imagemin": "7.0.1",
48
48
  "imagemin-svgo": "9.0.0",
49
- "concat": "1.0.3"
49
+ "concat": "1.0.3",
50
+ "file-saver": "2.0.5"
50
51
  }
51
52
  }
package/sandbox.js CHANGED
@@ -1115,20 +1115,31 @@ const versionUtils = require('./scripts/csdr/version/version-utils');
1115
1115
  // })
1116
1116
 
1117
1117
 
1118
- Promise.resolve()
1119
- .then(() => {
1120
- return auditUtils.yarn.audit(null);
1121
- })
1122
- .catch((e) => {
1123
- console.log(e);
1124
- })
1118
+ // Promise.resolve()
1119
+ // .then(() => {
1120
+ // return auditUtils.yarn.audit(null);
1121
+ // })
1122
+ // .catch((e) => {
1123
+ // console.log(e);
1124
+ // })
1125
1125
 
1126
1126
  // Promise.resolve()
1127
1127
  // .then(() => {
1128
- // const prjName = 'my-workplace-host';
1129
- // const project = configUtils.projects.getCsdrProject(prjName);
1130
- // // console.log(project);
1131
- // return preBuildUtils.projects.processCustomEnvScriptInjection(project, "dev");
1128
+ // const prjName = 'my-workplace-host';
1129
+ // const project = configUtils.projects.getCsdrProject(prjName);
1130
+ // // console.log(project);
1131
+ // return preBuildUtils.projects.processCustomEnvScriptInjection(project, "dev");
1132
+ // })
1133
+ // .catch((e) => {
1134
+ // console.log(e);
1135
+ // })
1136
+
1137
+ // Promise.resolve()
1138
+ // .then(() => {
1139
+ // const pkg = configUtils.packages.getPackageByNpmPkg('@eui/deps-base', true);
1140
+ // console.log(pkg);
1141
+ // const pkgVersionMetadata = metadataUtils.package.getVersionMetadata(pkg, '13.1.21');
1142
+ // console.log(pkgVersionMetadata);
1132
1143
  // })
1133
1144
  // .catch((e) => {
1134
1145
  // console.log(e);
@@ -1,5 +1,4 @@
1
1
  'use strict';
2
2
 
3
3
  module.exports.yarn = require('./yarn');
4
- module.exports.deps = require('./deps');
5
4
  module.exports.styles = require('./styles');
@@ -397,9 +397,9 @@ module.exports.registerModulePaths = (pkg, isReset) => {
397
397
  jsonFileBuildSpec['compilerOptions']['paths'] = {};
398
398
  }
399
399
 
400
- if (!pkg.paths || tools.isDirExists(pkg.paths.pkgSrc)) {
400
+ if (!pkg.paths || tools.isDirExists(pkg.paths.src)) {
401
401
  if (pkg.paths) {
402
- tools.logInfo(`${pkg.paths.pkgSrc} exists => pointing to /src folder`);
402
+ tools.logInfo(`${pkg.paths.src} exists => pointing to /src folder`);
403
403
  }
404
404
  jsonFileDev['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}/src`];
405
405
  jsonFileDev['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/src`];
@@ -409,7 +409,7 @@ module.exports.registerModulePaths = (pkg, isReset) => {
409
409
  jsonFileBuildSpec['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/dist`];
410
410
 
411
411
  } else {
412
- tools.logInfo(`${pkg.paths.pkgSrc} does not exist => pointing to root folder`);
412
+ tools.logInfo(`${pkg.paths.src} does not exist => pointing to root folder`);
413
413
  jsonFileDev['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}`];
414
414
  jsonFileDev['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}/*`] = [`${pathBase}/${pkg.folder || pkg.name}/*`];
415
415
  jsonFileBuild['compilerOptions']['paths'][`${pkg.npmPkgScope}/${pkg.npmPkgName}`] = [`${pathBase}/${pkg.folder || pkg.name}/dist`];
@@ -188,7 +188,6 @@ module.exports.getConfigOptions = () => {
188
188
  DEVOPS_METADATA_LOCKS_REPOSITORY: null,
189
189
  DEVOPS_METADATA_PATH: null,
190
190
  DEVOPS_METADATA_LOCKS_PATH: null,
191
- DEVOPS_METADATA_JSON: '.devops-metadata.json',
192
191
  DEVOPS_CONFIG_JSON: '.devops-config.json',
193
192
  ISSUES_MANAGER_HOST: null,
194
193
  NPM_REGISTRY_DEFAULT: null,
@@ -352,7 +351,6 @@ module.exports.getConfigOptions = () => {
352
351
  };
353
352
  })
354
353
  }
355
- console.log(configOptions.AUDIT_DEPENDENCIES_GATES);
356
354
  }
357
355
  }
358
356
 
@@ -195,17 +195,6 @@ module.exports.getPackagePaths = (pkg) => {
195
195
  src: resolvePath(packagesPath + '/' + folder + '/src'),
196
196
  lib: resolvePath(packagesPath + '/' + folder + '/src/lib'),
197
197
  tsConfig: this.getTSConfigPath(resolvePath, packagesPath + '/' + folder),
198
-
199
- // deprecated TODO remove from scripts
200
- repoPackageJson: resolvePath('package.json'),
201
- pkgFromRoot: packagesPath + '/' + folder,
202
- pkgBuild: resolvePath(packagesPath + '/' + folder + '/dist'),
203
- pkgRootDirectory: resolvePath(packagesPath + '/' + folder),
204
- angularPath: resolvePath(packagesPath + '/' + folder),
205
- pkgDirectory: resolvePath(packagesPath + '/' + folder),
206
- pkgPublish: resolvePath(packagesPath + '/' + folder + publishFolder),
207
- pkgSrc: resolvePath(packagesPath + '/' + folder + '/src'),
208
- pkgLibFolder: resolvePath(packagesPath + '/' + folder + '/src/lib'),
209
198
  };
210
199
 
211
200
  return paths;
@@ -143,13 +143,7 @@ const getDiffBetweenBuildVersions = (fromBuildMetadata, toBuildMetadata, hasHist
143
143
  const DEVOPS_METADATA_PATH = configUtils.global.getConfigOptions().DEVOPS_METADATA_PATH;
144
144
 
145
145
  return Promise.resolve()
146
-
147
- // get devops central metadata
148
146
  .then(() => {
149
- return innerCommon.getDevopsMetadata();
150
- })
151
-
152
- .then((devopsMetadata) => {
153
147
  // get differences from old in previous major release to new currently generated
154
148
  const diffs = [];
155
149
  Object.keys(fromBuildMetadata.packages).forEach((k) => {
@@ -165,19 +159,17 @@ const getDiffBetweenBuildVersions = (fromBuildMetadata, toBuildMetadata, hasHist
165
159
  item.package.indexOf('@eui') === -1;
166
160
  })
167
161
 
168
- // tools.logInfo(JSON.stringify(cleanDiffs, null, 2));
169
-
170
162
  // Iterate over the
171
163
  const mappedPkg = cleanDiffs.map((item) => {
172
164
 
173
165
  tools.logInfo(`parsing item : ${item.package}`);
174
166
 
175
167
  // getting the package name from the devops central metadata
176
- const pkgName = devopsMetadata.packagesLatestTag.filter((i) => {
177
- return i.npmPkg === item.package;
178
- }).map((i) => {
179
- return i.name;
180
- })[0];
168
+ const pkg = configUtils.packages.getPackageByNpmPkg(item.package, true);
169
+ let pkgName;
170
+ if (pkg) {
171
+ pkgName = pkg.name;
172
+ }
181
173
 
182
174
  tools.logInfo('checking package : ' + pkgName);
183
175
 
@@ -10,6 +10,9 @@ const configUtils = require('../config/config-utils');
10
10
  const installUtils = require('../install/install-utils');
11
11
  const versionUtils = require('../version/version-utils');
12
12
 
13
+ // INNER
14
+ const innerPackage = require('./package');
15
+
13
16
  // FETCH ARGS
14
17
  const { dryRun } = tools.getArgs();
15
18
 
@@ -137,7 +140,7 @@ const storeMetadataAssetsStandAlone = () => {
137
140
 
138
141
  // getting project
139
142
  const prj = configUtils.projects.getProject();
140
- let currentVersion, packageDeps, remotes = [];
143
+ let currentVersion, packageDeps, packageDepsMetadata;
141
144
 
142
145
  return Promise.resolve()
143
146
  // getting current app version
@@ -154,40 +157,39 @@ const storeMetadataAssetsStandAlone = () => {
154
157
  })
155
158
  .then((deps) => {
156
159
  packageDeps = deps;
157
- })
158
-
159
160
 
160
- // getting remotes entries
161
- .then(() => {
162
- if (prj.hasRemotes) {
163
- remotes = configUtils.packages.getCsdrRemotePackages().filter((p) => {
164
- return p.hostAppName = prj.name
165
- }).map((p) => {
166
- return { name: p.name, npmPkg: p.npmPkg }
167
- });
168
- if (remotes) {
169
- remotes = tools.sortArray(remotes, 'name');
161
+ packageDepsMetadata = Object.keys(deps).map((d) => {
162
+ const pkg = configUtils.packages.getPackageByNpmPkg(d, true);
163
+ const pkgVersionMetadata = innerPackage.getVersionMetadata(pkg, deps[d]);
164
+ return {
165
+ npmPkg: d,
166
+ repository: pkgVersionMetadata.name,
167
+ version: pkgVersionMetadata.version,
168
+ releaseDate: pkgVersionMetadata.date,
169
+ buildDuration: pkgVersionMetadata.duration,
170
170
  }
171
- }
171
+ });
172
172
  })
173
173
 
174
-
175
174
  // storing metadata
176
175
  .then(() => {
177
176
  tools.logInfo('Storing app metadata into project assets');
178
177
 
178
+ const appReleaseDate = moment(new Date()).format("DD/MM/YYYY HH:mm");
179
+ const appInfos = `${currentVersion} - ${appReleaseDate}`;
180
+
179
181
  const appMetadata = {
180
182
  appVersion: currentVersion,
181
- appReleaseDate: moment(new Date()).format("DD/MM/YYYY HH:mm"),
182
- appInfos: null,
183
+ appReleaseDate: appReleaseDate,
184
+ appInfos: appInfos,
183
185
  metadata: packageDeps,
184
- remotes: remotes
186
+ metadataDetails: packageDepsMetadata
185
187
  };
186
188
 
187
189
  const metadataFile = path.join(prj.folder, 'src', 'assets', 'app-metadata.json');
188
190
 
189
191
  tools.logInfo(`Creating ${metadataFile}`);
190
- console.log(appMetadata);
192
+ console.log(JSON.stringify(appMetadata, null, 2));
191
193
 
192
194
  if (!dryRun) {
193
195
  return tools.writeJsonFileSync(metadataFile, appMetadata);
@@ -102,7 +102,7 @@ const extractCommits = (pkg, opts) => {
102
102
  if (opts.allRevisions) {
103
103
  tag = null;
104
104
  } else {
105
- tag = gitUtils.getLastTag(pkg.paths.pkgDirectory);
105
+ tag = gitUtils.getLastTag(pkg.paths.root);
106
106
  }
107
107
  }
108
108
  return tag;
@@ -115,10 +115,10 @@ const extractCommits = (pkg, opts) => {
115
115
  revisions = tag ? tag + '..' + opts.toTag : '';
116
116
 
117
117
  if (opts.logAll) tools.logInfo('git log command : ' + 'git log -E --date=short --format=' + FORMAT + ' ' + revisions);
118
- return execa.sync('git', ['log', '-E', '--date=short', '--format=' + FORMAT, revisions], { cwd: pkg.paths.pkgDirectory }).stdout;
118
+ return execa.sync('git', ['log', '-E', '--date=short', '--format=' + FORMAT, revisions], { cwd: pkg.paths.root }).stdout;
119
119
  } else {
120
120
  if (opts.logAll) tools.logInfo('git log command : ' + 'git log -E --date=short --format=' + FORMAT);
121
- return execa.sync('git', ['log', '-E', '--date=short', '--format=' + FORMAT], { cwd: pkg.paths.pkgDirectory }).stdout;
121
+ return execa.sync('git', ['log', '-E', '--date=short', '--format=' + FORMAT], { cwd: pkg.paths.root }).stdout;
122
122
  }
123
123
  })
124
124
  .then((commits) => {
@@ -12,8 +12,6 @@ const configUtils = require('../config/config-utils');
12
12
  const { dryRun, skipClone } = tools.getArgs();
13
13
 
14
14
 
15
-
16
-
17
15
  module.exports.cloneMetadataRepo = (noHistory = false) => {
18
16
  const configOptions = configUtils.global.getConfigOptions();
19
17
 
@@ -56,27 +54,6 @@ module.exports.cloneMetadataLocksRepo = () => {
56
54
  }
57
55
 
58
56
 
59
- module.exports.getDevopsMetadata = () => {
60
- const configOptions = configUtils.global.getConfigOptions();
61
- const DEVOPS_METADATA_PATH = configOptions.DEVOPS_METADATA_PATH;
62
- const DEVOPS_METADATA_JSON = configOptions.DEVOPS_METADATA_JSON;
63
-
64
- return Promise.resolve()
65
- .then(() => {
66
- if (!DEVOPS_METADATA_PATH) {
67
- throw new Error(`Devops metadata folder ${DEVOPS_METADATA_PATH} NOT FOUND`);
68
- }
69
-
70
- return tools.getJsonFileContent(
71
- path.join(DEVOPS_METADATA_PATH, DEVOPS_METADATA_JSON)
72
- );
73
- })
74
- .catch((e) => {
75
- throw e;
76
- })
77
- }
78
-
79
-
80
57
  const getDevopsConfig = () => {
81
58
  const configOptions = configUtils.global.getConfigOptions();
82
59
  const DEVOPS_METADATA_PATH = configOptions.DEVOPS_METADATA_PATH;
@@ -12,7 +12,6 @@ const pipelineUtils = require('../../utils/pipeline-utils');
12
12
  const configUtils = require('../config/config-utils');
13
13
 
14
14
  // INNER MODULES
15
- const innerCommon = require('./common');
16
15
  const innerPackage = require('./package');
17
16
 
18
17
  // FETCH ARGS
@@ -131,10 +130,6 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
131
130
 
132
131
  return Promise.resolve()
133
132
  .then(() => {
134
- return innerCommon.getDevopsMetadata();
135
- })
136
-
137
- .then((devopsMetadata) => {
138
133
  // get differences from old in previous major release to new currently generated
139
134
  const diffs = [];
140
135
  Object.keys(fromBuildMetadata.dependencies).forEach((k) => {
@@ -157,17 +152,13 @@ const getDiffBetweenBuildVersions = (pkg, fromBuildMetadata, toBuildMetadata) =>
157
152
 
158
153
  tools.logInfo(`parsing item : ${item.package}`);
159
154
 
160
- // getting the package name from the devops central metadata
161
- let pkgName = devopsMetadata.packagesLatestTag.filter((i) => {
162
- return i.npmPkg === item.package;
163
- }).map((i) => {
164
- return i.name;
165
- })[0];
155
+ const pkg = configUtils.packages.getPackageByNpmPkg(item.package, true);
156
+ let pkgName;
157
+ if (pkg) {
158
+ pkgName = pkg.name;
166
159
 
167
- if (pkgName === undefined || !pkgName) {
168
- const childPkg = configUtils.packages.getPackageByNpmPkg(item.package, true);
169
- if (childPkg.child) {
170
- pkgName = childPkg.parentPkg;
160
+ if (pkg.child) {
161
+ pkgName = pkg.parentPkg;
171
162
  }
172
163
  }
173
164
 
@@ -42,7 +42,7 @@ module.exports.storeMetadata = (pkg, pkgVersion, pkgCompositeDeps, duration, env
42
42
  let pkgMetadataFile;
43
43
 
44
44
  if (pkg.backend) {
45
- pkgMetadataFile = path.join(pkg.paths.pkgDirectory, 'package-versions-metadata.json');
45
+ pkgMetadataFile = path.join(pkg.paths.root, 'package-versions-metadata.json');
46
46
  } else {
47
47
  pkgMetadataFile = path.join(configOptions.DEVOPS_METADATA_PATH, pkg.devopsVersionsMetadataFile);
48
48
  }
@@ -10,7 +10,6 @@ const configUtils = require('../config/config-utils');
10
10
  const gitUtils = require('../../utils/git-utils');
11
11
 
12
12
  // INNER MODULES
13
- const innerCommon = require('./common');
14
13
  const innerPackageEnvs = require('./package-envs');
15
14
  const innerPackageVersions = require('./package-versions');
16
15
 
@@ -18,146 +17,11 @@ const innerPackageVersions = require('./package-versions');
18
17
  const { dryRun } = tools.getArgs();
19
18
 
20
19
 
21
-
22
- /**
23
- * depsType : 'packages' OR 'packagesLatestTag'
24
- */
25
- module.exports.getPackagesDeps = (depsType) => {
26
- return Promise.resolve()
27
- .then(() => {
28
- return innerCommon.getDevopsMetadata();
29
- })
30
- .then((devopsMetadata) => {
31
- var deps = [];
32
-
33
- devopsMetadata[depsType]
34
- .filter((p) => {
35
- return (p.npmPkg !== undefined) || (p.name === 'eui') || (p.name === 'eui-ecl') || (p.name === 'eui-mobile')
36
- })
37
- .forEach((p) => {
38
- if (p.name === 'eui') {
39
- deps['@eui/deps-base'] = p.version;
40
- } else if (p.name === 'eui-ecl') {
41
- deps['@eui/ecl-core'] = p.version;
42
- deps['@eui/ecl-styles'] = p.version;
43
- } else if (p.name === 'eui-mobile') {
44
- deps['@eui/mobile-core'] = p.version;
45
- deps['@eui/mobile-styles'] = p.version;
46
- } else {
47
- deps[p.npmPkg] = p.version;
48
- }
49
- });
50
-
51
- return deps;
52
- })
53
- .catch((e) => {
54
- throw e;
55
- })
56
- }
57
-
58
-
59
-
60
- const generateMetadataArray = (metadataArray, pkg, pkgVersion) => {
61
- let idx;
62
-
63
- const newPackage = {
64
- name: pkg.name,
65
- version: pkgVersion,
66
- date: moment(new Date()).format("YYYYMMDD-HH:mm"),
67
- npmPkg: pkg.npmPkg
68
- };
69
-
70
-
71
- if (metadataArray) {
72
- idx = metadataArray.findIndex(item => item.name === pkg.name);
73
- } else {
74
- idx = -1;
75
- }
76
-
77
- if (idx > -1) {
78
- metadataArray[idx] = newPackage;
79
- } else {
80
- if (!metadataArray) {
81
- metadataArray = [];
82
- }
83
- metadataArray.push(newPackage);
84
- }
85
-
86
- return metadataArray;
87
- }
88
-
89
-
90
-
91
20
  module.exports.storeMetadata = (pkg, pkgVersion, pkgMetadata, branches, pkgCompositeDeps, duration, envTarget) => {
92
21
 
93
22
  tools.logTitle('Storing central and package metadata...');
94
23
 
95
- const configOptions = configUtils.global.getConfigOptions();
96
-
97
- let devopsMetadata = {};
98
-
99
-
100
24
  return Promise.resolve()
101
-
102
- .then(() => {
103
- tools.logInfo('Storing pkg devops metadata...');
104
-
105
- if (pkg.backend) {
106
- tools.logInfo('Backend package detected...skipping central metadata updates');
107
- return;
108
- }
109
-
110
- const metadataFile = path.join(
111
- configOptions.DEVOPS_METADATA_PATH,
112
- configOptions.DEVOPS_METADATA_JSON
113
- );
114
-
115
- var metadata = {};
116
- var packages = [];
117
- var packagesLatestTag = [];
118
- var packagesPrevTag = [];
119
- var packagesNextTag = [];
120
- var packagesPrevSnapshotsTag = [];
121
- var packagesHotfixTag = [0];
122
-
123
- if (tools.isFileExists(metadataFile)) {
124
- metadata = require(metadataFile);
125
- packages = metadata.packages;
126
- packagesLatestTag = metadata.packagesLatestTag;
127
- packagesPrevTag = metadata.packagesPrevTag;
128
- packagesNextTag = metadata.packagesNextTag;
129
- packagesPrevSnapshotsTag = metadata.packagesPrevSnapshotsTag;
130
- packagesHotfixTag = metadata.packages.packagesHotfixTag;
131
- }
132
-
133
- if (branches.isSnapshot) {
134
- metadata.packages = generateMetadataArray(packages, pkg, pkgVersion);
135
-
136
- } else if (branches.isMaster) {
137
- metadata.packagesLatestTag = generateMetadataArray(packagesLatestTag, pkg, pkgVersion);
138
-
139
- } else if (branches.isMaster && pkg.build && pkg.build.masterBranchOnly) {
140
- metadata.packages = generateMetadataArray(packages, pkg, pkgVersion);
141
-
142
- } else if (branches.isSupportBranch) {
143
- metadata.packagesPrevTag = generateMetadataArray(packagesPrevTag, pkg, pkgVersion);
144
-
145
- } else if (branches.isSupportSnapshotBranch) {
146
- metadata.packagesPrevSnapshotsTag = generateMetadataArray(packagesPrevSnapshotsTag, pkg, pkgVersion);
147
-
148
- } else if (branches.isNextBranch) {
149
- metadata.packagesNextTag = generateMetadataArray(packagesNextTag, pkg, pkgVersion);
150
-
151
- } else if (branches.isHotfixBranch) {
152
- metadata.packagesHotfixTag = generateMetadataArray(packagesHotfixTag, pkg, pkgVersion);
153
- }
154
-
155
- tools.logInfo(`Writing central metadata on : ${metadataFile}`);
156
- tools.writeJsonFileSync(metadataFile, metadata);
157
-
158
- devopsMetadata = metadata;
159
- })
160
-
161
25
  .then(() => {
162
26
  return innerPackageVersions.storeMetadata(pkg, pkgVersion, pkgCompositeDeps, duration, envTarget);
163
27
  })
@@ -184,10 +48,6 @@ module.exports.storeMetadata = (pkg, pkgVersion, pkgMetadata, branches, pkgCompo
184
48
  tools.logSuccess();
185
49
  })
186
50
 
187
- .then(() => {
188
- return devopsMetadata;
189
- })
190
-
191
51
  .catch((e) => {
192
52
  throw e;
193
53
  })
@@ -411,11 +271,18 @@ module.exports.getLastMajorVersion = (pkg, major, isMaster) => {
411
271
  }
412
272
  }
413
273
 
274
+ module.exports.getVersionMetadata = (pkg, version) => {
275
+ const pkgVersions = this.getPackageVersions(pkg);
276
+ if (pkgVersions) {
277
+ console.log(pkgVersions);
278
+ return pkgVersions.filter((v) => {
279
+ return v.version === version
280
+ })[0];
414
281
 
415
-
416
-
417
-
418
-
282
+ } else {
283
+ tools.logWarning('no package metadata found for ' + pkg.name);
284
+ }
285
+ }
419
286
 
420
287
  module.exports.lockPackage = (pkg) => {
421
288
  tools.logTitle('Locking package');
@@ -331,7 +331,7 @@ module.exports.generateChangelog = (pkg, version, pkgMetadata) => {
331
331
  const branches = this.getBranches();
332
332
 
333
333
  if ((branches.isSupport || branches.isNext || branches.isMaster) && !dryRun) {
334
- return utils.changelog.writeChangelog(changelogContent, pkg.paths.pkgRootDirectory);
334
+ return utils.changelog.writeChangelog(changelogContent, pkg.paths.root);
335
335
 
336
336
  } else {
337
337
  utils.tools.logInfo('WRITING SKIPPED - (either DRY-RUN or snapshot release) - Actual changelog :');
@@ -392,7 +392,7 @@ const commitPackage = (pkg, version, branches) => {
392
392
  return utils.git.commitAndPush(
393
393
  branches.branch,
394
394
  `chore(release): update version: ${version} - from CI server`,
395
- pkg.paths.pkgDirectory
395
+ pkg.paths.root
396
396
  );
397
397
  })
398
398
  .catch((e) => {
@@ -409,7 +409,7 @@ const tagAndMerge = (pkg, version, branches) => {
409
409
  return utils.git.tagVersion(
410
410
  version, branches.branch,
411
411
  `chore(release): tagging ${version} - from CI server`,
412
- pkg.paths.pkgDirectory
412
+ pkg.paths.root
413
413
  );
414
414
  }
415
415
  })
@@ -418,7 +418,7 @@ const tagAndMerge = (pkg, version, branches) => {
418
418
  .then(() => {
419
419
  if (branches.isMaster) {
420
420
  utils.tools.logInfo('Branch is master merge back to develop');
421
- return utils.git.mergeMasterToDevelop(pkg, pkg.paths.pkgDirectory, version);
421
+ return utils.git.mergeMasterToDevelop(pkg, pkg.paths.root, version);
422
422
  }
423
423
  })
424
424
 
@@ -426,7 +426,7 @@ const tagAndMerge = (pkg, version, branches) => {
426
426
  .then(() => {
427
427
  if (branches.isSupport && pkg.build && pkg.build.supportSnapshotBranch) {
428
428
  utils.tools.logInfo('Branch is support / supportSnapshotBranch config detected');
429
- return utils.git.mergeSupportToSupportDevelop(pkg, pkg.paths.pkgDirectory, branches.branch, pkg.build.supportSnapshotBranch);
429
+ return utils.git.mergeSupportToSupportDevelop(pkg, pkg.paths.root, branches.branch, pkg.build.supportSnapshotBranch);
430
430
  }
431
431
  })
432
432
 
@@ -25,11 +25,6 @@ module.exports.install = (pkg, isMaster) => {
25
25
  return installUtils.buildPackage.installPackage(prj, pkg, isMaster);
26
26
  })
27
27
 
28
- // CHECK INTERNAL DEPENDENCIES
29
- // .then(() => {
30
- // return auditUtils.deps.audit(pkg);
31
- // })
32
-
33
28
  // CHECK STYLES USAGE
34
29
  .then(() => {
35
30
  if (!pkg.build || (pkg.build && !pkg.build.skipAudit)) {
@@ -58,7 +58,7 @@ const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBr
58
58
  })
59
59
  .then(() => {
60
60
  if (!pkg.element && !pkg.config) {
61
- return writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget);
61
+ return writePackageJsonCore(newVersion, pkg.paths.publish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget);
62
62
  }
63
63
  })
64
64
  .catch((e) => {
@@ -83,7 +83,7 @@ const writePackageJson = (pkg, newVersion, isSnapshot, isNextBranch, isSupportBr
83
83
  .then((linkedPackages) => Promise.resolve().then(() => {
84
84
  return linkedPackages.reduce((promise, pkg) => {
85
85
  return promise.then(() => (
86
- writePackageJsonCore(newVersion, pkg.paths.pkgPublish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget)
86
+ writePackageJsonCore(newVersion, pkg.paths.publish, isSnapshot, isNextBranch, isSupportBranch, isHotfixBranch, envTarget)
87
87
  ));
88
88
  }, Promise.resolve());
89
89
  }))
package/scripts/index.js CHANGED
@@ -73,9 +73,10 @@ module.exports.testUtils = require('./utils/test/test-utils');
73
73
  // utils - sonar
74
74
  module.exports.sonarUtils = require('./utils/sonar/sonar-utils');
75
75
 
76
-
77
76
  // csdr - audit
78
77
  module.exports.auditUtils = require('./csdr/audit/audit-utils');
78
+ module.exports.auditYarn = require('./csdr/audit/yarn');
79
+ module.exports.audiStyles = require('./csdr/audit/styles');
79
80
 
80
81
  // csdr - cli
81
82
  module.exports.cliUtils = require('./csdr/cli/cli-utils');
@@ -34,8 +34,8 @@ module.exports.build = (pkg, isMaster) => {
34
34
  .then(() => {
35
35
  if (!skipLint) {
36
36
  tools.logInfo('Linting...');
37
- const tsLintPath = path.join(pkg.paths.pkgRootDirectory, 'tslint.json');
38
- const esLintPath = path.join(pkg.paths.pkgRootDirectory, '.eslintrc.json');
37
+ const tsLintPath = path.join(pkg.paths.root, 'tslint.json');
38
+ const esLintPath = path.join(pkg.paths.root, '.eslintrc.json');
39
39
 
40
40
  if (tools.isFileExists(tsLintPath)) {
41
41
  // TODO: remove TSLint since it's deprecated and should not be used by projects in the future
@@ -61,8 +61,8 @@ module.exports.build = (pkg, isMaster) => {
61
61
  tools.logInfo('Testing...');
62
62
  let args = ['--max_old_space_size=8096', ng, 'test', pkg.name];
63
63
  args.push('--code-coverage');
64
- tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.pkgRootDirectory}`);
65
- return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
64
+ tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.root}`);
65
+ return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
66
66
  }
67
67
  })
68
68
  .then(() => {
@@ -73,8 +73,8 @@ module.exports.build = (pkg, isMaster) => {
73
73
  tools.logInfo('Bundling package...');
74
74
  let args = ['--max_old_space_size=8096', ng, 'build', pkg.name];
75
75
 
76
- tools.logInfo(`running ng build : with args: ${args} on folder : ${pkg.paths.pkgRootDirectory}`);
77
- return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
76
+ tools.logInfo(`running ng build : with args: ${args} on folder : ${pkg.paths.root}`);
77
+ return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
78
78
  }
79
79
  })
80
80
  .then(() => {
@@ -84,14 +84,14 @@ module.exports.build = (pkg, isMaster) => {
84
84
  if (!skipDoc && (pkg.build && pkg.build.generateDoc)) {
85
85
  tools.logInfo('Generating Compodoc documentation for package...');
86
86
 
87
- const docDistPath = path.join(pkg.paths.pkgRootDirectory, 'dist', 'docs');
87
+ const docDistPath = path.join(pkg.paths.root, 'dist', 'docs');
88
88
 
89
89
  return Promise.resolve()
90
90
  .then(() => {
91
91
  return tools.rimraf(docDistPath);
92
92
  })
93
93
  .then(() => {
94
- return tools.runScript(`compodoc -p ${pkg.paths.pkgRootDirectory}/${pkg.tsConfigFileName} -d ${docDistPath} --theme material --disableGraph --disableCoverage --disableSourceCode --disableDomTree --disableProtected --disablePrivate --disableLifeCycleHooks --disableTemplateTab --disableStyleTab --hideGenerator --toggleMenuItems all`);
94
+ return tools.runScript(`compodoc -p ${pkg.paths.root}/${pkg.tsConfigFileName} -d ${docDistPath} --theme material --disableGraph --disableCoverage --disableSourceCode --disableDomTree --disableProtected --disablePrivate --disableLifeCycleHooks --disableTemplateTab --disableStyleTab --hideGenerator --toggleMenuItems all`);
95
95
  })
96
96
  .then(() => {
97
97
  tools.logSuccess();
@@ -104,23 +104,23 @@ module.exports.build = (pkg, isMaster) => {
104
104
  .then(() => {
105
105
  if (!skipCompile) {
106
106
  tools.logInfo('Copying assets...');
107
- tools.copydir(path.join(pkg.paths.pkgRootDirectory, 'assets'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'assets'));
107
+ tools.copydir(path.join(pkg.paths.root, 'assets'), path.join(pkg.paths.root, 'dist', 'assets'));
108
108
 
109
109
  tools.logInfo('Copying config...');
110
- tools.copydir(path.join(pkg.paths.pkgRootDirectory, 'config'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'config'));
110
+ tools.copydir(path.join(pkg.paths.root, 'config'), path.join(pkg.paths.root, 'dist', 'config'));
111
111
 
112
112
  tools.logInfo('Copying license...');
113
113
  if (pkg.child) {
114
- tools.copy(path.join(pkg.paths.pkgRootDirectory, '..', '..', 'LICENSE'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'LICENSE'));
114
+ tools.copy(path.join(pkg.paths.root, '..', '..', 'LICENSE'), path.join(pkg.paths.root, 'dist', 'LICENSE'));
115
115
  } else {
116
- tools.copy(path.join(pkg.paths.pkgRootDirectory, 'LICENSE'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'LICENSE'));
116
+ tools.copy(path.join(pkg.paths.root, 'LICENSE'), path.join(pkg.paths.root, 'dist', 'LICENSE'));
117
117
  }
118
118
 
119
119
  tools.logInfo('Copying readme.md...');
120
120
  if (pkg.child) {
121
- tools.copy(path.join(pkg.paths.pkgRootDirectory, '..', '..', 'README.md'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'README.md'));
121
+ tools.copy(path.join(pkg.paths.root, '..', '..', 'README.md'), path.join(pkg.paths.root, 'dist', 'README.md'));
122
122
  } else {
123
- tools.copy(path.join(pkg.paths.pkgRootDirectory, 'README.md'), path.join(pkg.paths.pkgRootDirectory, 'dist', 'README.md'));
123
+ tools.copy(path.join(pkg.paths.root, 'README.md'), path.join(pkg.paths.root, 'dist', 'README.md'));
124
124
  }
125
125
  }
126
126
  })
@@ -153,7 +153,7 @@ module.exports.build = (pkg, isMaster) => {
153
153
 
154
154
  const nmPkgScopePath = path.join(nmPath, pkg.npmPkgScope);
155
155
  const nmPkgPath = path.join(nmPkgScopePath, pkg.npmPkgName);
156
- const pkgDistPath = path.join(pkg.paths.pkgRootDirectory, 'dist');
156
+ const pkgDistPath = path.join(pkg.paths.root, 'dist');
157
157
 
158
158
  return Promise.resolve()
159
159
  .then(() => {
@@ -62,7 +62,7 @@ module.exports.build = (pkg, isMaster) => {
62
62
  if (!skipLint) {
63
63
  tools.logInfo(`Styles Linting element...`);
64
64
 
65
- // return tools.runScript(`stylelint ${pkg.paths.pkgRootDirectory}/src/app/**/*.scss`);
65
+ // return tools.runScript(`stylelint ${pkg.paths.root}/src/app/**/*.scss`);
66
66
  const stylelint = path.resolve(pkg.paths.repoNodeModules, 'stylelint', 'bin', 'stylelint');
67
67
  const args = [stylelint, `${pkg.paths.root}/src/app/**/*.scss`];
68
68
 
@@ -13,9 +13,9 @@ module.exports.build = (pkg, isMaster) => {
13
13
  tools.logInfo('Executing maven build...');
14
14
 
15
15
  if (pkg.build && pkg.build.mavenTestCommand) {
16
- return mavenUtils.execute(pkg.paths.pkgDirectory, pkg.build.mavenTestCommand);
16
+ return mavenUtils.execute(pkg.paths.root, pkg.build.mavenTestCommand);
17
17
  } else {
18
- return mavenUtils.execute(pkg.paths.pkgDirectory, 'clean test package');
18
+ return mavenUtils.execute(pkg.paths.root, 'clean test package');
19
19
  }
20
20
  })
21
21
 
@@ -29,15 +29,15 @@ module.exports.build = (pkg, isMaster) => {
29
29
  })
30
30
  .then(() => {
31
31
  return tools.copydir(
32
- path.join(pkg.paths.pkgRootDirectory, 'assets'),
33
- path.join(pkg.paths.pkgBuild, 'assets')
32
+ path.join(pkg.paths.root, 'assets'),
33
+ path.join(pkg.paths.dist, 'assets')
34
34
  );
35
35
  })
36
36
  .then(() => {
37
37
  console.log('assets copy succeeded');
38
- tools.copy(path.join(pkg.paths.pkgRootDirectory, 'package.json'), path.join(pkg.paths.pkgBuild, 'package.json'));
39
- tools.copy(path.join(pkg.paths.pkgRootDirectory, 'README.md'), path.join(pkg.paths.pkgBuild, 'README.md'));
40
- tools.copy(path.join(pkg.paths.pkgRootDirectory, 'LICENSE'), path.join(pkg.paths.pkgBuild, 'LICENSE'));
38
+ tools.copy(path.join(pkg.paths.root, 'package.json'), path.join(pkg.paths.dist, 'package.json'));
39
+ tools.copy(path.join(pkg.paths.root, 'README.md'), path.join(pkg.paths.dist, 'README.md'));
40
+ tools.copy(path.join(pkg.paths.root, 'LICENSE'), path.join(pkg.paths.dist, 'LICENSE'));
41
41
  })
42
42
 
43
43
  .then(() => {
@@ -199,10 +199,10 @@ const compileSassFile = (pkg, folder, filename, isNodeSassTildeImporterActive) =
199
199
  module.exports.build = (pkg) => {
200
200
  tools.logInfo('Building STYLES package...');
201
201
 
202
- const srcFolder = pkg.paths.pkgSrc;
203
- const srcOutFolder = path.join(pkg.paths.pkgBuild, 'src');
204
- const tmpFolder = path.join(pkg.paths.pkgBuild, 'tmp');
205
- const distFolder = path.join(pkg.paths.pkgBuild, 'dist');
202
+ const srcFolder = pkg.paths.src;
203
+ const srcOutFolder = path.join(pkg.paths.dist, 'src');
204
+ const tmpFolder = path.join(pkg.paths.dist, 'tmp');
205
+ const distFolder = path.join(pkg.paths.dist, 'dist');
206
206
 
207
207
  if (!skipCompile) {
208
208
 
@@ -252,9 +252,9 @@ module.exports.build = (pkg) => {
252
252
  })
253
253
  .then(() => {
254
254
  console.log('assets copy succeeded');
255
- tools.copy(path.join(pkg.paths.pkgRootDirectory, 'package.json'), path.join(pkg.paths.pkgBuild, 'package.json'));
256
- tools.copy(path.join(pkg.paths.pkgRootDirectory, 'README.md'), path.join(pkg.paths.pkgBuild, 'README.md'));
257
- tools.copy(path.join(pkg.paths.pkgRootDirectory, 'LICENSE'), path.join(pkg.paths.pkgBuild, 'LICENSE'));
255
+ tools.copy(path.join(pkg.paths.root, 'package.json'), path.join(pkg.paths.dist, 'package.json'));
256
+ tools.copy(path.join(pkg.paths.root, 'README.md'), path.join(pkg.paths.dist, 'README.md'));
257
+ tools.copy(path.join(pkg.paths.root, 'LICENSE'), path.join(pkg.paths.dist, 'LICENSE'));
258
258
  })
259
259
  .then(() => {
260
260
  return tools.rimraf(tmpFolder);
@@ -47,7 +47,7 @@ module.exports.generate = (pkg, version, commits) => {
47
47
 
48
48
  return Promise.resolve()
49
49
  .then(() => {
50
- return gitUtils.getRepoUrl(pkg.paths.pkgDirectory);
50
+ return gitUtils.getRepoUrl(pkg.paths.root);
51
51
  })
52
52
  .then((repoUrlFound) => {
53
53
  repoUrl = repoUrlFound;
@@ -7,19 +7,19 @@ module.exports.cleanPackage = (pkg) => {
7
7
  return Promise.resolve()
8
8
  .then(() => {
9
9
  tools.logInfo('Cleaning dist')
10
- return tools.rimraf(pkg.paths.pkgDirectory + '/**/dist');
10
+ return tools.rimraf(pkg.paths.root + '/**/dist');
11
11
  })
12
12
  .then(() => {
13
13
  tools.logInfo('Cleaning out-tsc')
14
- return tools.rimraf(pkg.paths.pkgDirectory + '/**/out-tsc');
14
+ return tools.rimraf(pkg.paths.root + '/**/out-tsc');
15
15
  })
16
16
  .then(() => {
17
17
  tools.logInfo('Cleaning temp js files')
18
- return tools.rimraf(pkg.paths.pkgDirectory + '**/src/lib/**/*.js');
18
+ return tools.rimraf(pkg.paths.root + '**/src/lib/**/*.js');
19
19
  })
20
20
  .then(() => {
21
21
  tools.logInfo('Cleaning temp js map files')
22
- return tools.rimraf(pkg.paths.pkgDirectory + '**/src/lib/**/*.js.map');
22
+ return tools.rimraf(pkg.paths.root + '**/src/lib/**/*.js.map');
23
23
  })
24
24
  .then(() => {
25
25
  tools.logSuccess();
@@ -5,10 +5,7 @@ const path = require('path');
5
5
  const tools = require('../../tools');
6
6
  const configUtils = require('../../../csdr/config/config-utils');
7
7
 
8
- let {
9
- skipLint, skipTest, baseHref, maxSpaceSize, sourceMap,
10
- } = tools.getArgs();
11
-
8
+ let { skipLint, fix } = tools.getArgs();
12
9
 
13
10
  const getProjectInfos = () => {
14
11
  // getting the project from installed config
@@ -29,28 +26,13 @@ module.exports.run = () => {
29
26
 
30
27
  const currentProject = getProjectInfos();
31
28
 
32
- const ng = path.resolve(currentProject.paths.nodeModulesPath, '@angular', 'cli', 'bin', 'ng');
33
-
34
29
  // getting param from project config
35
30
  if (currentProject.build) {
36
31
  if (currentProject.build.skipLint) {
37
32
  skipLint = true;
38
33
  }
39
- if (currentProject.build.skipTest) {
40
- skipTest = true;
41
- }
42
- if (currentProject.build.maxSpaceSize) {
43
- maxSpaceSize = true;
44
- }
45
- if (currentProject.build.sourceMap) {
46
- sourceMap = true;
47
- }
48
- // getting baseHref from project config, dynamic or staticly defined
49
- baseHref = configUtils.projects.getBaseHref(currentProject, version, baseHref);
50
- tools.logInfo(`base-href found : ${baseHref}`);
51
34
  }
52
35
 
53
-
54
36
  return Promise.resolve()
55
37
  .then(() => {
56
38
  if (!skipLint) {
@@ -72,10 +54,14 @@ module.exports.run = () => {
72
54
  }
73
55
  } else if (esLintPath) {
74
56
  // the project path information are located inside the .eslintrc.json
75
- tools.logInfo(`running ng lint ${currentProject.name}`);
76
- return tools.runScript(`ng lint ${currentProject.name}`);
57
+ let script = `ng lint ${currentProject.name}`;
58
+ if (fix) {
59
+ script += ' --fix';
60
+ }
61
+ tools.logInfo(`running ${script}`);
62
+ return tools.runScript(script);
77
63
  } else {
78
- tools.logError(`No ESLint or TSLint configuration found for the project`);
64
+ tools.logError(`No ESLint or TSLint configuration found for the project...skipping`);
79
65
  }
80
66
 
81
67
  }
@@ -52,7 +52,7 @@ module.exports.generate = (inputScopes = 'opsys,cc,mywp,sygma,gem,cotg,eac') =>
52
52
  });
53
53
 
54
54
  configUtils.packages.getPackages().forEach((pkg) => {
55
- const localPath = configUtils.packages.getPackagePaths(pkg).pkgRootDirectory;
55
+ const localPath = configUtils.packages.getPackagePaths(pkg).root;
56
56
  console.log(localPath);
57
57
  packages.push(localPath);
58
58
  })
@@ -20,7 +20,7 @@ module.exports.publish = (pkg) => {
20
20
  tools.logInfo('DRY-RUN...skipping');
21
21
 
22
22
  } else {
23
- return mavenUtils.execute(pkg.paths.pkgDirectory, 'clean deploy -DskipTests');
23
+ return mavenUtils.execute(pkg.paths.root, 'clean deploy -DskipTests');
24
24
  }
25
25
 
26
26
  } else {
@@ -105,18 +105,18 @@ const runUI = (pkg, isMaster) => {
105
105
 
106
106
  return Promise.resolve()
107
107
  .then(() => {
108
- return gitUtils.getShortHash(pkg.paths.pkgDirectory);
108
+ return gitUtils.getShortHash(pkg.paths.root);
109
109
  })
110
110
  .then((gitShortHash) => {
111
111
  return templateUtils.generateSonarPropertiesUI(
112
- pkg.name, gitShortHash, pkg.paths.pkgDirectory
112
+ pkg.name, gitShortHash, pkg.paths.root
113
113
  );
114
114
  })
115
115
  .then(() => {
116
116
  if (!dryRun) {
117
117
  tools.logInfo('Calling Sonar scanner...');
118
118
  const SONAR_HOST = configUtils.global.getConfigOptions().SONAR_HOST;
119
- return execa.shellSync(`sonar-scanner -Dsonar.branch.name=${branch} -Dsonar.host.url=${SONAR_HOST} -Dsonar.login=${sonarQubeToken}`, { cwd: pkg.paths.pkgDirectory, stdio: 'inherit' });
119
+ return execa.shellSync(`sonar-scanner -Dsonar.branch.name=${branch} -Dsonar.host.url=${SONAR_HOST} -Dsonar.login=${sonarQubeToken}`, { cwd: pkg.paths.root, stdio: 'inherit' });
120
120
  }
121
121
  })
122
122
  .catch((e) => {
@@ -136,11 +136,11 @@ const runBackend = (pkg, isMaster) => {
136
136
  tools.logInfo('Generating project template file...');
137
137
  })
138
138
  .then(() => {
139
- return mavenUtils.getPomInfos(pkg.paths.pkgDirectory);
139
+ return mavenUtils.getPomInfos(pkg.paths.root);
140
140
  })
141
141
  .then((pomInfos) => {
142
142
  return templateUtils.generateSonarPropertiesBackend(
143
- pomInfos.groupId, pomInfos.artifactId, pomInfos.version, pomInfos.modulesList, pkg.paths.pkgDirectory
143
+ pomInfos.groupId, pomInfos.artifactId, pomInfos.version, pomInfos.modulesList, pkg.paths.root
144
144
  );
145
145
  })
146
146
  .then(() => {
@@ -151,7 +151,7 @@ const runBackend = (pkg, isMaster) => {
151
151
  if (!dryRun) {
152
152
  tools.logInfo('Calling Sonar scanner...');
153
153
  const SONAR_HOST = configUtils.global.getConfigOptions().SONAR_HOST;
154
- return execa.shellSync(`sonar-scanner -Dsonar.branch.name=${branch} -Dsonar.host.url=${SONAR_HOST} -Dsonar.login=${sonarQubeToken}`, { cwd: pkg.paths.pkgDirectory, stdio: 'inherit' });
154
+ return execa.shellSync(`sonar-scanner -Dsonar.branch.name=${branch} -Dsonar.host.url=${SONAR_HOST} -Dsonar.login=${sonarQubeToken}`, { cwd: pkg.paths.root, stdio: 'inherit' });
155
155
  }
156
156
  })
157
157
  .catch((e) => {
@@ -30,9 +30,9 @@ module.exports.run = () => {
30
30
 
31
31
  args.push('--code-coverage');
32
32
 
33
- tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.pkgRootDirectory}`);
33
+ tools.logInfo(`running ng test : with args: ${args} on folder : ${pkg.paths.root}`);
34
34
 
35
- return execa('node', args, { cwd: pkg.paths.pkgRootDirectory, stdio: 'inherit' });
35
+ return execa('node', args, { cwd: pkg.paths.root, stdio: 'inherit' });
36
36
  })
37
37
 
38
38
  .catch((e) => {
@@ -55,9 +55,9 @@ module.exports.runMocha = (pkg) => {
55
55
  let args;
56
56
 
57
57
  if (!skipCoverage && !build) {
58
- args = [nyc, '--reporter=text', mocha, pkg.paths.pkgFromRoot + '/**/*.test.js'];
58
+ args = [nyc, '--reporter=text', mocha, pkg.paths.fromRoot + '/**/*.test.js'];
59
59
  } else {
60
- args = [mocha, pkg.paths.pkgFromRoot + '/**/*.test.js'];
60
+ args = [mocha, pkg.paths.fromRoot + '/**/*.test.js'];
61
61
  }
62
62
  if (watch) {
63
63
  args.push('--watch');
@@ -1,89 +0,0 @@
1
- 'use strict';
2
-
3
- // GLOBAL
4
- const path = require('path');
5
- const glob = require('glob');
6
-
7
- // LOCAL
8
- const tools = require('../../utils/tools');
9
- const notificationUtils = require('../../utils/notification/notification-utils');
10
-
11
-
12
- module.exports.audit = (pkg) => {
13
- tools.logTitle('Auditiing package internal dependencies complexity');
14
-
15
- return Promise.resolve()
16
- .then(() => {
17
- var depsFound = [];
18
- var files = glob.sync('**/*.ts', { cwd: pkg.paths.pkgLibFolder, nodir: true, follow: true, dot: true });
19
- files.forEach(file => {
20
- const filePath = path.join(pkg.paths.pkgLibFolder, file);
21
- const fileContent = tools.getFileContent(filePath);
22
- var regex = /@cc\/|@mywp\/|@opsys\/|@sfc\//gi, result, indices = [];
23
- while ( (result = regex.exec(fileContent)) ) {
24
- indices.push(result.index);
25
- }
26
- if (indices.length !== 0) {
27
- // tools.logInfo(`Number of occurences found : ${indices.length}`);
28
- indices.forEach((i) => {
29
- const endPos = fileContent.substr(i, 40).indexOf("'");
30
- const dep = fileContent.substr(i, endPos);
31
- if (endPos > -1) {
32
- // tools.logInfo(`dep found on : ${dep}`);
33
- depsFound.push(dep);
34
-
35
- } else {
36
- tools.logInfo(`Potential wrong import detected on file : ${file}`);
37
- const subContent = fileContent.substr(i, 40);
38
- const detectMultiSlashes = subContent.match(/\//g);
39
- if (detectMultiSlashes.length > 0) {
40
- tools.logError('Multislashes on import : ');
41
- console.log(subContent);
42
- }
43
- }
44
- })
45
- }
46
- });
47
- depsFound = tools.removeArrayDuplicates(depsFound);
48
- tools.logWarning(`Dependencies found : ${depsFound.length}`);
49
- console.log(depsFound);
50
-
51
- return depsFound;
52
- })
53
-
54
- .then((depsFound) => {
55
- var depsLevel;
56
-
57
- switch(true) {
58
- case (depsFound.length === 1):
59
- depsLevel = 'LOW (1)';
60
- break;
61
- case (depsFound.length > 1 && depsFound.length <= 3):
62
- depsLevel = 'MEDIUM (between 1 and 3)';
63
- break;
64
- case (depsFound.length > 3 && depsFound.length <= 5):
65
- depsLevel = 'HIGH (between 3 and 5)';
66
- break;
67
- case (depsFound.length > 5):
68
- depsLevel = 'VERY HIGH (>5)';
69
- break;
70
- default:
71
- depsLevel = 'NONE';
72
- }
73
-
74
- var message = `Internal dependencies detected : ${depsFound.length} - deps level: ${depsLevel}\n`;
75
- message += depsFound.join('\n');
76
-
77
-
78
- return notificationUtils.package.sendPackageMessage({
79
- package: pkg,
80
- text: message
81
- });
82
- })
83
-
84
- .catch((e) => {
85
- console.log(e);
86
- })
87
-
88
- }
89
-