generator-jhipster 7.1.0 → 7.4.0

package/generators/init/templates/.gitignore.jhi.ejs

@@ -0,0 +1,128 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed 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
+
+      https://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.
+-%>
+######################
+# Node
+######################
+node_modules/
+npm-debug.log.*
+/.awcache/*
+/.cache-loader/*
+
+######################
+# SASS
+######################
+.sass-cache/
+
+######################
+# Eclipse
+######################
+*.pydevproject
+.project
+.metadata
+tmp/
+tmp/**/*
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+.factorypath
+/src/main/resources/rebel.xml
+
+# External tool builders
+.externalToolBuilders/**
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+# STS-specific
+/.sts4-cache/*
+
+######################
+# IntelliJ
+######################
+.idea/
+*.iml
+*.iws
+*.ipr
+*.ids
+*.orig
+classes/
+out/
+
+######################
+# Visual Studio Code
+######################
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+######################
+# Windows
+######################
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+######################
+# Mac OSX
+######################
+.DS_Store
+.svn
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+######################
+# Logs
+######################
+*.log*
+
+######################
+# Others
+######################
+*.class
+*.*~
+*~
+.merge_file*
+
+######################
+# ESLint
+######################
+.eslintcache
+
+<&- fragments.render({ join: '\n\n' }) &>

package/generators/init/templates/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no-install lint-staged

package/generators/{client/templates/vue/webpack/utils.js.ejs → init/templates/.lintstagedrc.js.ejs}

@@ -16,15 +16,6 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-const path = require('path');
-
 module.exports = {
-  root
+  '{,src/**/,webpack/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}': ['prettier --write'],
 };
-
-const _root = path.resolve(__dirname, '..');
-
-function root(args) {
-  args = Array.prototype.slice.call(arguments, 0);
-  return path.join.apply(path, [_root].concat(args));
-}

package/generators/init/templates/.prettierignore.jhi.ejs

@@ -0,0 +1,23 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed 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
+
+      https://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.
+-%>
+node_modules
+package-lock.json
+.git
+
+<&- fragments.render({ join: '\n\n' }) &>

package/generators/init/templates/.prettierrc.yml.jhi.ejs

@@ -0,0 +1,29 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed 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
+
+      https://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.
+-%>
+# Prettier configuration
+
+printWidth: 140
+singleQuote: true
+tabWidth: <%= prettierDefaultIndent %>
+useTabs: false
+
+# js and ts rules:
+arrowParens: avoid
+
+<&- fragments.render({ join: '\n\n' }) &>

package/generators/init/templates/README.md.ejs

@@ -0,0 +1,19 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed 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
+
+      https://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.
+-%>
+# <%= projectName %>

package/generators/init/templates/package.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "husky": "7.0.2",
+    "lint-staged": "11.0.0"
+  }
+}

package/generators/init/templates/package.json.ejs

@@ -0,0 +1,41 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed 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
+
+      https://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.
+-%>
+{
+  "name": "<%= dasherizedBaseName %>",
+  "version": "0.0.0",
+  "description": "<%= projectName %>",
+  "private": true,
+  "license": "UNLICENSED",
+  "cacheDirectories": [
+    "node_modules"
+  ],
+  "dependencies": {},
+  "devDependencies": {
+    "prettier": "<%= this.nodeDependencies['prettier'] %>",
+    "prettier-plugin-java": "<%= this.nodeDependencies['prettier-plugin-java'] %>",
+    "prettier-plugin-packagejson": "<%= this.nodeDependencies['prettier-plugin-packagejson'] %>"
+  },
+  "engines": {
+    "node": ">=<%= NODE_VERSION %>"
+  },
+  "scripts": {
+    "prettier:check": "prettier --check \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\"",
+    "prettier:format": "prettier --write \"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java}\""
+  }
+}

package/generators/java/__snapshots__/generator.spec.cjs.snap

