[WIP] Remove foreman vendor

.eslintrc.js

@@ -0,0 +1,21 @@
+const lintCoreConfig = require('./script/lint/lint_core_config.js');
+const lintGenericConfig = require('./script/lint/lint_generic_config.js');
+
+const combinedConfig = {
+  ...lintCoreConfig,
+  ...lintGenericConfig,
+  rules: {
+    ...lintCoreConfig.rules,
+    ...lintGenericConfig.rules,
+  },
+  plugins: [
+    ...(lintCoreConfig.plugins || []),
+    ...(lintGenericConfig.plugins || []),
+  ],
+  extends: [
+    ...(lintCoreConfig.extends || []),
+    ...(lintGenericConfig.extends || []),
+  ],
+};
+
+module.exports = combinedConfig;

.github/workflows/foreman.yml

@@ -93,6 +93,8 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
+      - name: use npm 8
+        run: npm i -g npm@8 --registry=https://registry.npmjs.org
       - name: Setup NPM Cache
         uses: actions/cache@v4
         with:

.github/workflows/js_tests.yml

@@ -46,14 +46,14 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
+      - name: use npm 8
+        run: npm i -g npm@8 --registry=https://registry.npmjs.org
       - name: Generate npm dependencies package-lock
         run: npm install --package-lock-only --no-audit
       - name: Install npm dependencies
         run: npm ci --no-audit
       - name: Run linter
         run: npm run lint
-      - name: Run custom eslint rules Spellcheck (only warnings) and missing ouia-ids
-        run: npm run lint:custom
       - name: Run tests
         run: npm run test
       - name: Publish Coveralls

.github/workflows/plugins_react_tests.yml

@@ -16,6 +16,9 @@ concurrency:
   group: ${{ github.ref_name }}-${{ github.workflow }}
   cancel-in-progress: true
 
+env:
+  BUNDLE_WITHOUT: "console:development:journald:libvirt"
+
 jobs:
   setup_matrix:
     name: Setup matrix
@@ -45,11 +48,13 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-      # We could update the postinstall action for foreman to look for an environment variable for plugin webpack dirs
-      # before kicking off the ruby script to find them, this would eliminate the ruby dep and running `npm install` in plugins.
-      - uses: ruby/setup-ruby@v1
+      - name: use npm 8
+        run: npm i -g npm@8 --registry=https://registry.npmjs.org
+      - name: "Set up Ruby ${{ matrix.ruby }}"
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
       - name: Checkout Foreman
         uses: actions/checkout@v4
         with:
@@ -65,12 +70,29 @@ jobs:
         with:
           repository: ${{ matrix.plugin }}
           path: ${{ github.workspace }}/projects/plugin
