Merge pull request #7613 from murdos/bun-compatibility

Bun compatibility
jhipster · Oct 2, 2023 · f920fdf · f920fdf
2 parents efd4a1e + 6687377
commit f920fdf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -25,15 +25,15 @@
  "lint:ci": "npm run lint:ci:js && npm run lint:ci:pug && npm run lint:ci:sass && npm run prettier:check",
  "lint:ci:js": "npm run lint:js:run -- --no-fix",
  "lint:ci:pug": "pug-lint src/main/style",
- "lint:ci:sass": "stylelint \"src/main/style/**/*.{css,scss}\"",
+ "lint:ci:sass": "stylelint 'src/main/style/**/*.{css,scss}'",
  "lint:js": "npm run lint:js:run -- --fix",
  "lint:js:run": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src/main/webapp src/test/javascript",
  "lint:pug": "npm run lint:ci:pug",
  "lint:sass": "npm run lint:ci:sass -- --fix",
  "prepare": "husky install",
  "prettier:check": "npm run prettier:run -- --check",
  "prettier:format": "npm run prettier:run -- --write",
- "prettier:run": "prettier \"{{src/**/,}*.{md,json,yml,html,vue,java,xml},*.{js,ts},.github/**/*.yml,documentation/**/*.md,src/{main/glyph,main/webapp,test/javascript}/**/*.{css,scss}}\"",
+ "prettier:run": "prettier '{{src/**/,}*.{md,json,yml,html,vue,java,xml},*.{js,ts},.github/**/*.yml,documentation/**/*.md,src/{main/glyph,main/webapp,test/javascript}/**/*.{css,scss}}'",
  "preview": "vite preview",
  "start": "npm run dev",
  "test": "npm run vitest -- run --coverage --",

diff --git a/src/main/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactory.java
@@ -36,8 +36,8 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
  .addDevDependency(packageName("prettier-plugin-java"), COMMON)
  .addDevDependency(packageName("prettier-plugin-packagejson"), COMMON)
  .addScript(scriptKey("prepare"), scriptCommand("husky install"))
- .addScript(scriptKey("prettier:check"), scriptCommand("prettier --check \\\\\"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}\\\\\""))
- .addScript(scriptKey("prettier:format"), scriptCommand("prettier --write \\\\\"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}\\\\\""))
+ .addScript(scriptKey("prettier:check"), scriptCommand("prettier --check '{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}'"))
+ .addScript(scriptKey("prettier:format"), scriptCommand("prettier --write '{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}'"))
  .and()
  .build();
  //@formatter:on

diff --git a/src/test/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/prettier/domain/PrettierModuleFactoryTest.java
@@ -41,8 +41,8 @@ void shouldBuildModule() {
  .containing(nodeDependency("prettier-plugin-java"))
  .containing(nodeDependency("prettier-plugin-packagejson"))
  .containing(nodeScript("prepare", "husky install"))
- .containing(nodeScript("prettier:check", "prettier --check \\\"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}\\\""))
- .containing(nodeScript("prettier:format", "prettier --write \\\"{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}\\\""));
+ .containing(nodeScript("prettier:check", "prettier --check '{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}'"))
+ .containing(nodeScript("prettier:format", "prettier --write '{,src/**/}*.{md,json,yml,html,js,ts,tsx,css,scss,vue,java,xml}'"));
  }
 
  private JHipsterModuleProperties properties(String folder) {