@@ -0,0 +1,118 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`JHipster java generator with add option and default config should write only java files and match snapshot 1`] = `
+Object {
+  ".yo-rc.json": Object {
+    "stateCleared": "modified",
+  },
+}
+`;
+
+exports[`JHipster java generator with default config should write java files with maven build tool and match snapshot 1`] = `
+Object {
+  ".editorconfig": Object {
+    "stateCleared": "modified",
+  },
+  ".gitattributes": Object {
+    "stateCleared": "modified",
+  },
+  ".gitignore": Object {
+    "stateCleared": "modified",
+  },
+  ".husky/pre-commit": Object {
+    "stateCleared": "modified",
+  },
+  ".lintstagedrc.js": Object {
+    "stateCleared": "modified",
+  },
+  ".mvn/wrapper/MavenWrapperDownloader.java": Object {
+    "stateCleared": "modified",
+  },
+  ".mvn/wrapper/maven-wrapper.jar": Object {
+    "stateCleared": "modified",
+  },
+  ".mvn/wrapper/maven-wrapper.properties": Object {
+    "stateCleared": "modified",
+  },
+  ".prettierignore": Object {
+    "stateCleared": "modified",
+  },
+  ".prettierrc.yml": Object {
+    "stateCleared": "modified",
+  },
+  ".yo-rc.json": Object {
+    "stateCleared": "modified",
+  },
+  "README.md": Object {
+    "stateCleared": "modified",
+  },
+  "mvnw": Object {
+    "stateCleared": "modified",
+  },
+  "mvnw.cmd": Object {
+    "stateCleared": "modified",
+  },
+  "package.json": Object {
+    "stateCleared": "modified",
+  },
+  "pom.xml": Object {
+    "stateCleared": "modified",
+  },
+}
+`;
+
+exports[`JHipster java generator with gradle option should write java files with gradle build tool and match snapshot 1`] = `
+Object {
+  ".editorconfig": Object {
+    "stateCleared": "modified",
+  },
+  ".gitattributes": Object {
+    "stateCleared": "modified",
+  },
+  ".gitignore": Object {
+    "stateCleared": "modified",
+  },
+  ".husky/pre-commit": Object {
+    "stateCleared": "modified",
+  },
+  ".lintstagedrc.js": Object {
+    "stateCleared": "modified",
+  },
+  ".prettierignore": Object {
+    "stateCleared": "modified",
+  },
+  ".prettierrc.yml": Object {
+    "stateCleared": "modified",
+  },
+  ".yo-rc.json": Object {
+    "stateCleared": "modified",
+  },
+  "README.md": Object {
+    "stateCleared": "modified",
+  },
+  "build.gradle": Object {
+    "stateCleared": "modified",
+  },
+  "gradle.properties": Object {
+    "stateCleared": "modified",
+  },
+  "gradle/wrapper/gradle-wrapper.jar": Object {
+    "stateCleared": "modified",
+  },
+  "gradle/wrapper/gradle-wrapper.properties": Object {
+    "stateCleared": "modified",
+  },
+  "gradlew": Object {
+    "stateCleared": "modified",
+  },
+  "gradlew.bat": Object {
+    "stateCleared": "modified",
+  },
+  "package.json": Object {
+    "stateCleared": "modified",
+  },
+  "settings.gradle": Object {
+    "stateCleared": "modified",
+  },
+}
+`;

package/generators/java/config.cjs

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed 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
+ *
+ *      https://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.
+ */
+const {
+  PACKAGE_NAME,
+  PACKAGE_NAME_DEFAULT_VALUE,
+  PRETTIER_JAVA_INDENT,
+  PRETTIER_JAVA_INDENT_DEFAULT_VALUE,
+  BUILD_TOOL,
+  BUILD_TOOL_DEFAULT_VALUE,
+  BUILD_DESTINATION,
+  BUILD_DESTINATION_DEFAULT_VALUE,
+} = require('./constants.cjs');
+
+/** Config required at .yo-rc.json */
+const requiredConfig = {
+  [PACKAGE_NAME]: PACKAGE_NAME_DEFAULT_VALUE,
+  [BUILD_TOOL]: BUILD_TOOL_DEFAULT_VALUE,
+};
+
+/** Default config for templates */
+const defaultConfig = {
+  ...requiredConfig,
+  [PRETTIER_JAVA_INDENT]: PRETTIER_JAVA_INDENT_DEFAULT_VALUE,
+  [BUILD_DESTINATION]: BUILD_DESTINATION_DEFAULT_VALUE,
+};
+
+module.exports = { requiredConfig, defaultConfig };

package/generators/java/constants.cjs