+      - name: store plugin name
+        run: echo "PLUGIN_NAME=$(echo ${{ matrix.plugin }} | awk -F'/' '{print $NF}')" >> "${GITHUB_ENV}"
+      - name: Set up plugin in Foreman
+        run: |
+          echo "gemspec name: '$PLUGIN_NAME', path: '${{ github.workspace }}/projects/plugin'" > "bundler.d/$PLUGIN_NAME.local.rb"
+          if [ -d $PLUGIN_NAME/gemfile.d ] ; then
+            cat $PLUGIN_NAME/gemfile.d/*.rb >> bundler.d/$PLUGIN_NAME.local.rb
+          fi
+        working-directory: ${{ github.workspace }}/projects/foreman
       - name: Generate ${{ matrix.plugin }} npm dependencies package-lock
         run: npm install --package-lock-only --no-audit --legacy-peer-deps
         working-directory: ${{ github.workspace }}/projects/plugin
       - name: Install ${{ matrix.plugin }} npm dependencies
         run: npm ci --no-audit --legacy-peer-deps
         working-directory: ${{ github.workspace }}/projects/plugin
+      - run: sudo apt-get update
+      - run: sudo apt-get -qq -y install build-essential libcurl4-openssl-dev zlib1g-dev libpq-dev libvirt-dev
+      - name: Install gems
+        run: bundle install 
+        working-directory: ${{ github.workspace }}/projects/foreman
+      - name: Run plugin webpack dir to test
+        run: ./script/plugin_webpack_directories.rb   
+        working-directory: ${{ github.workspace }}/projects/foreman
       - name: Run ${{ matrix.plugin }} tests
-        run: npm test
-        working-directory: ${{ github.workspace }}/projects/plugin
+        run: npm run test:plugins $(echo ${{ matrix.plugin }} | awk -F'/' '{print $NF}')
+        working-directory: ${{ github.workspace }}/projects/foreman

.npmrc

@@ -1,2 +1 @@
 engine-strict=true
-legacy-peer-deps=true

app/assets/javascripts/application.js

@@ -80,7 +80,7 @@ function onContentLoad() {
   password_caps_lock_hint();
 
   tfm.i18n.intl.ready.then(function() {
-    var tz = jstz.determine();
+    var tz = tfm.jstz.determine();
     $.cookie('timezone', tz.name(), {
       path: '/',
       secure: location.protocol === 'https:',

app/assets/javascripts/host_edit.js

@@ -402,12 +402,12 @@ function serializeForm() {
 }
 
 function subnet_contains(network, cidr, ip) {
-  if (!ip || 0 === ip.length || !ipaddr.isValid(ip)) {
+  if (!ip || 0 === ip.length || !tfm.ipaddr.isValid(ip)) {
     return;
   }
 
-  var addr = ipaddr.parse(ip);
-  var range = ipaddr.parse(network);
+  var addr = tfm.ipaddr.parse(ip);
+  var range = tfm.ipaddr.parse(network);
 
   return addr.match(range, cidr);
 }

app/assets/javascripts/subnets.js

@@ -69,7 +69,7 @@ function subnetMaskChanged(field) {
   }
   if ($('input[id^=subnet_type_]:checked').val() === 'Subnet::Ipv4') {
     try {
-      var cidr = ipaddr.IPv4.parse(mask).prefixLengthFromSubnetMask();
+      var cidr = tfm.ipaddr.IPv4.parse(mask).prefixLengthFromSubnetMask();
     } catch (err) {
       var cidr = '';
     }

app/helpers/reactjs_helper.rb

@@ -36,13 +36,8 @@ def get_webpack_chunk(name, extension)
     data['assetsByChunkName'][name]&.find { |value| value.end_with?(".#{extension}") }
   end
 
-  def get_webpack_foreman_vendor_js
-    foreman_vendor_js = get_webpack_chunk('foreman-vendor', 'js')
-    javascript_include_tag("/webpack/#{foreman_vendor_js}")
-  end
-
   def get_webpack_foreman_vendor_css
-    foreman_vendor_css = get_webpack_chunk('foreman-vendor', 'css')
+    foreman_vendor_css = get_webpack_chunk('vendorStyles', 'css')
     stylesheet_link_tag("/webpack/#{foreman_vendor_css}")
   end
 

app/views/layouts/base.html.erb

@@ -36,10 +36,10 @@
   </head>
 
   <body class='<%= body_css_classes %>'>
-    <%= get_webpack_foreman_vendor_js %>
+
     <%= javascript_include_tag("/webpack/#{get_webpack_chunk('vendor', 'js')}") %>
-    <%= javascript_include_tag("/webpack/#{get_webpack_chunk('bundle', 'js')}") %>
     <%= javascript_include_tag("/webpack/#{get_webpack_chunk('reactExports', 'js')}") %>
+    <%= javascript_include_tag("/webpack/#{get_webpack_chunk('bundle', 'js')}") %>
 
     <%= javascript_include_tag 'application' %>
     <%= webpacked_plugins_with_global_js %>

babel.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  presets: [require.resolve('@theforeman/builder/babel')],
+};