Skip to content

Commit

Permalink
Merge branch 'master' into add-search-keyboard-shortcut
Browse files Browse the repository at this point in the history
  • Loading branch information
@janfaracik
janfaracik committed Jul 21, 2022
2 parents 9654bfb + bcefcc5 commit fac0b6f
Show file tree
Hide file tree
Showing 6 changed files with 11,235 additions and 7,903 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,7 @@
*.png binary
*.war binary
*.zip binary

# Yarn
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
/war/.yarn/plugins/** binary
9 changes: 9 additions & 0 deletions war/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ work
/rebel.xml
junit.xml

# Yarn
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/sdks
!.yarn/versions

# Node
node/
node_modules/
Expand Down
8 changes: 8 additions & 0 deletions war/.yarnrc.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Defines what linker should be used for installing Node packages (useful to
# enable the node-modules plugin), one of: pnp, pnpm and node-modules.
nodeLinker: node-modules

# The yarnPath setting is currently the preferred way to install Yarn within a
# project, as it ensures that your whole team will use the exact same Yarn
# version, without having to individually keep it up-to-date.
yarnPath: .yarn/releases/yarn-3.2.0.cjs
64 changes: 32 additions & 32 deletions war/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,45 +21,45 @@
"lint": "yarn lint:js && yarn lint:css"
},
"devDependencies": {
"@babel/cli": "^7.18.9",
"@babel/core": "^7.18.9",
"@jenkins-cd/js-test": "^1.2.3",
"autoprefixer": "^10.4.7",
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.7.1",
"css-minimizer-webpack-plugin": "^4.0.0",
"eslint": "^8.20.0",
"@babel/cli": "7.18.9",
"@babel/core": "7.18.9",
"@jenkins-cd/js-test": "1.2.3",
"autoprefixer": "10.4.7",
"clean-webpack-plugin": "4.0.0",
"copy-webpack-plugin": "11.0.0",
"css-loader": "6.7.1",
"css-minimizer-webpack-plugin": "4.0.0",
"eslint": "8.20.0",
"handlebars": "^3.0.8",
"handlebars-loader": "^1.7.2",
"handlebars-loader": "1.7.2",
"jest": "^26.0.1",
"jest-handlebars": "^1.0.1",
"jest-junit": "^14.0.0",
"jest-standard-reporter": "^2.0.0",
"less": "^4.1.3",
"less-loader": "^11.0.0",
"mini-css-extract-plugin": "^2.6.1",
"postcss": "^8.4.14",
"postcss-loader": "^7.0.1",
"style-loader": "^3.3.1",
"stylelint": "^14.9.1",
"stylelint-config-standard": "^26.0.0",
"webpack": "^5.73.0",
"webpack-cli": "^4.10.0",
"webpack-remove-empty-scripts": "^0.8.1"
"jest-handlebars": "1.0.1",
"jest-junit": "14.0.0",
"jest-standard-reporter": "2.0.0",
"less": "4.1.3",
"less-loader": "11.0.0",
"mini-css-extract-plugin": "2.6.1",
"postcss": "8.4.14",
"postcss-loader": "7.0.1",
"style-loader": "3.3.1",
"stylelint": "14.9.1",
"stylelint-config-standard": "26.0.0",
"webpack": "5.73.0",
"webpack-cli": "4.10.0",
"webpack-remove-empty-scripts": "0.8.1"
},
"dependencies": {
"@babel/preset-env": "^7.18.9",
"babel-loader": "^8.2.5",
"@babel/preset-env": "7.18.9",
"babel-loader": "8.2.5",
"bootstrap": "3.4.1",
"hotkeys-js": "^3.9.4",
"jenkins-js-modules": "^1.5.0",
"jenkins-js-modules": "1.5.4",
"jquery": "3.6.0",
"lodash": "^4.17.21",
"postcss-less": "^6.0.0",
"sortablejs": "^1.15.0",
"stylelint-checkstyle-reporter": "^0.2.0",
"window-handle": "^1.0.0"
"lodash": "4.17.21",
"postcss-less": "6.0.0",
"sortablejs": "1.15.0",
"stylelint-checkstyle-reporter": "0.2.0",
"window-handle": "1.0.1"
},
"browserslist": [
"defaults",
Expand Down
35 changes: 30 additions & 5 deletions war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ THE SOFTWARE.
<!-- HTTP listener port -->
<port>8080</port>
<node.version>16.15.1</node.version>
<!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
<yarn.version>1.22.19</yarn.version>
<!-- maven-antrun-plugin will download this Yarn version. -->
<yarn-berry.version>3.2.0</yarn-berry.version>
<yarn-berry.sha256sum>99a7f42f678b8ccd9c8e97a9e65fe7a5043033dd0e074e6d1f13fbe2d5ff2734</yarn-berry.sha256sum>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -696,6 +700,32 @@ THE SOFTWARE.
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>download-yarn</id>
<goals>
<goal>run</goal>
</goals>
<phase>initialize</phase>
<configuration>
<tasks>
<property name="yarn.dest" value="${project.basedir}/.yarn/releases/yarn-${yarn-berry.version}.cjs" />
<dirname file="${yarn.dest}" property="yarn.dest.dir" />
<mkdir dir="${yarn.dest.dir}" />
<get dest="${yarn.dest}" src="https://repo.yarnpkg.com/${yarn-berry.version}/packages/yarnpkg-cli/bin/yarn.js" usetimestamp="true" />
<checksum algorithm="SHA-256" file="${yarn.dest}" property="${yarn-berry.sha256sum}" verifyProperty="yarn.checksum.matches" />
<condition property="yarn.checksum.matches.fail">
<equals arg1="${yarn.checksum.matches}" arg2="false" />
</condition>
<fail if="yarn.checksum.matches.fail">Checksum error</fail>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
Expand All @@ -722,11 +752,6 @@ THE SOFTWARE.
<goal>yarn</goal>
</goals>
<phase>initialize</phase>
<configuration>
<!-- ensure only one concurrent 'yarn install' -->
<!-- when yarn cache is empty, multiple yarns performing network fetches frequently results in opaque errors -->
<arguments>--mutex network</arguments>
</configuration>
</execution>

<execution>
Expand Down
Loading

0 comments on commit fac0b6f

Please sign in to comment.