@eui/tools 5.0.0-rc.1 → 5.0.0-rc.5

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 (22) hide show
  1. package/.version.properties +1 -1
  2. package/CHANGELOG.md +36 -0
  3. package/package.json +11 -15
  4. package/scripts/csdr/cli/skeletons/app-showcase/angular-config.json +28 -98
  5. package/scripts/csdr/cli/skeletons/app-showcase/dependencies-composite.json +1 -1
  6. package/scripts/csdr/cli/skeletons/app-showcase/src/app/app.component.html +18 -16
  7. package/scripts/csdr/cli/skeletons/app-showcase/src/app/app.routes.ts +1 -1
  8. package/scripts/csdr/cli/skeletons/app-showcase/src/app/features/_home/home.module.ts +2 -2
  9. package/scripts/csdr/cli/skeletons/app-showcase/src/app/features/shared/shared.module.ts +15 -0
  10. package/scripts/csdr/cli/skeletons/app-showcase/src/index.html +22 -0
  11. package/scripts/csdr/config/angular.js +47 -8
  12. package/scripts/csdr/install/common.js +1 -1
  13. package/scripts/csdr/jira/jira-utils.js +19 -19
  14. package/scripts/csdr/metadata/app-envs.js +3 -2
  15. package/scripts/csdr/metadata/app-history.js +3 -2
  16. package/scripts/csdr/metadata/package-history.js +0 -1
  17. package/scripts/csdr/release/package/release-package.js +9 -1
  18. package/scripts/utils/build/package/styles.js +85 -88
  19. package/scripts/utils/pre-build/injection/app-sources-full-skeleton/src/_generated/app/app.module.ts +1 -1
  20. package/scripts/utils/pre-build/injection/app-sources-full-skeleton/src/_generated/favicon.ico +0 -0
  21. package/scripts/utils/pre-build/injection/app-sources-full-skeleton/tsconfig.app.json +2 -1
  22. package/scripts/utils/pre-build/projects.js +16 -8
package/.version.properties CHANGED
@@ -1 +1 @@
1
- 5.0.0-rc.1
1
+ 5.0.0-rc.5
package/CHANGELOG.md CHANGED
@@ -1,3 +1,39 @@
1
+ ## 5.0.0-rc.5 (2021-09-21)
2
+
3
+ ##### Chores
4
+
5
+ * **other:**
6
+ * added development mode in angular generated config - EUI-4106 [EUI-4106](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4106) ([a12920db](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/a12920db9c9e48eea7be4b33c1a1ebaac33c19a8))
7
+
8
+ * * *
9
+ * * *
10
+ ## 5.0.0-rc.4 (2021-09-20)
11
+
12
+ ##### Bug Fixes
13
+
14
+ * **other:**
15
+ * check eui-styles-base on dependencies pulling - adapted from 4.x fixes - EUI-4112 [EUI-4112](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4112) ([cb633675](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/cb633675984b71ad6cf96dce2cfc8cac7d3e53b7))
16
+
17
+ * * *
18
+ * * *
19
+ ## 5.0.0-rc.3 (2021-09-08)
20
+
21
+ ##### Bug Fixes
22
+
23
+ * **other:**
24
+ * adjusted to lower postcss dependencies and plugins - EUI-4112 [EUI-4112](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4112) ([4caa36b2](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/4caa36b2b3abdb3ee6b0863d840870cac761e0f5))
25
+
26
+ * * *
27
+ * * *
28
+ ## 5.0.0-rc.2 (2021-09-08)
29
+
30
+ ##### Bug Fixes
31
+
32
+ * **other:**
33
+ * showcase skeleton adapted for v13 - EUI-4112 [EUI-4112](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-4112) ([2c4442b3](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/2c4442b3274df53e48c0eb9d35317f639402185e))
34
+
35
+ * * *
36
+ * * *
1
37
  ## 5.0.0-rc.1 (2021-09-08)
2
38
 
3
39
  ##### Bug Fixes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "5.0.0-rc.1",
3
+ "version": "5.0.0-rc.5",
4
4
  "tag": "next",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
@@ -22,29 +22,25 @@
22
22
  "rimraf": "3.0.2",
23
23
  "ncp": "2.0.0",
24
24
  "confluence-api": "1.4.0",
25
- "moment": "2.24.0",
26
- "moment-timezone": "0.5.25",
27
- "sanitize-html": "2.3.3",
25
+ "moment": "2.29.1",
26
+ "moment-timezone": "0.5.33",
28
27
  "npm-run-all": "4.1.5",
