Merge branch 'v6' into pr354

Author: vladislavarsenev

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,7 +6,7 @@ title: ''
 assignees: ''
 ---
 
-<!-- PLEASE READ THIS:
+<!-- PLEASE READ THIS:  
  - If you are not sure is a bug, OPEN a DISCUSSION, if is a legitimate bug, is easy to create a bug from a discussion.
  - Empty reports won't be considered and eventually be closed by a bot.
  - Include debugging notes will help to fix it faster.
@@ -18,11 +18,10 @@ assignees: ''
 -->
 
 **Your Environment**
-
-- **Prettier version**: 2.x.x
-- **node version**: [12.x.x, 14.x.x]
-- **package manager**: [npm@7, pnpm@6, yarn@2]
-- **IDE**: [VScode, Webstorm, CLI]
+ * **Prettier version**: 2.x.x
+ * **node version**: [12.x.x, 14.x.x]
+ * **package manager**: [npm@7, pnpm@6, yarn@2]
+ * **IDE**: [VScode, Webstorm, CLI]
 
 **Describe the bug**
 
@@ -55,7 +54,7 @@ Be aware, the lack of reproducible steps the issue might cause your ticket to be
 
 **Contribute to @trivago/prettier-plugin-sort-imports**
 
-- [ ] I'm willing to fix this bug 🥇
+- [ ] I'm willing to fix this bug 🥇 
 
 <!--
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-    - name: Question 🤷🏻‍♂️
-      url: https://github.com/trivago/prettier-plugin-sort-imports/discussions/new?category=q-a
-      about: 🆕 Open a new Q&A discussion 🙏
+  - name: Question 🤷🏻‍♂️
+    url: https://github.com/trivago/prettier-plugin-sort-imports/discussions/new?category=q-a
+    about: 🆕 Open a new Q&A discussion 🙏

.github/ISSUE_TEMPLATE/feature.md

@@ -23,4 +23,4 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context or screenshots about the feature request here.

.github/workflows/ci.yml

@@ -1,15 +1,15 @@
 name: ci
 on: [push, pull_request]
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                node: [18.x, 20.x, 22.x]
-        steps:
-            - uses: actions/checkout@v4
-            - uses: actions/setup-node@v4
-              with:
-                  node-version: ${{ matrix.node }}
-            - run: yarn --immutable
-            - run: yarn test
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [18.x, 20.x, 22.x]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+      - run: yarn --immutable
+      - run: yarn test

.github/workflows/codeql-analysis.yml

@@ -9,62 +9,62 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: 'CodeQL'
+name: "CodeQL"
 
 on:
-    push:
-        branches: [master]
-    pull_request:
-        # The branches below must be a subset of the branches above
-        branches: [master]
-    schedule:
-        - cron: '37 7 * * 0'
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '37 7 * * 0'
 
 jobs:
-    analyze:
-        name: Analyze
-        runs-on: ubuntu-latest
-        permissions:
-            actions: read
-            contents: read
-            security-events: write
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
 
-        strategy:
-            fail-fast: false
-            matrix:
-                language: ['javascript']
-                # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-                # Learn more about CodeQL language support at https://git.io/codeql-language-support
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v2
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
 
-            # Initializes the CodeQL tools for scanning.
-            - name: Initialize CodeQL
-              uses: github/codeql-action/init@v1
-              with:
-                  languages: ${{ matrix.language }}
-                  # If you wish to specify custom queries, you can do so here or in a config file.
-                  # By default, queries listed here will override any specified in a config file.
-                  # Prefix the list here with "+" to use these queries and those in the config file.
-                  # queries: ./path/to/local/query, your-org/your-repo/queries@main
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-            # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-            # If this step fails, then you should remove it and run the build manually (see below)
-            - name: Autobuild
-              uses: github/codeql-action/autobuild@v1
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
 
-            # ℹ️ Command-line programs to run using the OS shell.
-            # 📚 https://git.io/JvXDl
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
 
-            # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-            #    and modify them (or add more) to build your code if your project
-            #    uses a compiled language
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
 
-            #- run: |
-            #   make bootstrap
-            #   make release
+    #- run: |
+    #   make bootstrap
+    #   make release
 
-            - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@v1
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.prettierignore

@@ -1,2 +1,6 @@
 tests/
 lib/
+examples/
+.github/
+docs/
+*.md

.prettierrc

