[apacheGH-2456]: Change the project type to module, and update files to match the import type (import, from ES6)

Author: kinow

jena-fuseki2/jena-fuseki-ui/.eslintrc.js

@@ -15,11 +15,14 @@
  * limitations under the License.
  */
 
-const { defineConfig } = require('cypress')
-const vitePreprocessor = require('./tests/e2e/support/vite-preprocessor')
-const path = require('path')
+import {defineConfig} from 'cypress'
+import codeCoverageTask from '@cypress/code-coverage/task.js'
+import vitePreprocessor from 'cypress-vite'
+import {resolve} from 'path'
 
-module.exports = defineConfig({
+const __dirname = resolve()
+
+export default defineConfig({
   video: false,
   defaultCommandTimeout: 20000,
   execTimeout: 30000,
@@ -31,14 +34,18 @@ module.exports = defineConfig({
   e2e: {
     baseUrl: 'http://localhost:' + (process.env.PORT || 8080),
     setupNodeEvents (on, config) {
-      // For test coverage
-      require('@cypress/code-coverage/task')(on, config)
-
-      on(
-        'file:preprocessor',
-        vitePreprocessor(path.resolve(__dirname, 'vite.config.js'))
-      )
-      return require('./tests/e2e/plugins/index.js')(on, config)
+      codeCoverageTask(on, config)
+      on('before:browser:launch', (browser, launchOptions) => {
+        if (browser.name === 'chrome' && browser.isHeadless) {
+          launchOptions.args.push('--window-size=1440,1024', '--force-device-scale-factor=1')
+        }
+        return launchOptions
+      })
+      on('file:preprocessor', vitePreprocessor({
+        configFile: resolve(__dirname, './vite.config.js'),
+        mode: 'development',
+      }))
+      return config
     },
     specPattern: 'tests/e2e/specs/**/*.cy.{js,jsx,ts,tsx}',
     fixturesFolder: 'tests/e2e/fixtures',

jena-fuseki2/jena-fuseki-ui/cypress.config.js renamed to jena-fuseki2/jena-fuseki-ui/cypress.config.mjs

@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the 'License'); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import js from '@eslint/js'
+import pluginVue from 'eslint-plugin-vue'
+
+export default [
+  js.configs.recommended,
+  ...pluginVue.configs['flat/recommended'],
+  {
+    'files': [
+      '**/*.mjs',
+      '**/*.js',
+      '**/*.vue'
+    ],
+    'ignores': [
+      'node_modules/*',
+      'dist/*',
+      'tests/coverage/*'
+    ],
+    'rules': {
+      'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+      'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+      'vue/custom-event-name-casing': 'off',
+      'vue/multi-word-component-names': 'off',
+      'vue/no-reserved-component-names': 'off',
+      'vue/order-in-components': 'off',
+      'vue/max-attributes-per-line': 'off',
+      'vue/attributes-order': 'off',
+      'vue/html-self-closing': 'off'
+    },
+    'languageOptions': {
+      'ecmaVersion': 2021,
+      'globals': {
+        'process': true,
+        'describe': true,
+        'it': true,
+        'Cypress': true,
+        'cy': true,
+        'expect': true,
+        'before': true,
+        'beforeEach': true,
+        'after': true,
+        'afterEach': true,
+        '__dirname': true
+      }
+    }
+  }
+];

jena-fuseki2/jena-fuseki-ui/eslint.config.js

@@ -1,5 +1,6 @@
 {
   "name": "apache-jena-fuseki",
+  "type": "module",
   "version": "1.0.0",
   "private": false,
   "description": "Apache Jena Fuseki UI",
@@ -11,7 +12,7 @@
     "build": "vite build",
     "test:unit": "vitest run --environment jsdom",
     "test:e2e": "cross-env FUSEKI_PORT=\"${FUSEKI_PORT:=3030}\" PORT=\"${PORT:=8080}\" concurrently --names 'SERVER,CLIENT,TESTS' --prefix-colors 'yellow,blue,green' --success 'first' --kill-others 'yarn run serve:fuseki' 'yarn wait-on http://localhost:${FUSEKI_PORT}/$/ping && yarn run dev' 'yarn wait-on http-get://localhost:${PORT}/index.html && cypress run $@'",
-    "lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src",
+    "lint": "eslint --fix src",
     "coverage:unit": "yarn run test:unit --coverage",
     "coverage:e2e": "cross-env-shell CYPRESS_COVERAGE=true yarn run test:e2e",
     "serve:fuseki": "nodemon src/services/mock/json-server.js",
@@ -36,8 +37,9 @@
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.4",
     "@cypress/vue": "^6.0.0",
+    "@eslint/js": "^9.2.0",
     "@vitejs/plugin-vue": "^5.0.3",
-    "@vitest/coverage-c8": "^0.33.0",
+    "@vitest/coverage-v8": "^1.6.0",
     "@vue/compiler-sfc": "^3.3.6",
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/test-utils": "^2.4.1",
@@ -60,7 +62,7 @@
     "sass": "^1.69.4",
     "sinon": "^17.0.0",
     "vite": "^5.0.12",
-    "vite-plugin-istanbul": "6.0.0",
+    "vite-plugin-istanbul": "^6.0.2",
     "vitest": "^1.3.1",
     "wait-on": "^7.0.1"
   },

jena-fuseki2/jena-fuseki-ui/package.json

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { createApp, h } from 'vue'
+import { createApp } from 'vue'
 import App from './App.vue'
 import router from './router'
 import 'bootstrap/dist/js/bootstrap.bundle.min'

jena-fuseki2/jena-fuseki-ui/src/main.js

@@ -30,6 +30,7 @@ export default {
     })
   },
   async beforeRouteUpdate (from, to, next) {
+    // eslint-disable-next-line no-unused-vars
     next(async vm => {
       await this.loadCurrentDataset()
     })

jena-fuseki2/jena-fuseki-ui/src/mixins/current-dataset-navigation-guards.js

@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-import { BUS } from '@/events'
-
 export default {
   data () {
     return {

jena-fuseki2/jena-fuseki-ui/src/mixins/list-datasets.js

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
+import jsonServer from 'json-server'
+
 const PORT = process.env.FUSEKI_PORT || 3030
 
 const data = {}
 
-const jsonServer = require('json-server')
-
 const server = jsonServer.create()
 const router = jsonServer.router(data)
 const middlewares = jsonServer.defaults()
@@ -260,8 +260,6 @@ server.get('/:datasetName/data', (req, res) => {
     .send(dataContent)
 })
 
-let failUpload = false
-
 // Upload data.
 server.post('/:datasetName/data', (req, res) => {
   res
@@ -282,9 +280,15 @@ server.get('/\\$/ping', (req, res) => {
 // RESET TEST DATA
 server.get('/tests/reset', (req, res) => {
   // Just delete the datasets to clean up for other tests to have a
-  // brand new environment.
-  for (const dataset in DATASETS) {
-    delete DATASETS[dataset]
+  // brand-new environment.
+  if (DATASETS) {
+    try {
+      for (const dataset in DATASETS) {
+        delete DATASETS[dataset]
+      }
+    } catch (e) {
+      console.log(e)
+    }
   }
   res.sendStatus(200)
 })

jena-fuseki2/jena-fuseki-ui/src/services/mock/json-server.js

@@ -261,7 +261,6 @@ export default {
       this.loadingGraph = true
       this.selectedGraph = graphName
       try {
-        const dataEndpoint = this.services['gsp-rw']['srv.endpoints'].find(endpoint => endpoint !== '') || ''
         const result = await this.$fusekiService.fetchGraph(
           this.datasetName,
           this.services['gsp-rw']['srv.endpoints'],

jena-fuseki2/jena-fuseki-ui/src/views/dataset/Edit.vue

@@ -327,6 +327,7 @@ export default {
   },
 
   watch: {
+    /* eslint-disable no-unused-vars */
     datasetUrl: function (val, oldVal) {
       this.currentDatasetUrl = val
     },
@@ -345,6 +346,7 @@ export default {
         this.yasqe.options.requestConfig.acceptHeaderGraph = this.contentTypeGraph
       }
     }
+    /* eslint-enable no-unused-vars */
   },
 
   methods: {