From df465cb1f389f3bf907fb9662345ea4c9633e606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Thu, 27 Jun 2024 10:23:14 +0200 Subject: [PATCH 1/3] Remove all polyfill.io See: https://thehackernews.com/2024/06/over-110000-websites-affected-by.html --- api/dist/apihelp/apihelp.html | 5 ----- buildtools/check-example.js | 1 - contribs/gmf/apps/desktop/index.html.ejs | 1 - contribs/gmf/apps/desktop_alt/index.html.ejs | 1 - contribs/gmf/apps/iframe_api/index.html.ejs | 1 - contribs/gmf/apps/mobile/index.html.ejs | 1 - contribs/gmf/apps/mobile_alt/index.html.ejs | 1 - contribs/gmf/apps/oeedit/index.html.ejs | 1 - contribs/gmf/src/controllers/bootstrap.js | 14 -------------- 9 files changed, 26 deletions(-) diff --git a/api/dist/apihelp/apihelp.html b/api/dist/apihelp/apihelp.html index 9398bc473b46..2a0381ffe629 100644 --- a/api/dist/apihelp/apihelp.html +++ b/api/dist/apihelp/apihelp.html @@ -39,7 +39,6 @@ } - @@ -54,10 +53,6 @@

Simple API Help

Basis

To use the API you should add the following HTML:


-<script
-  src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6,default-3.6,Array.prototype.includes,Object.entries,Object.values"
-  crossorigin="anonymous">
-</script>
 <link href="https://geomapfish-demo-2-6.camptocamp.com/api.css" rel="stylesheet">
 <script src="https://geomapfish-demo-2-6.camptocamp.com/api.js?version=2"></script>
 <script>