29
28
  "figures": "3.2.0",
30
- "xml2js": "0.4.19",
29
+ "xml2js": "0.4.23",
31
30
  "https-proxy-agent": "2.2.3",
32
31
  "jest": "26.6.3",
33
32
  "supertest": "4.0.2",
34
- "memfs": "3.1.2",
35
- "json-server": "0.16.1",
36
- "faker": "4.1.0",
37
- "nodemon": "1.19.0",
33
+ "memfs": "3.2.4",
34
+ "json-server": "0.16.3",
35
+ "faker": "5.5.3",
36
+ "nodemon": "2.0.12",
38
37
  "lowdb": "1.0.0",
39
38
  "event-stream": "3.3.4",
40
- "axios": "0.21.1",
41
39
  "empty-module": "0.0.2",
42
- "pa11y-ci": "2.4.0",
43
40
  "sendmail": "1.6.1",
44
41
  "sass": "1.39.0",
45
- "cssnano": "4.1.10",
46
- "postcss": "8.3.6",
47
- "postcss-cli": "8.3.1",
48
- "autoprefixer": "10.3.4"
42
+ "postcss": "7.0.36",
43
+ "cssnano": "4.1.11",
44
+ "autoprefixer": "9.6.1"
49
45
  }
50
46
  }
package/scripts/csdr/cli/skeletons/app-showcase/angular-config.json CHANGED
@@ -1,103 +1,33 @@
1
1
  {
2
- "config": {
3
- "root": "",
4
- "sourceRoot": "apps/@app.name@/src",
5
- "projectType": "application",
6
- "prefix": "app",
7
- "schematics": {
8
- "@schematics/angular:component": {
9
- "styleext": "scss"
10
- }
11
- },
12
- "architect": {
13
- "build": {
14
- "builder": "ngx-build-plus:build",
15
- "options": {
16
- "outputPath": "apps/@app.name@/dist",
17
- "index": "apps/@app.name@/src/_generated/index.html",
18
- "main": "apps/@app.name@/src/_generated/main.ts",
19
- "polyfills": "apps/@app.name@/src/_generated/polyfills.ts",
20
- "tsConfig": "apps/@app.name@/tsconfig.app.json",
21
- "assets": [
22
- "apps/@app.name@/src/_generated/favicon.ico",
23
- "apps/@app.name@/src/assets",
24
- {
25
- "glob": "**/*",
26
- "input": "node_modules/@eui/core/assets/",
27
- "output": "./assets"
28
- }
29
- ],
30
- "styles": [
31
- "node_modules/@eui/styles/dist/styles/eui.css",
32
- "node_modules/@eui/styles/dist/styles/eui-next.css"
33
- ]
34
- },
35
- "configurations": {
36
- "production": {
37
- "fileReplacements": [
38
- {
39
- "replace": "apps/@app.name@/src/_generated/environments/environment.ts",
40
- "with": "apps/@app.name@/src/_generated/environments/environment.prod.ts"
41
- }
42
- ],
43
- "optimization": false,
44
- "outputHashing": "all",
45
- "sourceMap": false,
46
- "extractCss": true,
47
- "namedChunks": true,
48
- "aot": true,
49
- "extractLicenses": true,
50
- "vendorChunk": false,
51
- "buildOptimizer": false,
52
- "budgets": [
53
- {
54
- "type": "initial",
55
- "maximumWarning": "2mb",
56
- "maximumError": "6mb"
57
- }
58
- ]
59
- },
60
- "production-optimized": {
61
- "fileReplacements": [
62
- {
63
- "replace": "apps/@app.name@/src/_generated/environments/environment.ts",
64
- "with": "apps/@app.name@/src/_generated/environments/environment.prod.ts"
65
- }
66
- ],
67
- "optimization": true,
68
- "outputHashing": "all",
69
- "sourceMap": false,
70
- "extractCss": true,
71
- "namedChunks": true,
72
- "aot": true,
73
- "extractLicenses": true,
74
- "vendorChunk": false,
75
- "buildOptimizer": true,
76
- "budgets": [
77
- {
78
- "type": "initial",
79
- "maximumWarning": "2mb",
80
- "maximumError": "6mb"
81
- }
82
- ]
83
- }
84
- }
2
+ "build": {
3
+ "assets": [
4
+ "apps/@app.name@/src/_generated/favicon.ico",
5
+ "apps/@app.name@/src/assets",
6
+ {
7
+ "glob": "**/*",
8
+ "input": "node_modules/@eui/core/assets/",
9
+ "output": "./assets"
85
10
  },
86
- "serve": {
87
- "builder": "@angular-devkit/build-angular:dev-server",
88
- "options": {
89
- "browserTarget": "@app.name@:build"
90
- },
91
- "configurations": {
92
- "proxy-mock": {
93
- "browserTarget": "@app.name@:build",
94
- "proxyConfig": "apps/@app.name@/proxy-mock.conf.json"
95
- },
96
- "production": {
97
- "browserTarget": "@app.name@:build:production"
98
- }
99
- }
11
+ {
12
+ "glob": "**/*",
13
+ "input": "node_modules/@eui/styles-base/src/assets/",
14
+ "output": "./assets"
100
15
  }
101
- }
16
+ ],
17
+ "styles": [
18
+ "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css",
19
+ "packages/eui/packages/styles/src/styles/eui-showcase-dev-only.scss",
20
+ "packages/eui/packages/styles/src/styles/eui-next-dev-only.scss"
21
+ ],
22
+ "stylesBuild": [
23
+ "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.css",
24
+ "node_modules/@eui/styles/dist/styles/eui-showcase.css",
25
+ "node_modules/@eui/styles/dist/styles/eui-next.css"
26
+ ],
27
+ "scripts": [
28
+ "node_modules/prismjs/plugins/line-numbers/prism-line-numbers.js",
29
+ "node_modules/marked/lib/marked.js",
30
+ "node_modules/prismjs/prism.js"
31
+ ]
102
32
  }
103
33
  }
package/scripts/csdr/cli/skeletons/app-showcase/dependencies-composite.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "dependencies": {
3
- "@eui/deps-base": "^10.0.0"
3
+ "@eui/deps-base": "^13.0.0"
4
4
  }
5
5
  }
package/scripts/csdr/cli/skeletons/app-showcase/src/app/app.component.html CHANGED
@@ -1,20 +1,22 @@
1
1
  <eui-app [isSidebarOpen]="true" isSidebarHidden="false">
2
- <eui-toolbar>
3
- <eui-toolbar-logo></eui-toolbar-logo>
4
- <eui-toolbar-app appName="eUI"></eui-toolbar-app>
5
- <eui-toolbar-items euiPositionRight>
6
- <eui-toolbar-item-user-profile>
7
- <eui-user-profile-menu>
8
- <eui-user-profile-menu-item>
9
- <eui-icon iconClass="eui-icon-person-thin"></eui-icon> My profile information
10
- </eui-user-profile-menu-item>
11
- <eui-user-profile-menu-item>
12
- <eui-icon iconClass="eui-icon-logout-thin"></eui-icon> Sign out
13
- </eui-user-profile-menu-item>
14
- </eui-user-profile-menu>
15
- </eui-toolbar-item-user-profile>
16
- </eui-toolbar-items>
17
- </eui-toolbar>
2
+ <eui-app-toolbar>
3
+ <eui-toolbar>
4
+ <eui-toolbar-logo></eui-toolbar-logo>
5
+ <eui-toolbar-app appName="eUI"></eui-toolbar-app>
6
+ <eui-toolbar-items euiPositionRight>
7
+ <eui-toolbar-item-user-profile>
8
+ <eui-user-profile-menu>
9
+ <eui-user-profile-menu-item>
10
+ <eui-icon iconClass="eui-icon-person-thin"></eui-icon> My profile information
11
+ </eui-user-profile-menu-item>
12
+ <eui-user-profile-menu-item>
13
+ <eui-icon iconClass="eui-icon-logout-thin"></eui-icon> Sign out
14
+ </eui-user-profile-menu-item>
15
+ </eui-user-profile-menu>
16
+ </eui-toolbar-item-user-profile>
17
+ </eui-toolbar-items>
18
+ </eui-toolbar>
19
+ </eui-app-toolbar>
18
20
 
19
21
  <eui-app-sidebar>
20
22
  <eui-app-sidebar-body>
package/scripts/csdr/cli/skeletons/app-showcase/src/app/app.routes.ts CHANGED
@@ -3,5 +3,5 @@ import { Routes } from '@angular/router';
3
3
  export const routes: Routes = [
4
4
  { path: '', redirectTo: 'home', pathMatch: 'full' },
5
5
  { path: 'index.html', redirectTo: 'home', pathMatch: 'full' },
6
- { path: 'home', loadChildren: './features/_home/home.module#Module' },
6
+ { path: 'home', loadChildren: () => import('./features/_home/home.module').then(m => m.Module) },
7
7
  ];
package/scripts/csdr/cli/skeletons/app-showcase/src/app/features/_home/home.module.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { NgModule } from '@angular/core';
2
2
 
3
- import { EuiPageModule } from '@eui/components-next';
3
+ import { SharedModule } from '../shared/shared.module';
4
4
 
5
5
  import { HomeRoutingModule } from './home-routing.module';
6
6
  import { HomeComponent } from './home.component';
@@ -8,7 +8,7 @@ import { HomeComponent } from './home.component';
8
8
  @NgModule({
9
9
  imports: [
10
10
  HomeRoutingModule,
11
- EuiPageModule,
11
+ SharedModule,
12
12
  ],
13
13
  declarations: [
14
14
  HomeComponent,
package/scripts/csdr/cli/skeletons/app-showcase/src/app/features/shared/shared.module.ts ADDED
@@ -0,0 +1,15 @@
1
+ import { NgModule } from '@angular/core';
2
+
3
+ import { EuiAllModule } from '@eui/components';
4
+
5
+ @NgModule({
6
+ imports: [
7
+ EuiAllModule,
8
+ ],
9
+ declarations: [
10
+ ],
11
+ exports: [
12
+ EuiAllModule,
13
+ ],
14
+ })
15
+ export class SharedModule {}
package/scripts/csdr/cli/skeletons/app-showcase/src/index.html ADDED
@@ -0,0 +1,22 @@
1
+ <!doctype html>
2
+ <html>
3
+
4
+ <head>
5
+ <meta charset="utf-8">
6
+ <title>eUI - UX</title>
7
+ <base href="/">
8
+
9
+ <meta name="viewport" content="width=device-width, initial-scale=1">
10
+ <link rel="icon" type="image/x-icon" href="favicon.ico">
11
+ <script src="https://ec.europa.eu/wel/cookie-consent/consent.js" type="text/javascript" defer></script>
12
+ </head>
13
+
14
+ <body>
15
+ <app-root>
16
+ <div id="loader-wrapper">
17
+ <div id="loader"></div>
18
+ </div>
19
+ </app-root>
20
+ </body>
21
+
22
+ </html>
package/scripts/csdr/config/angular.js CHANGED
@@ -132,7 +132,14 @@ const angularProjectDef = {
132
132
  "with": "node_modules/@eui/base/assets/openid/openid-login.js"
133
133
  }
134
134
  ],
135
- "optimization": true,
135
+ "optimization": {
136
+ "scripts": true,
137
+ "styles": {
138
+ "minify": false,
139
+ "inlineCritical": false
140
+ },
141
+ "fonts": true
142
+ },
136
143
  "outputHashing": "all",
137
144
  "sourceMap": false,
138
145
  "extractCss": true,
@@ -156,7 +163,14 @@ const angularProjectDef = {
156
163
  "with": "apps/@project.name@/src/environments/environment.prod.ts"
157
164
  }
158
165
  ],
159
- "optimization": true,
166
+ "optimization": {
167
+ "scripts": true,
168
+ "styles": {
169
+ "minify": false,
170
+ "inlineCritical": false
171
+ },
172
+ "fonts": true
173
+ },
160
174
  "outputHashing": "all",
161
175
  "sourceMap": false,
162
176
  "extractCss": true,
@@ -253,8 +267,6 @@ const angularProjectDefFullSkeleton = {
253
267
  }
254
268
  ],
255
269
  "styles": [
256
- "node_modules/@eui/styles/dist/styles/eui.css",
257
- "node_modules/@eui/styles/dist/styles/eui-next.css"
258
270
  ]
259
271
  },
260
272
  "configurations": {
@@ -289,7 +301,14 @@ const angularProjectDefFullSkeleton = {
289
301
  "with": "apps/@project.name@/src/_generated/environments/environment.prod.ts"
290
302
  }
291
303
  ],
292
- "optimization": true,
304
+ "optimization": {
305
+ "scripts": true,
306
+ "styles": {
307
+ "minify": false,
308
+ "inlineCritical": true
309
+ },
310
+ "fonts": true
311
+ },
293
312
  "outputHashing": "all",
294
313
  "sourceMap": false,
295
314
  "extractCss": true,
@@ -305,8 +324,17 @@ const angularProjectDefFullSkeleton = {
305
324
  "maximumError": "6mb"
306
325
  }
307
326
  ]
