chore: Restrict further import order (#2795)

Author: pmdartus

.eslintrc

@@ -94,7 +94,7 @@
         "lwc-internal/no-invalid-todo": "error",
         "import/order": [
             "error",
-            { "groups": [["builtin", "external", "internal"]] }
+            { "groups": ["builtin", "external", "internal", "parent", "index", "sibling", "object", "type"] }
         ]
     },
 

packages/@lwc/babel-plugin-component/src/decorators/api/index.js

@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: MIT
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
-const validate = require('./validate');
-const transform = require('./transform');
 const {
     LWC_PACKAGE_EXPORTS: { API_DECORATOR },
 } = require('../../constants');
 
+const validate = require('./validate');
+const transform = require('./transform');
+
 module.exports = {
     name: API_DECORATOR,
     validate,

packages/@lwc/babel-plugin-component/src/decorators/api/transform.js

@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: MIT
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
-const { isApiDecorator } = require('./shared');
 const {
     DECORATOR_TYPES,
     LWC_COMPONENT_PROPERTIES: { PUBLIC_METHODS, PUBLIC_PROPS },
 } = require('../../constants');
 
+const { isApiDecorator } = require('./shared');
+
 const PUBLIC_PROP_BIT_MASK = {
     PROPERTY: 0,
     GETTER: 1,

packages/@lwc/babel-plugin-component/src/decorators/api/validate.js

@@ -5,15 +5,16 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 const { DecoratorErrors } = require('@lwc/errors');
-const { isApiDecorator } = require('./shared');
+
+const { generateError } = require('../../utils');
 const {
     AMBIGUOUS_PROP_SET,
     DISALLOWED_PROP_SET,
     LWC_PACKAGE_EXPORTS: { TRACK_DECORATOR },
     DECORATOR_TYPES,
 } = require('../../constants');
 
-const { generateError } = require('../../utils');
+const { isApiDecorator } = require('./shared');
 
 function validateConflict(path, decorators) {
     const isPublicFieldTracked = decorators.some(

packages/@lwc/babel-plugin-component/src/decorators/index.js

@@ -7,10 +7,6 @@
 const moduleImports = require('@babel/helper-module-imports');
 const { DecoratorErrors } = require('@lwc/errors');
 
-const api = require('./api');
-const wire = require('./wire');
-const track = require('./track');
-
 const { DECORATOR_TYPES, LWC_PACKAGE_ALIAS, REGISTER_DECORATORS_ID } = require('../constants');
 const {
     generateError,
@@ -19,6 +15,10 @@ const {
     isGetterClassMethod,
 } = require('../utils');
 
+const api = require('./api');
+const wire = require('./wire');
+const track = require('./track');
+
 const DECORATOR_TRANSFORMS = [api, wire, track];
 const AVAILABLE_DECORATORS = DECORATOR_TRANSFORMS.map((transform) => transform.name).join(', ');
 

packages/@lwc/babel-plugin-component/src/decorators/wire/index.js

@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: MIT
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
-const validate = require('./validate');
-const transform = require('./transform');
 const {
     LWC_PACKAGE_EXPORTS: { WIRE_DECORATOR },
 } = require('../../constants');
 
+const validate = require('./validate');
+const transform = require('./transform');
+
 module.exports = {
     name: WIRE_DECORATOR,
     validate,

packages/@lwc/babel-plugin-component/src/decorators/wire/transform.js

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: MIT
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
-const { isWireDecorator } = require('./shared');
 const { LWC_COMPONENT_PROPERTIES } = require('../../constants');
 
+const { isWireDecorator } = require('./shared');
+
 const WIRE_PARAM_PREFIX = '$';
 const WIRE_CONFIG_ARG_NAME = '$cmp';
 

packages/@lwc/babel-plugin-component/src/decorators/wire/validate.js

@@ -5,12 +5,13 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 const { DecoratorErrors } = require('@lwc/errors');
-const { isWireDecorator } = require('./shared');
 const {
     LWC_PACKAGE_EXPORTS: { WIRE_DECORATOR, TRACK_DECORATOR, API_DECORATOR },
 } = require('../../constants');
 const { generateError } = require('../../utils');
 
+const { isWireDecorator } = require('./shared');
+
 function validateWireParameters(path) {
     const [id, config] = path.get('expression.arguments');
 

packages/@lwc/engine-core/src/framework/base-lightning-element.ts

@@ -24,6 +24,9 @@ import {
     KEY__SYNTHETIC_MODE,
     setPrototypeOf,
 } from '@lwc/shared';
+
+import { logError } from '../shared/logger';
+import { getComponentTag } from '../shared/format';
 import {
     getChildren,
     getChildNodes,
@@ -47,6 +50,7 @@ import {
     querySelector,
     querySelectorAll,
 } from '../renderer';
+
 import { HTMLElementOriginalDescriptors } from './html-properties';
 import { getWrappedComponentsListener } from './component';
 import { vmBeingConstructed, isBeingConstructed, isInvokingRender } from './invoker';
@@ -60,8 +64,6 @@ import {
 } from './restrictions';
 import { unlockAttribute, lockAttribute } from './attributes';
 import { Template, isUpdatingTemplate, getVMBeingRendered } from './template';
-import { logError } from '../shared/logger';
-import { getComponentTag } from '../shared/format';
 import { HTMLElementConstructor } from './base-bridge-element';
 import { lockerLivePropertyKey } from './membrane';
 

packages/@lwc/engine-core/src/framework/check-version-mismatch.ts

@@ -5,10 +5,12 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 import { isNull, LWC_VERSION, LWC_VERSION_COMMENT_REGEX } from '@lwc/shared';
+
+import { logError } from '../shared/logger';
+
 import { Template } from './template';
 import { StylesheetFactory } from './stylesheet';
 import { LightningElementConstructor } from './base-lightning-element';
-import { logError } from '../shared/logger';
 
 let warned = false;