Merge branch 'review' of https://github.com/betagouv/monstagedeseconde into review

Author: pierrax

Gemfile

@@ -15,8 +15,7 @@ gem 'rake'
 
 # pg extension for geo queries
 # wait for : https://github.com/rgeo/activerecord-postgis-adapter/tree/ar61 to be merge into master
-gem 'activerecord-postgis-adapter'
-'>= 8.0.1'
+gem 'activerecord-postgis-adapter', '>= 8.0.1'
 
 # don't bump until fixed, https://github.com/Casecommons/pg_search/issues/446
 gem 'pg_search', '2.3.2' # pg search for autocomplete
@@ -31,6 +30,7 @@ gem 'inline_svg'
 gem 'react_on_rails'
 gem 'slim-rails'
 gem 'split', require: 'split/dashboard'
+gem 'turbo-rails'
 gem 'uglifier'
 gem 'view_component'
 gem 'webpacker'

Gemfile.lock

@@ -573,7 +573,7 @@ DEPENDENCIES
   aasm
   actionpack (>= 6.1.3.2)
   activerecord-explain-analyze
-  activerecord-postgis-adapter
+  activerecord-postgis-adapter (>= 8.0.1)
   aws-sdk-s3
   bitly
   bootsnap
@@ -632,6 +632,7 @@ DEPENDENCIES
   slim-rails
   split
   spring (= 3.0.0)
+  turbo-rails
   tzinfo-data
   uglifier
   validates_zipcode

config/webpack/environment.js

@@ -8,11 +8,33 @@ environment.plugins.append('Provide', new webpack.ProvidePlugin({
   jQuery: 'jquery'
 }));
 
-// Loader pour les fichiers CSS et SCSS
-environment.loaders.append('styles', {
-  test: /\.(css|scss|sass)$/,
+// Configuration du loader PostCSS
+const postcssLoader = environment.loaders.get('css').use.find(el => el.loader === 'postcss-loader');
+
+if (postcssLoader) {
+  postcssLoader.options = {
+    postcssOptions: {
+      plugins: [
+        require('autoprefixer'),
+      ]
+    }
+  };
+}
+
+// Configuration du loader SASS
+const sassLoader = environment.loaders.get('sass').use.find(el => el.loader === 'sass-loader');
+
+if (sassLoader) {
+  sassLoader.options = {
+    sourceMap: true // Activer la génération de source map si nécessaire
+  };
+}
+
+// Loader pour les fichiers SCSS
+environment.loaders.append('scss', {
+  test: /\.scss$/,
   use: [
-    MiniCssExtractPlugin.loader, // Utilisation correcte du loader
+    MiniCssExtractPlugin.loader, // Utilisation du loader MiniCssExtractPlugin
     'css-loader',
     {
       loader: 'postcss-loader',
@@ -40,6 +62,16 @@ environment.loaders.append('images', {
   ]
 });
 
+// Loader pour les fichiers CSS et SCSS
+environment.loaders.append('styles', {
+  test: /\.(css|scss|sass)$/,
+  use: [
+    MiniCssExtractPlugin.loader, // Utilisation correcte du loader
+    'css-loader',
+    'sass-loader'
+  ]
+});
+
 // Loader pour Babel
 environment.loaders.append('babel', {
   test: /\.(js|jsx|mjs)$/,
@@ -61,13 +93,4 @@ environment.plugins.append(
   })
 );
 
-// Ajouter la configuration node pour éviter les erreurs de compatibilité
-environment.config.merge({
-  node: {
-    global: true,     // Inclut la variable globale
-    __dirname: false,  // Désactive la gestion de __dirname
-    __filename: false  // Désactive la gestion de __filename
-  }
-});
-
 module.exports = environment;

db/structure.sql

@@ -20,7 +20,7 @@ CREATE EXTENSION IF NOT EXISTS pg_trgm WITH SCHEMA public;
 -- Name: EXTENSION pg_trgm; Type: COMMENT; Schema: -; Owner: -
 --
 
-COMMENT ON EXTENSION pg_trgm IS 'text similarity measurement and index searching based on trigrams';
+-- COMMENT ON EXTENSION pg_trgm IS 'text similarity measurement and index searching based on trigrams';
 
 
 --
@@ -34,7 +34,7 @@ CREATE EXTENSION IF NOT EXISTS postgis WITH SCHEMA public;
 -- Name: EXTENSION postgis; Type: COMMENT; Schema: -; Owner: -
 --
 
-COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial types and functions';
+-- COMMENT ON EXTENSION postgis IS 'PostGIS geometry, geography, and raster spatial types and functions';
 
 
 --
@@ -48,7 +48,7 @@ CREATE EXTENSION IF NOT EXISTS unaccent WITH SCHEMA public;
 -- Name: EXTENSION unaccent; Type: COMMENT; Schema: -; Owner: -
 --
 
-COMMENT ON EXTENSION unaccent IS 'text search dictionary that removes accents';
+-- COMMENT ON EXTENSION unaccent IS 'text search dictionary that removes accents';
 
 
 --
@@ -4236,5 +4236,4 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20190215085241'),
 ('20190215085127'),
 ('20190212163331'),
-('20190207111844');
-
+('20190207111844');

package.json

@@ -31,7 +31,7 @@
     "jquery-ui": "1.12.1",
     "leaflet": "^1.8.0",
     "lodash.debounce": "^4.0.8",
-    "mini-css-extract-plugin": "^2.0.0",
+    "mini-css-extract-plugin": "^2.9.1",
     "npm": "^8.11.0",
     "popper.js": "^1.15.0",
     "postcss": "^8.0.0",
@@ -56,8 +56,8 @@
     "trix": "^1.3.2",
     "url-search-params-polyfill": "^8.0.0",
     "use-debounce": "5",
-    "webpack": "^5",
-    "webpack-cli": "^4",
+    "webpack": "^4.46.0",
+    "webpack-cli": "^3.3.12",
     "whatwg-fetch": "^3.2.0"
   },
   "devDependencies": {