chore: minor fixes after merge

Author: caseyisonit

2nd-gen/eslint.config.js

@@ -164,8 +164,9 @@ export default [
             'notice/notice': [
                 'error',
                 {
-                    mustMatch: 'Copyright [0-9]{4}',
-                    templateFile: '../HEADER',
+                    mustMatch:
+                        'Copyright [0-9]{0,4} Adobe. All rights reserved.',
+                    templateFile: 'HEADER',
                     nonMatchingTolerance: 0.9,
                     onNonMatchingHeader: 'prepend',
                 },

2nd-gen/package.json

@@ -18,7 +18,7 @@
     "scripts": {
         "build": "yarn workspaces foreach --from '{@spectrum-web-components/core,@adobe/swc}' --recursive run build",
         "clean": "yarn workspaces foreach --from '{@spectrum-web-components/core,@adobe/swc}' --recursive run clean",
-        "lint": "eslint . --ext .ts,.js,.json",
+        "lint": "eslint .",
         "start": "yarn workspace @spectrum-web-components/core dev & yarn workspace @adobe/swc analyze:watch & yarn workspace @adobe/swc storybook",
         "storybook:build": "yarn workspace @adobe/swc storybook:build",
         "test": "yarn workspace @adobe/swc test"

2nd-gen/packages/core/package.json

@@ -6,9 +6,9 @@
     "author": "Adobe",
     "homepage": "https://opensource.adobe.com/spectrum-web-components/",
     "repository": {
+        "directory": "2nd-gen/packages/core",
         "type": "git",
-        "url": "https://github.com/adobe/spectrum-web-components.git",
-        "directory": "2nd-gen/packages/core"
+        "url": "https://github.com/adobe/spectrum-web-components.git"
     },
     "bugs": {
         "url": "https://github.com/adobe/spectrum-web-components/issues"

2nd-gen/packages/core/tsconfig.json

@@ -5,8 +5,8 @@
         "noEmit": false,
         "outDir": "./dist",
         "paths": {
-            "@spectrum-web-components/core/shared/*": ["./shared/*"],
-            "@spectrum-web-components/core/*": ["./*"]
+            "@spectrum-web-components/core/*": ["./*"],
+            "@spectrum-web-components/core/shared/*": ["./shared/*"]
         },
         "rootDir": "./"
     },

2nd-gen/packages/swc/components/badge/stories/badge.stories.ts

@@ -16,9 +16,8 @@ import type { Meta, StoryObj as Story } from '@storybook/web-components';
 import { html } from 'lit';
 import { styleMap } from 'lit/directives/style-map.js';
 
-import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
-
 import { Badge } from '@adobe/swc/badge';
+import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
 
 // ────────────────
 //    METADATA

2nd-gen/packages/swc/components/badge/test/badge.test.ts

@@ -11,7 +11,9 @@
  */
 
 import type { Badge } from '@adobe/swc/badge';
+
 import { html } from 'lit';
+
 import { beforeEach, describe, expect, test } from 'vitest';
 
 import '@adobe/swc/badge';

2nd-gen/packages/swc/components/divider/stories/divider.stories.ts

@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import { Divider } from '@adobe/swc/divider';
 import type { Meta, StoryObj as Story } from '@storybook/web-components';
-import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
+
 import { html } from 'lit';
 
+import { Divider } from '@adobe/swc/divider';
+import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
+
 // ────────────────
 //    METADATA
 // ────────────────

2nd-gen/packages/swc/components/progress-circle/stories/progress-circle.stories.ts

@@ -10,11 +10,13 @@
  * governing permissions and limitations under the License.
  */
 
-import { ProgressCircle } from '@adobe/swc/progress-circle';
 import type { Meta, StoryObj as Story } from '@storybook/web-components';
-import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
+
 import { html } from 'lit';
 
+import { ProgressCircle } from '@adobe/swc/progress-circle';
+import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
+
 // ────────────────
 //    METADATA
 // ────────────────

2nd-gen/packages/swc/components/status-light/stories/status-light.stories.ts

@@ -10,14 +10,17 @@
  * governing permissions and limitations under the License.
  */
 
-import '@adobe/swc/status-light';
-import { StatusLight } from '@adobe/swc/status-light';
-import type { Meta, StoryObj as Story } from '@storybook/web-components';
-import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
 import type { TemplateResult } from 'lit';
+import type { Meta, StoryObj as Story } from '@storybook/web-components';
+
 import { html } from 'lit';
 import { styleMap } from 'lit/directives/style-map.js';
 
+import { StatusLight } from '@adobe/swc/status-light';
+import { getStorybookHelpers } from '@wc-toolkit/storybook-helpers';
+
+import '@adobe/swc/status-light';
+
 // ────────────────
 //    METADATA
 // ────────────────

2nd-gen/packages/swc/components/status-light/test/status-light.test.ts

@@ -10,10 +10,14 @@
  * governing permissions and limitations under the License.
  */
 
-import '@adobe/swc/status-light';
 import type { StatusLight } from '@adobe/swc/status-light';
+
 import { html } from 'lit';
+
 import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+
+import '@adobe/swc/status-light';
+
 import { fixture } from '../../../utils/test-utils.js';
 
 describe('swc-status-light', () => {