@@ -0,0 +1,69 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed 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
+ *
+ *      https://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.
+ */
+const { MAVEN: BUILD_TOOL_MAVEN, MAVEN_DESCRIPTION, BUILD_DESTINATION_VALUE } = require('../maven/constants.cjs');
+const { GRADLE: BUILD_TOOL_GRADLE, GRADLE_DESCRIPTION } = require('../gradle/constants.cjs');
+
+const JAVA_VERSION = '11';
+const JAVA_COMPATIBLE_VERSIONS = ['11', '12', '13', '14', '15', '16', '17'];
+const JAVA_APP_VERSION = '0.0.1-SNAPSHOT';
+const JAVA_SOURCE_DIR = 'src/main/java/';
+const JAVA_RESOURCE_DIR = 'src/main/resources/';
+const JAVA_TEST_DIR = 'src/test/java/';
+
+const PACKAGE_NAME = 'packageName';
+const PACKAGE_NAME_DESCRIPTION = 'Package name';
+const PACKAGE_NAME_DEFAULT_VALUE = 'com.mycompany.myapp';
+
+const PRETTIER_JAVA_INDENT = 'prettierJavaIndent';
+const PRETTIER_JAVA_INDENT_DEFAULT_VALUE = 4;
+
+const BUILD_TOOL = 'buildTool';
+const BUILD_TOOL_DESCRIPTION = 'Build tool';
+const BUILD_TOOL_DEFAULT_VALUE = 'maven';
+const BUILD_TOOL_PROMPT_CHOICES = [
+  { value: BUILD_TOOL_MAVEN, name: MAVEN_DESCRIPTION },
+  { value: BUILD_TOOL_GRADLE, name: GRADLE_DESCRIPTION },
+];
+
+const BUILD_DESTINATION = 'buildDestination';
+const BUILD_DESTINATION_DESCRIPTION = 'Build destination';
+const BUILD_DESTINATION_DEFAULT_VALUE = BUILD_DESTINATION_VALUE;
+
+module.exports = {
+  JAVA_VERSION,
+  JAVA_COMPATIBLE_VERSIONS,
+  JAVA_APP_VERSION,
+  JAVA_SOURCE_DIR,
+  JAVA_RESOURCE_DIR,
+  JAVA_TEST_DIR,
+  PACKAGE_NAME,
+  PACKAGE_NAME_DESCRIPTION,
+  PACKAGE_NAME_DEFAULT_VALUE,
+  PRETTIER_JAVA_INDENT,
+  PRETTIER_JAVA_INDENT_DEFAULT_VALUE,
+  BUILD_TOOL,
+  BUILD_TOOL_DESCRIPTION,
+  BUILD_TOOL_MAVEN,
+  BUILD_TOOL_GRADLE,
+  BUILD_TOOL_DEFAULT_VALUE,
+  BUILD_TOOL_PROMPT_CHOICES,
+  BUILD_DESTINATION,
+  BUILD_DESTINATION_DESCRIPTION,
+  BUILD_DESTINATION_DEFAULT_VALUE,
+};

package/generators/java/files.cjs

@@ -0,0 +1,26 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed 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
+ *
+ *      https://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.
+ */
+
+module.exports.files = {
+  javaProject: [
+    {
+      templates: ['.prettierrc.yml.jhi.java', '.editorconfig.jhi.java', '.gitignore.jhi.java'],
+    },
+  ],
+};

package/generators/java/generator.spec.cjs

@@ -0,0 +1,87 @@
+/**
+ * Copyright 2013-2021 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed 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
+ *
+ *      https://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.
+ */
+const expect = require('expect');
+const path = require('path');
+
+const { skipPrettierHelpers: helpers } = require('../../test/utils/utils');
+
+const { basicTests, testBlueprintSupport } = require('../../test/support/index.cjs');
+const { defaultConfig, requiredConfig } = require('./config.cjs');
+const { GENERATOR_JAVA } = require('../generator-list');
+
+const generatorPath = path.join(__dirname, 'index.cjs');
+const generator = path.basename(__dirname);
+
+describe(`JHipster ${generator} generator`, () => {
+  it('generator-list constant matches folder name', () => {
+    expect(GENERATOR_JAVA).toBe(generator);
+  });
+  basicTests({
+    requiredConfig,
+    defaultConfig,
+    customPrompts: {
+      packageName: 'my.custom.package.name',
+      prettierJavaIndent: 2,
+      buildTool: 'any',
+    },
+    generatorPath,
+  });
+  describe('blueprint support', () => testBlueprintSupport(generator));
+  describe('with', () => {
+    describe('default config', () => {
+      let runResult;
+      before(async () => {
+        runResult = await helpers.run(generatorPath);
+      });
+      it('should write java files with maven build tool and match snapshot', () => {
+        expect(runResult.getStateSnapshot()).toMatchSnapshot();
+      });
+    });
+    describe('gradle option', () => {
+      let runResult;
+      before(async () => {
+        runResult = await helpers.run(generatorPath).withOptions({ buildTool: 'gradle' });
+      });
+      it('should write java files with gradle build tool and match snapshot', () => {
+        expect(runResult.getStateSnapshot()).toMatchSnapshot();
+      });
+    });
+    describe('custom blueprinted build-tool', () => {
+      const buildTool = 'blueprint:build-tool';
+      let runResult;
+      before(async () => {
+        runResult = await helpers.run(generatorPath).withMockedGenerators([buildTool]).withOptions({ buildTool });
+      });
+      it('should compose with custom build-tool generator', () => {
+        expect(runResult.mockedGenerators[buildTool].calledOnce).toBe(true);
+      });
+    });
+  });
+  describe('with add option and', () => {
+    describe('default config', () => {
+      let runResult;
+      before(async () => {
+        runResult = await helpers.run(generatorPath).withOptions({ add: true });
+      });
+      it('should write only java files and match snapshot', () => {
+        expect(runResult.getStateSnapshot()).toMatchSnapshot();
+      });
+    });
+  });
+});