@4mbl/lint 0.0.0-alpha.95025cd → 0.0.0-alpha.95aea20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,125 @@
1
1
  # @4mbl/lint
2
2
 
3
+ ## 1.0.0-beta.30
4
+
5
+ ### Minor Changes
6
+
7
+ - 10abc93: Upgrade dependencies
8
+
9
+ ## 1.0.0-beta.29
10
+
11
+ ### Minor Changes
12
+
13
+ - fec850c: Migrate to native React Compiler rules
14
+
15
+ ## 1.0.0-beta.28
16
+
17
+ ### Patch Changes
18
+
19
+ - cd19ade: Preserve all config properties when extending presets
20
+
21
+ ## 1.0.0-beta.27
22
+
23
+ ### Minor Changes
24
+
25
+ - 10abc93: Upgrade dependencies
26
+
27
+ ### Patch Changes
28
+
29
+ - dcfb4b0: [react] Preserve inherited plugins.
30
+ - f48a223: [react] Scope JSX rules in React preset
31
+
32
+ ## 1.0.0-beta.26
33
+
34
+ ### Minor Changes
35
+
36
+ - 10abc93: Upgrade dependencies
37
+
38
+ ## 1.0.0-beta.25
39
+
40
+ ### Minor Changes
41
+
42
+ - b812b8d: Upgrade dependencies
43
+
44
+ ## 1.0.0-beta.24
45
+
46
+ ### Minor Changes
47
+
48
+ - c713974: [base] Enable type-check within oxlint
49
+ - 87a9f36: Upgrade dependencies
50
+
51
+ ## 1.0.0-beta.23
52
+
53
+ ### Minor Changes
54
+
55
+ - 09239e5: Upgrade dependencies
56
+
57
+ ## 1.0.0-beta.22
58
+
59
+ ### Minor Changes
60
+
61
+ - 75f5fe2: Upgrade dependencies
62
+
63
+ ## 1.0.0-beta.21
64
+
65
+ ### Minor Changes
66
+
67
+ - ae2bb06: [base] Disable unicorn/max-nested-calls rule
68
+
69
+ ## 1.0.0-beta.20
70
+
71
+ ### Minor Changes
72
+
73
+ - 0a0c233: Upgrade dependencies
74
+
75
+ ## 1.0.0-beta.19
76
+
77
+ ### Minor Changes
78
+
79
+ - 4d35fb5: [react] Disable react/jsx-no-literals rule
80
+
81
+ ## 1.0.0-beta.18
82
+
83
+ ### Minor Changes
84
+
85
+ - a50c3f4: Upgrade dependencies
86
+
87
+ ## 1.0.0-beta.17
88
+
89
+ ### Minor Changes
90
+
91
+ - f0f62f4: Upgrade dependencies
92
+
93
+ ## 1.0.0-beta.16
94
+
95
+ ### Minor Changes
96
+
97
+ - b303b6f: Upgrade dependencies
98
+
99
+ ## 1.0.0-beta.15
100
+
101
+ ### Minor Changes
102
+
103
+ - aa95edc: Upgrade dependencies
104
+
105
+ ## 1.0.0-beta.14
106
+
107
+ ### Minor Changes
108
+
109
+ - e34f9fe: Enable import plugin in base
110
+ - 5586655: Disable some import plugin rules in base
111
+ - 9b2b412: Disable `no-nodejs-modules` in node
112
+
113
+ ## 1.0.0-beta.13
114
+
115
+ ### Minor Changes
116
+
117
+ - dd66007: Pin dependencies to ensure future compatibility
118
+ - 0feb87d: Remove unused dependencies and inline trivial imports
119
+ - 1d98a33: Disable `react/forbid-component-props` and `react/forbid-dom-props` to ensure Tailwind compatibility
120
+ - a9085f2: Extend inherited plugins in child presets
121
+ - 014d999: Allow `eslint/no-underscore-dangle` for `__dirname` and `__filename` in node
122
+
3
123
  ## 1.0.0-beta.12
4
124
 
5
125
  ### Minor Changes
package/dist/base.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { defineConfig, type OxlintConfig } from 'oxlint';
2
2
  type BaseOptions = {};
