Skip to content

Upgrade to yarn modern #4089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
OyvindLGjesdal wants to merge 1 commit into
base: main
Choose a base branch
from
+9,339 −8,353
Draft

Upgrade to yarn modern #4089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build-files/rat-exclusions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ jena-fuseki2/jena-fuseki-ui/**/*.json
jena-fuseki2/jena-fuseki-ui/node_modules/**/*
jena-fuseki2/jena-fuseki-ui/node/**/*
jena-fuseki2/jena-fuseki-ui/yarn.lock
jena-fuseki2/jena-fuseki-ui/.yarnrc.yml
jena-fuseki2/jena-fuseki-ui/.browserslistrc
jena-fuseki2/jena-fuseki-ui/.editorconfig
jena-fuseki2/jena-fuseki-ui/yarn-error.log
Expand Down
8 changes: 8 additions & 0 deletions jena-fuseki2/jena-fuseki-ui/.yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
approvedGitRepositories:
- https://github.com/Thib-G/yasgui-geo-tg.git

enableScripts: false
Comment thread
OyvindLGjesdal marked this conversation as resolved.

nodeLinker: node-modules

npmMinimalAgeGate: 7d
37 changes: 19 additions & 18 deletions jena-fuseki2/jena-fuseki-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "apache-jena-fuseki",
"type": "module",
"version": "1.0.0",
"private": false,
"description": "Apache Jena Fuseki UI",
"author": "Apache Jena Team",
"license": "Apache-2.0",
Expand All @@ -11,14 +10,12 @@
"serve": "vite preview",
"build": "vite build",
"test:unit": "vitest run --pool=threads --environment jsdom",
"test:e2e": "run-script-os",
"test:e2e:nix": "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 $@\"",
"test:e2e:win32": "powershell -NoProfile -ExecutionPolicy Bypass -Command \"if (-not $env:FUSEKI_PORT) { $env:FUSEKI_PORT='3030' }; if (-not $env:PORT) { $env:PORT='8080' }; $extra = $args -join ' '; concurrently --names SERVER,CLIENT,TESTS --prefix-colors yellow,blue,green --success first --kill-others 'yarn run serve:fuseki' ('yarn wait-on http://localhost:' + $env:FUSEKI_PORT + '/$/ping && yarn run dev') ('yarn wait-on http-get://localhost:' + $env:PORT + '/index.html && cypress run ' + $extra)\" --",
"test:e2e": "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:-3030}/\\$/ping && yarn run dev\" \"yarn wait-on http-get://localhost:${PORT:-8080}/index.html && cypress run $@\"",
"lint": "eslint --fix src",
"coverage:unit": "yarn run test:unit --coverage",
"coverage:e2e": "cross-env-shell CYPRESS_COVERAGE=true yarn run test:e2e",
"coverage:e2e": "CYPRESS_COVERAGE=true yarn run test:e2e",
"serve:fuseki": "nodemon src/services/mock/json-server.js",
"serve:offline": "cross-env FUSEKI_PORT=\"${FUSEKI_PORT:=3030}\" PORT=\"${PORT:=8080}\" concurrently --names 'SERVER,CLIENT' --prefix-colors 'yellow,blue' --success 'first' --kill-others 'yarn run serve:fuseki' 'yarn wait-on http://localhost:${FUSEKI_PORT}/$/ping && yarn run dev'"
"serve:offline": "FUSEKI_PORT=\"${FUSEKI_PORT:-3030}\" PORT=\"${PORT:-8080}\" concurrently --names 'SERVER,CLIENT' --prefix-colors 'yellow,blue' --success 'first' --kill-others 'yarn run serve:fuseki' 'yarn wait-on http://localhost:${FUSEKI_PORT}/\\$/ping && yarn run dev'"
},
"dependencies": {
"@codemirror/language": "^6.11.3",
Expand All @@ -27,13 +24,12 @@
"@fortawesome/free-solid-svg-icons": "^7.0.0",
"@fortawesome/vue-fontawesome": "^3.0.3",
"@popperjs/core": "^2.11.8",
"@vue/compat": "^3.5.26",
"@vue/compiler-dom": "^3.5.40",
"@zazuko/yasqe": "^4.6.0",
"@zazuko/yasr": "^4.6.0",
"axios": "^1.6.1",
"bootstrap": "^5.3.2",
"codemirror": "6.0.2",
"follow-redirects": "^1.15.4",
"mitt": "^3.0.1",
"qs": "6.15.3",
"vue": "^3.5.26",
Expand All @@ -45,31 +41,22 @@
"@babel/core": "^7.27.4",
"@babel/preset-env": "^7.0.0",
"@cypress/code-coverage": "^4.0.1",
"@cypress/vue": "^6.0.0",
"@eslint/js": "^10.0.1",
"@types/codemirror": "^5.60.15",
"@vitejs/plugin-vue": "^6.0.0",
"@vitest/coverage-v8": "^4.1.8",
"@vue/compiler-sfc": "^3.5.26",
"@vue/eslint-config-standard": "^9.0.1",
"@vue/test-utils": "^2.4.1",
"babel-loader": "^10",
"concurrently": "^10.0.3",
"cross-env": "^10.0.0",
"cypress": "^15.8.1",
"cypress-vite": "^1.4.2",
"eslint": "^10.0.1",
"eslint-plugin-cypress": "6.4.3",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-promise": "^7.0.0",
"eslint-plugin-vue": "^10.8.0",
"express": "^5.1.0",
"globals": "^17.4.0",
"jsdom": "^29.0.0",
"json-server": "^0.17.4",
"nanoid": "^6.0.0",
"nodemon": "^3.0.1",
"run-script-os": "^1.1.6",
"sass-embedded": "^1.97.1",
"sinon": "^22.0.0",
"typescript": "^6.0.3",
Expand All @@ -85,5 +72,19 @@
"picomatch": ">=4.0.4",
"minimatch": ">=9.0.7"
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
"dependenciesMeta": {
"@fortawesome/fontawesome-common-types": {
"built": true
},
"@fortawesome/free-solid-svg-icons": {
"built": true
},
"@parcel/watcher": {
"built": true
},
"cypress": {
"built": true
}
},
"packageManager": "yarn@4.17.1"
}
25 changes: 13 additions & 12 deletions jena-fuseki2/jena-fuseki-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