@@ -0,0 +1,16 @@
+{
+    "printWidth": 80,
+    "tabWidth": 4,
+    "trailingComma": "all",
+    "singleQuote": true,
+    "bracketSameLine": true,
+    "semi": true,
+    "importOrder": ["^[./]"],
+    "importOrderSeparation": true,
+    "importOrderSortSpecifiers": true,
+    "plugins": [
+        "prettier-plugin-ember-template-tag",
+        "prettier-plugin-svelte",
+        "./lib/src/index.js"
+    ]
+}

README.md

@@ -15,7 +15,7 @@ import React, {
     KeyboardEvent,
 } from 'react';
 import { logger } from '@core/logger';
-import { reduce, debounce } from 'lodash';
+import { reduce, debounce } from 'lodash-es';
 import { Message } from '../Message';
 import { createServer } from '@server/node';
 import { Alert } from '@ui/Alert';
@@ -28,7 +28,7 @@ import { createConnection } from '@server/database';
 ### Output
 
 ```javascript
-import { debounce, reduce } from 'lodash';
+import { debounce, reduce } from 'lodash-es';
 import React, {
     ChangeEvent,
     FC,
@@ -52,18 +52,24 @@ import { add, filter, repeat } from '../utils';
 
 ### Install
 
-npm
+using npm
 
 ```shell script
 npm install --save-dev @trivago/prettier-plugin-sort-imports
 ```
 
-or, using yarn
+using yarn
 
 ```shell script
 yarn add --dev @trivago/prettier-plugin-sort-imports
 ```
 
+using pnpm
+
+```shell script
+pnpm add -D @trivago/prettier-plugin-sort-imports
+```
+
 **Note: If you are migrating from v2.x.x to v3.x.x, [Please Read Migration Guidelines](./docs/MIGRATION.md)**
 
 **Note: If formatting `.vue` sfc files please install `@vue/compiler-sfc` if not in your dependency tree - this normally is within Vue projects.**
@@ -126,6 +132,9 @@ between sorted import declarations group. The separation takes place according t
 "importOrderSeparation": true,
 ```
 
+If this option is enabled and `<SEPARATOR>` is used in the `importOrder` array, the plugin 
+will ONLY add newlines at those locations and at the end of the imports.
+
 #### `importOrderSortSpecifiers`
 
 **type**: `boolean`
@@ -270,11 +279,13 @@ Having some trouble or an issue ? You can check [FAQ / Troubleshooting section](
 | ---------------------- | ------------------------ | ------------------------------------------------ |
 | JS with ES Modules     | ✅ Everything            | -                                                |
 | NodeJS with ES Modules | ✅ Everything            | -                                                |
+| Angular                | ✅ Everything            | Supported through `importOrderParserPlugins` API |
+| Ember                  | ✅ Everything            | `prettier-plugin-ember-template-tag` is required |
 | React                  | ✅ Everything            | -                                                |
 | Solid                  | ✅ Everything            | -                                                |
-| Angular                | ✅ Everything            | Supported through `importOrderParserPlugins` API |
-| Vue                    | ✅ Everything            | `@vue/compiler-sfc` is required                  |
 | Svelte                 | ✅ Everything            | `prettier-plugin-svelte` is required             |
+| Vue                    | ✅ Everything            | `@vue/compiler-sfc` is required                  |
+
 
 ### Used by
 

docs/DEBUG.md

@@ -1,39 +1,31 @@
 ## Debugging
 
----
+----
 
 ### How to run example in the repository ?
-
 ```shell
 yarn run example examples/example.ts --config .prettierrc
 ```
 
 ### How to debug the plugin using node `debugger` ?
-
 You can set a `debugger` anywhere in the code and then use following command:
-
 ```shell
 yarn run compile && node --inspect-brk ./node_modules/.bin/prettier --config .prettierrc --plugin lib/src/index.js examples/example.ts
 ```
 
 ### How to debug the unit test using `debugger` ?
-
 You can set a `debugger` anywhere in the code and then use following command:
 
 ```shell
-node --inspect-brk ./node_modules/.bin/jest -i
+node --inspect-brk ./node_modules/.bin/jest -i 
 ```
-
 Or, to debug a single unit test file
-
 ```shell
  node --inspect-brk ./node_modules/.bin/jest -i <name-or-relative-path-of-the-file-file>
 ```
 
 ### How to run prettier in any codebase using the plugin ?
-
 First, install the `@trivago/prettier-plugin-sort-imports` and then use following command:
-
 ```shell
 ./node_modules/.bin/prettier --write '**/*.{ts,tsx,js}'
-```
+```