From 3b57e02ee30bfe6c7004230f243121e267036a83 Mon Sep 17 00:00:00 2001
From: toto <toto@tata>
Date: Thu, 24 Nov 2022 11:24:09 +0100
Subject: [PATCH 1/6] fix: remove compilation warnings due to CommmonJS
dependencies
refs #579
---
angular.json | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/angular.json b/angular.json
index 234f2a317..944803ca4 100644
--- a/angular.json
+++ b/angular.json
@@ -68,7 +68,14 @@
"lodash",
"graphlibrary",
"dagre-layout",
- "dagre-d3-renderer"
+ "dagre-d3-renderer",
+ "dagre",
+ "dagre-d3",
+ "@braintree/sanitize-url",
+ "dompurify",
+ "graphlib",
+ "moment-mini",
+ "sprintf-js"
],
"vendorChunk": true,
"extractLicenses": false,
--
GitLab
From 3872e53c2b5f24be812b742c9dbeda866d0b0426 Mon Sep 17 00:00:00 2001
From: toto <toto@tata>
Date: Thu, 24 Nov 2022 13:59:41 +0100
Subject: [PATCH 2/6] fix: remove compilation warning due to Karma related
src/test.ts
refs #579
---
src/test.ts | 34 ----------------------------------
src/tsconfig.spec.json | 1 -
2 files changed, 35 deletions(-)
delete mode 100644 src/test.ts
diff --git a/src/test.ts b/src/test.ts
deleted file mode 100644
index 5b4e606cf..000000000
--- a/src/test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-
-import "zone.js/dist/long-stack-trace-zone";
-import "zone.js/dist/proxy.js";
-import "zone.js/dist/sync-test";
-import "zone.js/dist/jasmine-patch";
-import "zone.js/dist/async-test";
-import "zone.js/dist/fake-async-test";
-import { getTestBed } from "@angular/core/testing";
-import {
- BrowserDynamicTestingModule,
- platformBrowserDynamicTesting
-} from "@angular/platform-browser-dynamic/testing";
-
-// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
-declare const __karma__: any;
-declare const require: any;
-
-// Prevent Karma from running prematurely.
-__karma__.loaded = function () {};
-
-// First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
- BrowserDynamicTestingModule,
- platformBrowserDynamicTesting(), {
- teardown: { destroyAfterEach: false }
-}
-);
-// Then we find all the tests.
-const context = require.context("./", true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
-// Finally, start Karma to run the tests.
-__karma__.start();
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index b019e30f9..814408024 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -9,7 +9,6 @@
]
},
"files": [
- "test.ts",
"polyfills.ts"
],
"include": [
--
GitLab
From a80e73fa3e8a41ec9ec6c20b505c48c59901206d Mon Sep 17 00:00:00 2001
From: toto <toto@tata>
Date: Thu, 24 Nov 2022 14:32:10 +0100
Subject: [PATCH 3/6] fix: remove karma.conf.js
refs #579
---
karma.conf.js | 31 -------------------------------
1 file changed, 31 deletions(-)
delete mode 100644 karma.conf.js
diff --git a/karma.conf.js b/karma.conf.js
deleted file mode 100644
index 0840f6ca5..000000000
--- a/karma.conf.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// Karma configuration file, see link for more information
-// https://karma-runner.github.io/1.0/config/configuration-file.html
-
-module.exports = function (config) {
- config.set({
- basePath: '',
- frameworks: ['jasmine', '@angular-devkit/build-angular'],
- plugins: [
- require('karma-jasmine'),
- require('karma-chrome-launcher'),
- require('karma-jasmine-html-reporter'),
- require('karma-coverage-istanbul-reporter'),
- require('@angular-devkit/build-angular/plugins/karma')
- ],
- client:{
- clearContext: false // leave Jasmine Spec Runner output visible in browser
- },
- coverageIstanbulReporter: {
- dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
- fixWebpackSourcePaths: true
- },
-
- reporters: ['progress', 'kjhtml'],
- port: 9876,
- colors: true,
- logLevel: config.LOG_INFO,
- autoWatch: true,
- browsers: ['Chrome'],
- singleRun: false
- });
-};
--
GitLab
From 9df55df4425ca51437f05d079416e8914d135c3f Mon Sep 17 00:00:00 2001
From: toto <toto@tata>
Date: Thu, 24 Nov 2022 14:59:13 +0100
Subject: [PATCH 4/6] fix: compilation warnings about SCSS maximum budget
refs #579
---
angular.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/angular.json b/angular.json
index 944803ca4..ffba55b07 100644
--- a/angular.json
+++ b/angular.json
@@ -89,7 +89,7 @@
"budgets": [
{
"type": "anyComponentStyle",
- "maximumWarning": "10kb"
+ "maximumWarning": "150kb"
}
],
"optimization": true,
--
GitLab
From 79a9780a90daafea2c52770fc1f8cfa13b1c7012 Mon Sep 17 00:00:00 2001
From: toto <toto@tata>
Date: Thu, 24 Nov 2022 16:12:59 +0100
Subject: [PATCH 5/6] fix: compilation warning about environment.prod.ts
refs #579
---
src/tsconfig.app.json | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/tsconfig.app.json b/src/tsconfig.app.json
index 265f8b68b..4ff0123d9 100644
--- a/src/tsconfig.app.json
+++ b/src/tsconfig.app.json
@@ -9,5 +9,8 @@
"files": [
"main.ts",
"polyfills.ts"
+ ],
+ "exclude": [
+ "environments/environment.prod.ts"
]
}
--
GitLab
From ace1eae42dadde1f4644e2745836f70f6b44b4ed Mon Sep 17 00:00:00 2001
From: toto <toto@tata>
Date: Thu, 24 Nov 2022 17:15:59 +0100
Subject: [PATCH 6/6] update jalhyd_branch to devel
refs #579
---
jalhyd_branch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jalhyd_branch b/jalhyd_branch
index d9cf99b69..d64531f13 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-328-fusionner-les-select-avec-source-et-les-select_custom
+devel
--
GitLab