<properties>
<node.version>v24.16.0</node.version>
<yarn.version>v1.22.17</yarn.version>
<automatic.module.name>org.apache.jena.fuseki.ui</automatic.module.name>

<!--
Expand Down Expand Up @@ -87,48 +86,50 @@
<version>2.0.1</version>
<executions>
<execution>
<id>install node and yarn</id>
<id>install node and corepack</id>
<goals>
<goal>install-node-and-yarn</goal>
<goal>install-node-and-corepack</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<nodeVersion>${node.version}</nodeVersion>
<yarnVersion>${yarn.version}</yarnVersion>
<!-- The Yarn version is managed by Corepack via the "packageManager"
field in package.json -->
</configuration>
</execution>
<execution>
<id>yarn install</id>
<goals>
<goal>yarn</goal>
<goal>corepack</goal>
</goals>
<configuration>
<arguments>install --frozen-lockfile</arguments>
<arguments>yarn install --immutable</arguments>
</configuration>
</execution>
<execution>
<id>yarn run build</id>
<goals>
<goal>yarn</goal>
<goal>corepack</goal>
</goals>
<configuration>
<arguments>run build</arguments>
<arguments>yarn run build</arguments>
</configuration>
</execution>
<execution>
<id>yarn run test:unit</id>
<goals>
<goal>yarn</goal>
<goal>corepack</goal>
</goals>
<phase>test</phase>
<configuration>
<skip>${skip.ui.tests}</skip>
<arguments>run test:unit</arguments>
<arguments>yarn run test:unit</arguments>
</configuration>
</execution>
<execution>
<id>yarn run test:e2e</id>
<goals>
<goal>yarn</goal>
<goal>corepack</goal>
</goals>
<phase>test</phase>
<configuration>
Expand All @@ -137,7 +138,7 @@
<PORT>${org.apache.jena.fuseki.ui.port}</PORT>
<FUSEKI_PORT>${org.apache.jena.fuseki.port}</FUSEKI_PORT>
</environmentVariables>
<arguments>run test:e2e</arguments>
<arguments>yarn run test:e2e</arguments>
</configuration>
</execution>
</executions>
Expand Down
5 changes: 0 additions & 5 deletions jena-fuseki2/jena-fuseki-ui/tests/.eslintrc.js
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions jena-fuseki2/jena-fuseki-ui/tests/e2e/.eslintrc.js
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions jena-fuseki2/jena-fuseki-ui/tests/e2e/plugins/index.js
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion jena-fuseki2/jena-fuseki-ui/tests/e2e/support/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
// https://on.cypress.io/configuration
// ***********************************************************

// import '@cypress/code-coverage/support'
// required to populate coverage/ with results
import '@cypress/code-coverage/support'

// Import commands.js using ES2015 syntax:
import './commands'
Expand Down
64 changes: 0 additions & 64 deletions jena-fuseki2/jena-fuseki-ui/tests/e2e/support/vite-preprocessor.js
View file
Open in desktop

This file was deleted.

Loading