Skip to content

Commit

Permalink
Update to next14 (#1659)
Browse files Browse the repository at this point in the history
* deps: next14

* deps: commons-compress fix + gradle-wrapper

* deps: gradle-wrapper version in agent_test.yml
  • Loading branch information
levinkerschberger authored Jul 12, 2024
1 parent eda948b commit b0210b3
Show file tree
Hide file tree
Showing 7 changed files with 967 additions and 949 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/agent_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
shell: bash
run: |
if [[ "${{ matrix.dockerimage }}" == "eclipse-temurin:21" ]]; then
sed -i 's/gradle-7.6-bin.zip/gradle-8.7-bin.zip/' gradle/wrapper/gradle-wrapper.properties
sed -i 's/gradle-7.6.2-bin.zip/gradle-8.7-bin.zip/' gradle/wrapper/gradle-wrapper.properties
cat gradle/wrapper/gradle-wrapper.properties
fi
- name: Clean Gradle cache
Expand Down
10 changes: 10 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
import com.github.jk1.license.render.TextReportRenderer
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask

// There is a transitive dependency which causes the bootJar task to fail.
// This fixes the issue by forcing the correct version of the dependency.
buildscript {
configurations.configureEach {
resolutionStrategy {
force "org.apache.commons:commons-compress:1.26.2"
}
}
}

plugins {
alias(libs.plugins.nlLittlerobotsVersionCatalogUpdate)
alias(libs.plugins.comGithubJk1DependencyLicenseReport)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ apply plugin: 'idea'

node {
// Version of node to use.
version = '18.14.2'
version = '20.15.1'

// Version of npm to use.
npmVersion = '6.13.4'
npmVersion = '10.8.2'

// Version of Yarn to use.
yarnVersion = '1.22.0'
yarnVersion = '1.22.22'

// If true, it will download node using above parameters.
// If false, it will try to use globally installed node.
Expand Down Expand Up @@ -74,7 +74,7 @@ tasks.register('buildFrontend', YarnTask) {
outputs.dir('out')

dependsOn lintFrontend, checkCodeStyleFrontend
args = ['export']
args = ['build']
environment = [NODE_OPTIONS: "--openssl-legacy-provider"]
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
const isProduction = process.env.NODE_ENV === 'production';

module.exports = {
distDir: '../.next',
const nextConfig = {
output: 'export',
distDir: '../out',

// Each page will be exported as a directory
trailingSlash: true,
Expand All @@ -22,3 +23,5 @@ module.exports = {
BUILD_DATE: new Date().toUTCString(),
},
};

module.exports = nextConfig;
12 changes: 6 additions & 6 deletions components/inspectit-ocelot-configurationserver-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"version": "0.1.0",
"scripts": {
"dev": "next ./src",
"build": "next build ./src",
"start": "next start ./src",
"build": "next build",
"start": "next start",
"export": "next build ./src && next export ./src -o ./out",
"lint": "next lint ./src",
"lint:fix": "next lint --fix ./src",
Expand All @@ -29,21 +29,21 @@
"axios": "^1.6.2",
"classnames": "^2.3.1",
"dateformat": "^3.0.3",
"eslint-config-next": "^13.0.0",
"eslint-config-next": "^14.2.5",
"file-saver": "^2.0.5",
"js-yaml": "^4.1.0",
"jszip": "^3.10.0",
"jwt-decode": "^3.1.2",
"lodash": "^4.17.21",
"next": "^13.0.0",
"next": "^14.2.5",
"primeflex": "^3.2.1",
"primeicons": "^5.0.0",
"primereact": "^8.5.0",
"prop-types": "^15.8.1",
"randexp": "^0.5.3",
"react": "^18.0.0",
"react": "^18.3.1",
"react-diff-viewer-continued": "^3.3.1",
"react-dom": "^18.0.0",
"react-dom": "^18.3.1",
"react-dropzone": "^14.2.3",
"react-redux": "^8.0.2",
"react-syntax-highlighter": "^15.5.0",
Expand Down
1,875 changes: 940 additions & 935 deletions components/inspectit-ocelot-configurationserver-ui/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit b0210b3

Please sign in to comment.