3
3
  declare function baseConfig(_options?: Partial<BaseOptions>): {
4
- plugins: ("unicorn" | "typescript")[];
4
+ plugins: ("import" | "typescript" | "unicorn")[];
5
5
  jsPlugins: never[];
6
6
  categories: {
7
7
  correctness: "error";
@@ -17,6 +17,7 @@ declare function baseConfig(_options?: Partial<BaseOptions>): {
17
17
  };
18
18
  options: {
19
19
  typeAware: true;
20
+ typeCheck: true;
20
21
  };
21
22
  rules: {
22
23
  'eslint/no-var': "warn";
@@ -91,7 +92,7 @@ declare function baseConfig(_options?: Partial<BaseOptions>): {
91
92
  'typescript/prefer-as-const': "error";
92
93
  'typescript/triple-slash-reference': "error";
93
94
  'typescript/explicit-member-accessibility': ["warn", {
94
- accessibility: string;
95
+ accessibility: "no-public";
95
96
  }];
96
97
  'eslint/id-length': "off";
97
98
  'eslint/sort-keys': "off";
@@ -101,7 +102,7 @@ declare function baseConfig(_options?: Partial<BaseOptions>): {
101
102
  'eslint/max-params': "off";
102
103
  'eslint/no-ternary': "off";
103
104
  'eslint/curly': "warn";
104
- 'typescript/consistent-type-definitions': ["warn", string];
105
+ 'typescript/consistent-type-definitions': ["warn", "type"];
105
106
  'eslint/max-statements': "off";
106
107
  'typescript/consistent-return': "off";
107
108
  'unicorn/switch-case-braces': "warn";
@@ -133,12 +134,17 @@ declare function baseConfig(_options?: Partial<BaseOptions>): {
133
134
  'import/no-namespace': "off";
134
135
  'import/exports-last': "off";
135
136
  'import/no-unassigned-import': "off";
137
+ 'import/group-exports': "off";
138
+ 'import/consistent-type-specifier-style': "off";
136
139
  'unicorn/no-new-array': "off";
137
140
  'eslint/no-array-constructor': "warn";
138
141
  'typescript/explicit-function-return-type': "off";
139
142
  'typescript/explicit-module-boundary-types': "off";
140
143
  'unicorn/no-anonymous-default-export': "off";
141
144
  'eslint/sort-imports': "off";
145
+ 'import/no-relative-parent-imports': "off";
146
+ 'unicorn/max-nested-calls': "off";
147
+ 'eslint/one-var': "off";
142
148
  'eslint/no-magic-numbers': "off";
143
149
  'unicorn/prefer-modern-math-apis': "off";
144
150
  'eslint/no-use-before-define': "off";
@@ -160,7 +166,7 @@ declare function baseConfig(_options?: Partial<BaseOptions>): {
160
166
  };
161
167
  export { type OxlintConfig, defineConfig, baseConfig };
162
168
  declare const _default: {
163
- plugins: ("unicorn" | "typescript")[];
169
+ plugins: ("import" | "typescript" | "unicorn")[];
164
170
  jsPlugins: never[];
165
171
  categories: {
166
172
  correctness: "error";
@@ -176,6 +182,7 @@ declare const _default: {
176
182
  };
177
183
  options: {
178
184
  typeAware: true;
185
+ typeCheck: true;
179
186
  };
180
187
  rules: {
181
188
  'eslint/no-var': "warn";
@@ -250,7 +257,7 @@ declare const _default: {
250
257
  'typescript/prefer-as-const': "error";
251
258
  'typescript/triple-slash-reference': "error";
252
259
  'typescript/explicit-member-accessibility': ["warn", {
253
- accessibility: string;
260
+ accessibility: "no-public";
254
261
  }];
255
262
  'eslint/id-length': "off";
256
263
  'eslint/sort-keys': "off";
@@ -260,7 +267,7 @@ declare const _default: {
260
267
  'eslint/max-params': "off";
261
268
  'eslint/no-ternary': "off";
262
269
  'eslint/curly': "warn";
263
- 'typescript/consistent-type-definitions': ["warn", string];
270
+ 'typescript/consistent-type-definitions': ["warn", "type"];
264
271
  'eslint/max-statements': "off";
265
272
  'typescript/consistent-return': "off";
266
273
  'unicorn/switch-case-braces': "warn";
@@ -292,12 +299,17 @@ declare const _default: {
292
299
  'import/no-namespace': "off";
293
300
  'import/exports-last': "off";
294
301
  'import/no-unassigned-import': "off";
302
+ 'import/group-exports': "off";
303
+ 'import/consistent-type-specifier-style': "off";
295
304
  'unicorn/no-new-array': "off";
296
305
  'eslint/no-array-constructor': "warn";
297
306
  'typescript/explicit-function-return-type': "off";
298
307
  'typescript/explicit-module-boundary-types': "off";
299
308
  'unicorn/no-anonymous-default-export': "off";
300
309
  'eslint/sort-imports': "off";
310
+ 'import/no-relative-parent-imports': "off";
311
+ 'unicorn/max-nested-calls': "off";
312
+ 'eslint/one-var': "off";
301
313
  'eslint/no-magic-numbers': "off";
302
314
  'unicorn/prefer-modern-math-apis': "off";
303
315
  'eslint/no-use-before-define': "off";
@@ -1 +1 @@
1
- {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEzD,KAAK,WAAW,GAAG,EAAE,CAAC;AAItB,iBAAS,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsLlD;AAED,OAAO,EAAE,KAAK,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEvD,wBAA4B"}
1
+ {"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEzD,KAAK,WAAW,GAAG,EAAE,CAAC;AAItB,iBAAS,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4LlD;AAED,OAAO,EAAE,KAAK,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC"}
package/dist/base.js CHANGED
@@ -3,7 +3,7 @@ import { defineConfig } from 'oxlint';
3
3
  function baseConfig(_options) {
4
4
  // const opts = { ...DEFAULT_OPTIONS, ...options };
5
5
  return defineConfig({
6
- plugins: ['typescript', 'unicorn'],
6
+ plugins: ['import', 'typescript', 'unicorn'],
7
7
  jsPlugins: [],
8
8
  categories: {
9
9
  correctness: 'error',
@@ -19,6 +19,7 @@ function baseConfig(_options) {
19
19
  },
20
20
  options: {
21
21
  typeAware: true,
22
+ typeCheck: true,
22
23
  },
23
24
  rules: {
24
25
  //* ERRORS - base rules that are always mistakes
@@ -137,6 +138,8 @@ function baseConfig(_options) {
137
138
  'import/no-namespace': 'off', // star imports are still pretty necessary
138
139
  'import/exports-last': 'off', // star imports are still pretty necessary
139
140
  'import/no-unassigned-import': 'off', // required for css imports
141
+ 'import/group-exports': 'off', // co-locating export statement with the function it exports is more readable
142
+ 'import/consistent-type-specifier-style': 'off', // single import per file is more readable
140
143
  // Array.from() is slower than new Array()
141
144
  // https://jsperf.app/tatuse
142
145
  'unicorn/no-new-array': 'off',
@@ -147,6 +150,9 @@ function baseConfig(_options) {
147
150
  // may revisit
148
151
  'unicorn/no-anonymous-default-export': 'off',
149
152
  'eslint/sort-imports': 'off', // consider when oxfmt is setup
153
+ 'import/no-relative-parent-imports': 'off',
154
+ 'unicorn/max-nested-calls': 'off',
155
+ 'eslint/one-var': 'off', // consider enforcing one separate variable declarations
150
156
  // currently produces too many false positives
151
157
  'eslint/no-magic-numbers': 'off',
152
158
  'unicorn/prefer-modern-math-apis': 'off',
package/dist/base.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"base.js","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ import { type OxlintConfig } from 'oxlint';
2
+ declare function extendConfig(parent: OxlintConfig, config: Omit<OxlintConfig, 'extends'>): OxlintConfig;
3
+ export { extendConfig };
4
+ //# sourceMappingURL=config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEzD,iBAAS,YAAY,CACnB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,GACpC,YAAY,CAmBd;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}
package/dist/config.js ADDED
@@ -0,0 +1,23 @@
1
+ import { defineConfig } from 'oxlint';
2
+ function extendConfig(parent, config) {
3
+ return defineConfig({
4
+ ...config,
5
+ extends: [parent],
6
+ categories: { ...parent.categories, ...config.categories },
7
+ env: { ...parent.env, ...config.env },
8
+ globals: { ...parent.globals, ...config.globals },
9
+ ignorePatterns: [
10
+ ...(parent.ignorePatterns ?? []),
11
+ ...(config.ignorePatterns ?? []),
12
+ ],
13
+ jsPlugins: [
14
+ ...(parent.jsPlugins ?? []),
15
+ ...(config.jsPlugins ?? []),
16
+ ],
17
+ options: { ...parent.options, ...config.options },
18
+ plugins: config.plugins ?? [],
19
+ settings: { ...parent.settings, ...config.settings },
20
+ });
21
+ }
22
+ export { extendConfig };
23
+ //# sourceMappingURL=config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAqB,MAAM,QAAQ,CAAC;AAEzD,SAAS,YAAY,CACnB,MAAoB,EACpB,MAAqC;IAErC,OAAO,YAAY,CAAC;QAClB,GAAG,MAAM;QACT,OAAO,EAAE,CAAC,MAAM,CAAC;QACjB,UAAU,EAAE,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,UAAU,EAAE;QAC1D,GAAG,EAAE,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE;QACrC,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE;QACjD,cAAc,EAAE;YACd,GAAG,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;YAChC,GAAG,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;SACjC;QACD,SAAS,EAAE;YACT,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;YAC3B,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC;SAC5B;QACD,OAAO,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE;QACjD,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE;QAC7B,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE;KACrD,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../src/next.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,YAAY,CAAC;AAG5D,KAAK,WAAW,GAAG,YAAY,GAAG;IAChC;;;;;;;OAOG;IACH,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAIF,iBAAS,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,gBAwDjD;AAED,OAAO,EAAE,KAAK,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;;AAEvD,wBAA4B"}
1
+ {"version":3,"file":"next.d.ts","sourceRoot":"","sources":["../src/next.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,YAAY,CAAC;AAE5D,KAAK,WAAW,GAAG,YAAY,GAAG;IAChC;;;;;;;OAOG;IACH,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAIF,iBAAS,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,gBAyEjD;AAED,OAAO,EAAE,KAAK,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC"}
package/dist/next.js CHANGED
@@ -1,13 +1,13 @@
1
1
  import path from 'node:path';
2
2
  import process from 'node:process';
3
3
  import { defineConfig } from 'oxlint';
4
+ import { extendConfig } from './config.js';
4
5
  import { reactConfig } from './react.js';
5
- import reactRefresh from 'eslint-plugin-react-refresh';
6
6
  const DEFAULT_OPTIONS = { uiPath: 'src/components/ui/' };
7
7
  function nextConfig(options) {
8
8
  const opts = { ...DEFAULT_OPTIONS, ...options };
9
- return defineConfig({
10
- extends: [reactConfig(options)],
9
+ const react = reactConfig(options);
10
+ return extendConfig(react, {
11
11
  plugins: ['nextjs'],
12
12
  rules: {
13
13
  'nextjs/google-font-display': 'warn',
@@ -31,11 +31,28 @@ function nextConfig(options) {
31
31
  'nextjs/no-head-import-in-document': 'error',
32
32
  'nextjs/no-script-component-in-head': 'error',
33
33
  // ignores warnings for special exports in page and layout files
34
- // https://github.com/ArnaudBarre/eslint-plugin-react-refresh?tab=readme-ov-file#next-config
35
34
  'react/only-export-components': [
36
35
  'warn',
37
36
  {
38
- allowExportNames: reactRefresh.configs.next.rules['react-refresh/only-export-components'][1]['allowExportNames'],
37
+ // https://github.com/ArnaudBarre/eslint-plugin-react-refresh/blob/main/src/index.ts
38
+ allowExportNames: [
39
+ // removed in next@16.0.0: https://nextjs.org/docs/app/api-reference/file-conventions/route-segment-config#version-history
40
+ // 'experimental_ppr',
41
+ 'dynamic',
42
+ 'dynamicParams',
43
+ 'revalidate',
44
+ 'fetchCache',
45
+ 'runtime',
46
+ 'preferredRegion',
47
+ 'maxDuration',
48
+ 'metadata',
49
+ 'generateMetadata',
50
+ 'viewport',
51
+ 'generateViewport',
52
+ 'generateImageMetadata',
53
+ 'generateSitemaps',
54
+ 'generateStaticParams',
55
+ ],
39
56
  },
40
57
  ],
41
58
  },
package/dist/next.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"next.js","sourceRoot":"","sources":["../src/next.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,YAAY,EAAqB,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAqB,WAAW,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,YAAY,MAAM,6BAA6B,CAAC;AAcvD,MAAM,eAAe,GAAgB,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;AAEtE,SAAS,UAAU,CAAC,OAA8B;IAChD,MAAM,IAAI,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,EAAE,CAAC;IAEhD,OAAO,YAAY,CAAC;QAClB,OAAO,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC/B,OAAO,EAAE,CAAC,QAAQ,CAAC;QACnB,KAAK,EAAE;YACL,4BAA4B,EAAE,MAAM;YACpC,+BAA+B,EAAE,MAAM;YACvC,2BAA2B,EAAE,MAAM;YACnC,kCAAkC,EAAE,MAAM;YAC1C,sDAAsD,EAAE,MAAM;YAC9D,oBAAoB,EAAE,MAAM;YAC5B,wBAAwB,EAAE,MAAM;YAChC,+BAA+B,EAAE,OAAO;YACxC,4BAA4B,EAAE,MAAM;YACpC,kCAAkC,EAAE,MAAM;YAC1C,wBAAwB,EAAE,OAAO;YACjC,kCAAkC,EAAE,MAAM;YAC1C,iBAAiB,EAAE,MAAM;YACzB,+BAA+B,EAAE,MAAM;YACvC,yBAAyB,EAAE,OAAO;YAClC,kCAAkC,EAAE,OAAO;YAC3C,mCAAmC,EAAE,OAAO;YAC5C,0BAA0B,EAAE,OAAO;YACnC,mCAAmC,EAAE,OAAO;YAC5C,oCAAoC,EAAE,OAAO;YAE7C,gEAAgE;YAChE,4FAA4F;YAC5F,8BAA8B,EAAE;gBAC9B,MAAM;gBACN;oBACE,gBAAgB,EAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAa,CACxD,sCAAsC,CACvC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC;iBACzB;aACF;SACF;QACD,cAAc,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC;QACnE,SAAS,EAAE;YACT,IAAI,CAAC,MAAM,KAAK,IAAI;gBAClB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC1B,CAAC,CAAC;oBACE,KAAK,EAAE;wBACL,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,mCAAmC,CAAC,UAAU,CACvF,IAAI,EACJ,GAAG,CACJ;qBACF;oBACD,KAAK,EAAE;wBACL,8BAA8B,EAAE,KAAK;qBACtC;iBACF;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EAAqB,YAAY,EAAE,UAAU,EAAE,CAAC;AAEvD,eAAe,UAAU,EAAE,CAAC"}
1
+ {"version":3,"file":"next.js","sourceRoot":"","sources":["../src/next.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,YAAY,EAAqB,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAqB,WAAW,EAAE,MAAM,YAAY,CAAC;AAc5D,MAAM,eAAe,GAAgB,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;AAEtE,SAAS,UAAU,CAAC,OAA8B;IAChD,MAAM,IAAI,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,OAAO,EAAE,CAAC;IAEhD,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEnC,OAAO,YAAY,CAAC,KAAK,EAAE;QACzB,OAAO,EAAE,CAAC,QAAQ,CAAC;QACnB,KAAK,EAAE;YACL,4BAA4B,EAAE,MAAM;YACpC,+BAA+B,EAAE,MAAM;YACvC,2BAA2B,EAAE,MAAM;YACnC,kCAAkC,EAAE,MAAM;YAC1C,sDAAsD,EAAE,MAAM;YAC9D,oBAAoB,EAAE,MAAM;YAC5B,wBAAwB,EAAE,MAAM;YAChC,+BAA+B,EAAE,OAAO;YACxC,4BAA4B,EAAE,MAAM;YACpC,kCAAkC,EAAE,MAAM;YAC1C,wBAAwB,EAAE,OAAO;YACjC,kCAAkC,EAAE,MAAM;YAC1C,iBAAiB,EAAE,MAAM;YACzB,+BAA+B,EAAE,MAAM;YACvC,yBAAyB,EAAE,OAAO;YAClC,kCAAkC,EAAE,OAAO;YAC3C,mCAAmC,EAAE,OAAO;YAC5C,0BAA0B,EAAE,OAAO;YACnC,mCAAmC,EAAE,OAAO;YAC5C,oCAAoC,EAAE,OAAO;YAE7C,gEAAgE;YAChE,8BAA8B,EAAE;gBAC9B,MAAM;gBACN;oBACE,oFAAoF;oBACpF,gBAAgB,EAAE;wBAChB,0HAA0H;wBAC1H,sBAAsB;wBAEtB,SAAS;wBACT,eAAe;wBACf,YAAY;wBACZ,YAAY;wBACZ,SAAS;wBACT,iBAAiB;wBACjB,aAAa;wBACb,UAAU;wBACV,kBAAkB;wBAClB,UAAU;wBACV,kBAAkB;wBAClB,uBAAuB;wBACvB,kBAAkB;wBAClB,sBAAsB;qBACvB;iBACF;aACF;SACF;QACD,cAAc,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,eAAe,CAAC;QACnE,SAAS,EAAE;YACT,IAAI,CAAC,MAAM,KAAK,IAAI;gBAClB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC1B,CAAC,CAAC;oBACE,KAAK,EAAE;wBACL,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,mCAAmC,CAAC,UAAU,CACvF,IAAI,EACJ,GAAG,CACJ;qBACF;oBACD,KAAK,EAAE;wBACL,8BAA8B,EAAE,KAAK;qBACtC;iBACF;SACN;KACF,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EAAqB,YAAY,EAAE,UAAU,EAAE,CAAC;AAEvD,eAAe,UAAU,EAAE,CAAC"}