327
+ },
328
+ "development": {
329
+ "buildOptimizer": false,
330
+ "optimization": false,
331
+ "vendorChunk": true,
332
+ "extractLicenses": false,
333
+ "sourceMap": true,
334
+ "namedChunks": true
308
335
  }
309
- }
336
+ },
337
+ "defaultConfiguration": "production"
310
338
  },
311
339
  "serve": {
312
340
  "builder": "@angular-devkit/build-angular:dev-server",
@@ -320,8 +348,12 @@ const angularProjectDefFullSkeleton = {
320
348
  },
321
349
  "production": {
322
350
  "browserTarget": "@project.name@:build:production"
351
+ },
352
+ "development": {
353
+ "browserTarget": "@project.name@:build:development"
323
354
  }
324
- }
355
+ },
356
+ "defaultConfiguration": "development"
325
357
  }
326
358
  }
327
359
  };
@@ -374,7 +406,14 @@ const angularProjectDefConfigurationOptimized = {
374
406
  "with": "node_modules/@eui/base/assets/openid/openid-login.js"
375
407
  }
376
408
  ],
377
- "optimization": true,
409
+ "optimization": {
410
+ "scripts": true,
411
+ "styles": {
412
+ "minify": false,
413
+ "inlineCritical": true
414
+ },
415
+ "fonts": true
416
+ },
378
417
  "outputHashing": "all",