diff --git a/buildtools/check-example.js b/buildtools/check-example.js
index b16bb417c9e1..7d020669da32 100644
--- a/buildtools/check-example.js
+++ b/buildtools/check-example.js
@@ -227,7 +227,6 @@ function loaded(page, browser) {
     const url = request.url();
     if (
       !url.startsWith('https://www.camptocamp.com/') &&
-      !url.startsWith('https://cdn.polyfill.io/') &&
       !url.startsWith('https://maps.googleapis.com/')
     ) {
       console.log(`Request failed on: ${url}`);
diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs
index 58860b0e99d3..a6bb0ec70ec8 100644
--- a/contribs/gmf/apps/desktop/index.html.ejs
+++ b/contribs/gmf/apps/desktop/index.html.ejs
@@ -336,7 +336,6 @@
         ngeo-resizemap-state="mainCtrl.queryGridActive">
       
     
-    
     
     <% for (var js in htmlWebpackPlugin.files.js) { %>
     
diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
index 960fbb4bf3ef..aebacd635fd5 100644
--- a/contribs/gmf/apps/desktop_alt/index.html.ejs
+++ b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -424,7 +424,6 @@
       
       
     
-    
     
     
     <% for (var js in htmlWebpackPlugin.files.js) { %>
diff --git a/contribs/gmf/apps/iframe_api/index.html.ejs b/contribs/gmf/apps/iframe_api/index.html.ejs
index 3966cc66e060..0ff1f72aa706 100644
--- a/contribs/gmf/apps/iframe_api/index.html.ejs
+++ b/contribs/gmf/apps/iframe_api/index.html.ejs
@@ -72,7 +72,6 @@
         
       
     
-    
     
     <% for (var js in htmlWebpackPlugin.files.js) { %>
     
diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
index 10844f8ae78c..d9fe981345a0 100644
--- a/contribs/gmf/apps/mobile/index.html.ejs
+++ b/contribs/gmf/apps/mobile/index.html.ejs
@@ -188,7 +188,6 @@
         gmf-mobile-nav-back="mainCtrl.gmfUser.username !== null">
       
     
-    
     
     <% for (var js in htmlWebpackPlugin.files.js) { %>
     
diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
index bd0ce03653a1..43dd12843467 100644
--- a/contribs/gmf/apps/mobile_alt/index.html.ejs
+++ b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -173,7 +173,6 @@
         gmf-mobile-nav-back="mainCtrl.gmfUser.username !== null">
       
     
-    
     
     <% for (var js in htmlWebpackPlugin.files.js) { %>
     
diff --git a/contribs/gmf/apps/oeedit/index.html.ejs b/contribs/gmf/apps/oeedit/index.html.ejs
index b4c35fc7e6e7..7c550b8e7a88 100644
--- a/contribs/gmf/apps/oeedit/index.html.ejs
+++ b/contribs/gmf/apps/oeedit/index.html.ejs
@@ -153,7 +153,6 @@
         ngeo-resizemap-state="profileChartActive">
       
     
-    
     
     <% for (var js in htmlWebpackPlugin.files.js) { %>
     
diff --git a/contribs/gmf/src/controllers/bootstrap.js b/contribs/gmf/src/controllers/bootstrap.js
index 9f8e10a70f85..870a0936adb4 100644
--- a/contribs/gmf/src/controllers/bootstrap.js
+++ b/contribs/gmf/src/controllers/bootstrap.js
@@ -28,20 +28,6 @@ import angular from 'angular';
  * @param {angular.IModule} module The module
  */
 function bootstrap(module) {
-  // Hack to make the bootstrap type check working with polyfill.io
-  const oldObjectToString = Object.prototype.toString;
-  if (!oldObjectToString.toString().includes('[native code]')) {
-    Object.prototype.toString = function () {
-      if (this === null) {
-        return '[object Null]';
-      }
-      if (this === undefined) {
-        return '[object Undefined]';
-      }
-      return oldObjectToString.call(this);
-    };
-  }
-
   const interface_ = $('meta[name=interface]')[0].getAttribute('content');
   const dynamicUrl_ = $('meta[name=dynamicUrl]')[0].getAttribute('content');
   const search = document.location ? document.location.search || '' : '';

From 8e9d6f604b6655db3ce8ff655d2ce73f142f944a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= 
Date: Thu, 27 Jun 2024 10:30:03 +0200
Subject: [PATCH 2/3] Use generic CodeQL implementation

---
 .github/workflows/codeql.yaml | 29 -----------------------------
 ci/config.yaml                |  4 +---
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 .github/workflows/codeql.yaml

diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
deleted file mode 100644
index f8ff4b491c75..000000000000
--- a/.github/workflows/codeql.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: CodeQL scanning
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  codeql:
-    name: CodeQL scanning
-    runs-on: ubuntu-20.04
-    timeout-minutes: 15
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
diff --git a/ci/config.yaml b/ci/config.yaml
index 6b672225a365..b2f6fab37aaf 100644
--- a/ci/config.yaml
+++ b/ci/config.yaml
@@ -1,7 +1,5 @@
 checks:
-  required_workflows:
-    main.yaml: False
-    rebuild.yaml: False
+  required_workflows: False
   versions: False
   codespell:
     ignore_re:

From 4a3d00d5d45d47dd27cbe08264b60393d1dd40d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Brunner?= 
Date: Thu, 27 Jun 2024 11:52:46 +0200
Subject: [PATCH 3/3] Fix Copyright

---
 buildtools/check-example.js               | 2 +-
 contribs/gmf/src/controllers/bootstrap.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildtools/check-example.js b/buildtools/check-example.js
index 7d020669da32..73fee447b9ae 100644
--- a/buildtools/check-example.js
+++ b/buildtools/check-example.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2014-2021 Camptocamp SA
+// Copyright (c) 2014-2024 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in
diff --git a/contribs/gmf/src/controllers/bootstrap.js b/contribs/gmf/src/controllers/bootstrap.js
index 870a0936adb4..47887a0d2e0d 100644
--- a/contribs/gmf/src/controllers/bootstrap.js
+++ b/contribs/gmf/src/controllers/bootstrap.js
@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2018-2021 Camptocamp SA
+// Copyright (c) 2018-2024 Camptocamp SA
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in