379
418
  "sourceMap": false,
380
419
  "extractCss": true,
package/scripts/csdr/install/common.js CHANGED
@@ -199,7 +199,7 @@ const getLocalPackagesDeps = () => {
199
199
  const pdeps = Object.keys(pkgDeps)
200
200
  .reduce((acc, k) => {
201
201
  if (k.indexOf('@eui') !== -1 ) {
202
- if (k.indexOf('@eui/ecl') !== -1) {
202
+ if (k.indexOf('@eui/ecl') !== -1 || k.indexOf('@eui/styles-base') !== -1) {
203
203
  acc[k] = pkgDeps[k];
204
204
  }
205
205
  } else {
package/scripts/csdr/jira/jira-utils.js CHANGED
@@ -3,7 +3,7 @@
3
3
  // GLOBAL
4
4
  const execa = require('execa');
5
5
  const moment = require('moment');
6
- const axios = require('axios');
6
+ // const axios = require('axios');
7
7
 
8
8
  // LOCAL
9
9
  const tools = require('../../utils/tools');
@@ -135,27 +135,27 @@ const doCall = (options) => {
135
135
  const JIRA_BASE_URL = 'https://webgate.ec.europa.eu/CITnet/jira/rest/api/2/';
136
136
  const { jiraUser, jiraPassword } = tools.getArgs();
137
137
 
138
- axios.defaults.headers.post['Content-Type'] = 'application/json';
139
- axios.defaults.headers.put['Content-Type'] = 'application/json';
138
+ // axios.defaults.headers.post['Content-Type'] = 'application/json';
139
+ // axios.defaults.headers.put['Content-Type'] = 'application/json';
140
140
 
141
141
  return Promise.resolve()
142
142
  .then(() => {
143
- return axios({
144
- baseURL: JIRA_BASE_URL,
145
- url: options.url,
146
- method: options.method,
147
- data: options.data || {},
148
- auth: {
149
- username: jiraUser,
150
- password: jiraPassword
151
- }
152
- })
153
- .then((response) => {
154
- return response;
155
- })
156
- .catch((e) => {
157
- throw e;
158
- });
143
+ // return axios({
144
+ // baseURL: JIRA_BASE_URL,
145
+ // url: options.url,
146
+ // method: options.method,
147
+ // data: options.data || {},
148
+ // auth: {
149
+ // username: jiraUser,
150
+ // password: jiraPassword
151
+ // }
152
+ // })
153
+ // .then((response) => {
154
+ // return response;
155
+ // })
156
+ // .catch((e) => {
157
+ // throw e;
158
+ // });
159
159
  })
160
160
  }
161
161
 
package/scripts/csdr/metadata/app-envs.js CHANGED
@@ -3,7 +3,7 @@
3
3
  // GLOBAL
4
4
  const path = require('path');
5
5
  const moment = require('moment');
6
- const sanitizeHtml = require('sanitize-html');
6
+ // const sanitizeHtml = require('sanitize-html');
7
7
 
8
8
  // LOCAL
9
9
  const tools = require('../../utils/tools');
@@ -100,7 +100,8 @@ const envsMetadataToTable = (metadata) => {
100
100
 
101
101
  tools.logSuccess();
102
102
 
103
- return sanitizeHtml(content);
103
+ // return sanitizeHtml(content);
104
+ return content;
104
105
  })
105
106
 
106
107
  .catch((e) => {
package/scripts/csdr/metadata/app-history.js CHANGED
@@ -3,7 +3,7 @@
3
3
  // GLOBAL
4
4
  const path = require('path');
5
5
  const execa = require('execa');
6
- const sanitizeHtml = require('sanitize-html');
6
+ // const sanitizeHtml = require('sanitize-html');
7
7
  const moment = require('moment');
8
8
  const semver = require('semver');
9
9
 
@@ -395,7 +395,8 @@ const historyMetadataToTable = (metadata) => {
395
395
 
396
396
  tools.logSuccess();
397
397
 
398
- return sanitizeHtml(content);
398
+ // return sanitizeHtml(content);
399
+ return content;
399
400
  }
400
401
 
401
402
 
package/scripts/csdr/metadata/package-history.js CHANGED
@@ -3,7 +3,6 @@
3
3
  // GLOBAL
4
4
  const path = require('path');
5
5
  const execa = require('execa');
6
- const sanitizeHtml = require('sanitize-html');
7
6
  const moment = require('moment');
8
7
  const semver = require('semver');
9
8
 
package/scripts/csdr/release/package/release-package.js CHANGED
@@ -8,6 +8,7 @@ const utils = require('../../../utils');
8
8
 
9
9
  // CSDR RELATED
10
10
  const configUtils = require('../../config/config-utils');
11
+ const metadataUtils = require('../../metadata/metadata-utils');
11
12
 
12
13
  // INNER MODULES
13
14
  const innerCommon = require('./common');
@@ -47,12 +48,19 @@ module.exports.run = () => {
47
48
  return innerCommon.preReleaseChecks(pkg);
48
49
  })
49
50
 
51
+ // FETCHING COMMITS METADATA
52
+ .then(() => {
53
+ return metadataUtils.commit.getMetadata(pkg);
54
+ })
55
+ .then((metadata) => {
56
+ pkgMetadata = metadata;
57
+ })
58
+
50
59
  // COMMIT METADATA CHECKS
51
60
  .then(() => {
52
61
  return innerCommon.commitMetadataChecks(pkg);
53
62
  })
54
63
  .then((metadata) => {
55
- // storing commitMetadata for later use
56
64
  pkgMetadata = metadata;
57
65
  })
58
66
 
package/scripts/utils/build/package/styles.js CHANGED
@@ -47,13 +47,12 @@ const compileSassFileDartSass = (folder, filename) => {
47
47
 
48
48
  plugins.push(autoprefixer({
49
49
  grid: 'no-autoplace',
50
- browsers: [
51
- "> 0.5% in alt-eu",
52
- "last 2 version",
53
- "ie 11",
54
- "not dead",
55
- "not op_mini all"
56
- ]
50
+ // browsers: [
51
+ // "> 0.5% in alt-eu",
52
+ // "last 2 version",
53
+ // "not dead",
54
+ // "not op_mini all"
55
+ // ]
57
56
  }));
58
57
  plugins.push(cssnano({ safe: true }));
59
58
 
@@ -92,93 +91,91 @@ const compileSassFileDartSass = (folder, filename) => {
92
91
  }
93
92
 
94
93
 
95
- const compileSassFileNodeSass = (folder, filename, isNodeSassTildeImporterActive) => {
96
- const filePath = path.join(folder, 'styles', filename);
97
-
98
- tools.logInfo(`Compiling ${filePath}.scss...`);
99
-
100
- return Promise.resolve()
101
- .then(() => {
102
- tools.logInfo('Compiling SCSS...');
103
-
104
- if (isNodeSassTildeImporterActive !== false) {
105
- tools.logInfo('building with tilde importer');
106
-
107
- return execa('node-sass', [
108
- filePath + '.scss',
109
- filePath + '.temp.css',
110
- '--importer',
111
- './node_modules/node-sass-tilde-importer',
112
- '--output-style',
113
- 'compressed',
114
- '--source-map',
115
- true,
116
- '--source-map-contents'
117
- ]);
118
-
119
- } else {
120
- tools.logInfo('building without tilde importer');
121
-
122
- return execa('node-sass', [
123
- filePath + '.scss',
124
- filePath + '.temp.css',
125
- '--importer',
126
- '--output-style',
127
- 'compressed',
128
- '--source-map',
129
- true,
130
- '--source-map-contents'
131
- ]);
132
-
133
- }
134
- })
135
-
136
- .then((output) => {
137
- // console.log(output);
138
- console.log('Size ::: ' + fs.statSync(filePath + '.temp.css').size);
139
- })
140
-
141
- .then(() => {
142
- tools.logInfo('Running postCss over generated css file...');
143
-
144
- return execa('postcss', [
145
- filePath + '.temp.css',
146
- '--config',
147
- path.join(__dirname, 'postcss.config.js'),
148
- '--no-map',
149
- '--verbose',
150
- '--output',
151
- filePath + '.css'
152
- ]);
153
- })
154
-
155
- .then((output) => {
156
- // console.log(output);
157
- console.log('Size ::: ' + fs.statSync(filePath + '.css').size);
158
-
159
- tools.logSuccess(`OK ==> generated ${filePath}.css`);
160
- })
161
-
162
- .then(() => {
163
- tools.remove(filePath + '.temp.css');
164
- tools.remove(filePath + '.temp.css.map');
165
- })
166
- .catch((e) => {
167
- console.log(e);
168
- throw e;
169
- })
170
- }
94
+ // const compileSassFileNodeSass = (folder, filename, isNodeSassTildeImporterActive) => {
95
+ // const filePath = path.join(folder, 'styles', filename);
96
+
97
+ // tools.logInfo(`Compiling ${filePath}.scss...`);
98
+
99
+ // return Promise.resolve()
100
+ // .then(() => {
101
+ // tools.logInfo('Compiling SCSS...');
102
+
103
+ // if (isNodeSassTildeImporterActive !== false) {
104
+ // tools.logInfo('building with tilde importer');
105
+
106
+ // return execa('node-sass', [
107
+ // filePath + '.scss',
108
+ // filePath + '.temp.css',
109
+ // '--importer',
110
+ // './node_modules/node-sass-tilde-importer',
111
+ // '--output-style',
112
+ // 'compressed',
113
+ // '--source-map',
114
+ // true,
115
+ // '--source-map-contents'
116
+ // ]);
117
+
118
+ // } else {
119
+ // tools.logInfo('building without tilde importer');
120
+
121
+ // return execa('node-sass', [
122
+ // filePath + '.scss',
123
+ // filePath + '.temp.css',
124
+ // '--importer',
125
+ // '--output-style',
126
+ // 'compressed',
127
+ // '--source-map',
128
+ // true,
129
+ // '--source-map-contents'
130
+ // ]);
131
+
132
+ // }
133
+ // })
134
+
135
+ // .then((output) => {
136
+ // // console.log(output);
137
+ // console.log('Size ::: ' + fs.statSync(filePath + '.temp.css').size);
138
+ // })
139
+
140
+ // .then(() => {
141
+ // tools.logInfo('Running postCss over generated css file...');
142
+
143
+ // return execa('postcss', [
144
+ // filePath + '.temp.css',
145
+ // '--config',
146
+ // path.join(__dirname, 'postcss.config.js'),
147
+ // '--no-map',
148
+ // '--verbose',
149
+ // '--output',
150
+ // filePath + '.css'
151
+ // ]);
152
+ // })
153
+
154
+ // .then((output) => {
155
+ // // console.log(output);
156
+ // console.log('Size ::: ' + fs.statSync(filePath + '.css').size);
157
+ // })
158
+
159
+ // .then(() => {
160
+ // tools.logSuccess(`OK ==> generated ${filePath}.css`);
161
+ // tools.remove(filePath + '.temp.css');
162
+ // tools.remove(filePath + '.temp.css.map');
163
+ // })
164
+ // .catch((e) => {
165
+ // console.log(e);
166
+ // throw e;
167
+ // })
168
+ // }
171
169
 
172
170
 
173
171
  const compileSassFile = (pkg, folder, filename, isNodeSassTildeImporterActive) => {
174
172
  return Promise.resolve()
175
173
  .then(() => {
176
- if (pkg.build && pkg.build.dartSass) {
174
+ // if (pkg.build && pkg.build.dartSass) {
177
175
  return compileSassFileDartSass(folder, filename);
178
-
179
- } else {
180
- return compileSassFileNodeSass(folder, filename, isNodeSassTildeImporterActive);
181
- }
176
+ // } else {
177
+ // return compileSassFileNodeSass(folder, filename, isNodeSassTildeImporterActive);
178
+ // }
182
179
  })
183
180
 
184
181
  .catch((e) => {
package/scripts/utils/pre-build/injection/app-sources-full-skeleton/src/_generated/app/app.module.ts CHANGED
@@ -12,7 +12,7 @@ import { TranslateModule } from '@ngx-translate/core';
12
12
  import {
13
13
  CoreModule, CoreModuleEffects, translateConfig, EUI_CONFIG_TOKEN,
14
14
  } from '@eui/core';
15
- import { EuiAllModule } from '@eui/components-next';
15
+ import { EuiAllModule } from '@eui/components';
16
16
 
17
17
  import { appConfig } from '../config/index';
18
18
  import { environment } from '../environments/environment';
package/scripts/utils/pre-build/injection/app-sources-full-skeleton/tsconfig.app.json CHANGED
@@ -3,7 +3,8 @@
3
3
  "compilerOptions": {
4
4
  "outDir": "./dist",
5
5
  "types": [],
6
- "target": "ES2015",
6
+ "module": "ESNext",
7
+ "target": "ES2016",
7
8
  "lib": ["es2020", "dom"]
8
9
  },
9
10
  "exclude": [
package/scripts/utils/pre-build/projects.js CHANGED
@@ -84,22 +84,30 @@ module.exports.preBuild = (project, envTarget, build) => {
84
84
  tools.logInfo('Executing scripts files replacement for openId Connect');
85
85
 
86
86
  let rootTargetFolder = 'src';
87
- if (build) {
88
- rootTargetFolder = 'dist';
89
- }
87
+ // if (build) {
88
+ // rootTargetFolder = 'dist';
89
+ // }
90
90
 
91
+ tools.logInfo(`Copying node_modules/oidc-client/dist/oidc-client.min.js to ${rootTargetFolder}/assets/oidc-client.min.js`);
91
92
  tools.copy(
92
93
  path.join(process.cwd(), 'node_modules/oidc-client/dist/oidc-client.min.js'),
93
94
  path.join(project.paths.angularPath, `${rootTargetFolder}/assets/oidc-client.min.js`)
94
95
  );
96
+ tools.logSuccess();
97
+
98
+ tools.logInfo(`Copying node_modules/jsrsasign/lib/jsrsasign-all-min.js to ${rootTargetFolder}/assets/jsrsasign-all-min.js`);
95
99
  tools.copy(
96
100
  path.join(process.cwd(), 'node_modules/jsrsasign/lib/jsrsasign-all-min.js'),
97
101
  path.join(project.paths.angularPath, `${rootTargetFolder}/assets/jsrsasign-all-min.js`)
98
102
  );
103
+ tools.logSuccess();
104
+
105
+ tools.logInfo(`Copying node_modules/@eui/base/assets/openid/openid-login.js to ${rootTargetFolder}/assets/openid-login.js`);
99
106
  tools.copy(
100
107
  path.join(process.cwd(), 'node_modules/@eui/base/assets/openid/openid-login.js'),
101
108
  path.join(project.paths.angularPath, `${rootTargetFolder}/assets/openid-login.js`)
102
109
  );
110
+ tools.logSuccess();
103
111
  }
104
112
 
105
113
  if (configEnvTarget) {
@@ -128,12 +136,12 @@ module.exports.injectAppConfig = (project, configEnvTarget, build) => {
128
136
  }
129
137
 
130
138
  let rootTargetFolder = 'src';
131
- if (build) {
132
- rootTargetFolder = 'dist';
133
- }
139
+ // if (build) {
140
+ // rootTargetFolder = 'dist';
141
+ // }
134
142
 
135
- tools.logInfo(`Replacing default ${rootTargetFolder}/assets/env-json-config.json file by ${envFilePath} content`);
136
- tools.copy(envFilePath, path.join(project.paths.angularPath, `${rootTargetFolder}/assets/config/env-json-config.json`));
143
+ tools.logInfo(`Replacing default ${rootTargetFolder}/assets/openid-login-config.json file by ${envFilePath} content`);
144
+ tools.copy(envFilePath, path.join(project.paths.angularPath, `${rootTargetFolder}/assets/openid-login-config.json`));
137
145
 
138
146
  tools.logSuccess();
139
147
  })