@nx/next 16.3.0-beta.12 → 16.3.0-beta.13

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/next",
3
- "version": "16.3.0-beta.12",
3
+ "version": "16.3.0-beta.13",
4
4
  "private": false,
5
5
  "description": "The Next.js plugin for Nx contains executors and generators for managing Next.js applications and libraries within an Nx workspace. It provides:\n\n\n- Scaffolding for creating, building, serving, linting, and testing Next.js applications.\n\n- Integration with building, serving, and exporting a Next.js application.\n\n- Integration with React libraries within the workspace. \n\nWhen using Next.js in Nx, you get the out-of-the-box support for TypeScript, Cypress, and Jest. No need to configure anything: watch mode, source maps, and typings just work.",
6
6
  "repository": {
@@ -35,13 +35,13 @@
35
35
  },
36
36
  "dependencies": {
37
37
  "@babel/plugin-proposal-decorators": "^7.14.5",
38
- "@nrwl/next": "16.3.0-beta.12",
39
- "@nx/devkit": "16.3.0-beta.12",
40
- "@nx/js": "16.3.0-beta.12",
41
- "@nx/linter": "16.3.0-beta.12",
42
- "@nx/react": "16.3.0-beta.12",
43
- "@nx/web": "16.3.0-beta.12",
44
- "@nx/workspace": "16.3.0-beta.12",
38
+ "@nrwl/next": "16.3.0-beta.13",
39
+ "@nx/devkit": "16.3.0-beta.13",
40
+ "@nx/js": "16.3.0-beta.13",
41
+ "@nx/linter": "16.3.0-beta.13",
42
+ "@nx/react": "16.3.0-beta.13",
43
+ "@nx/web": "16.3.0-beta.13",
44
+ "@nx/workspace": "16.3.0-beta.13",
45
45
  "@svgr/webpack": "^8.0.1",
46
46
  "chalk": "^4.1.0",
47
47
  "copy-webpack-plugin": "^10.2.4",
@@ -61,5 +61,5 @@
61
61
  "access": "public"
62
62
  },
63
63
  "types": "./index.d.ts",
64
- "gitHead": "b12586551b2c2beed7ad3365d3e9691c47065f15"
64
+ "gitHead": "7dc91518378440890d4eb78b6cc8fa765bb79ba9"
65
65
  }
@@ -28,7 +28,10 @@ function applicationGenerator(host, schema) {
28
28
  const lintTask = yield (0, add_linting_1.addLinting)(host, options);
29
29
  (0, update_jest_config_1.updateJestConfig)(host, options);
30
30
  (0, update_cypress_tsconfig_1.updateCypressTsConfig)(host, options);
31
- const styledTask = (0, styles_1.addStyleDependencies)(host, options.style);
31
+ const styledTask = (0, styles_1.addStyleDependencies)(host, {
32
+ style: options.style,
33
+ swc: !host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, '.babelrc')),
34
+ });
32
35
  (0, set_defaults_1.setDefaults)(host, options);
33
36
  if (options.customServer) {
34
37
  yield (0, custom_server_1.customServerGenerator)(host, {
@@ -1 +1 @@
1
- {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,uCAKoB;AAEpB,+DAA2D;AAE3D,mDAA+C;AAC/C,6CAAyC;AACzC,mDAA+C;AAC/C,6EAAwE;AACxE,qDAAiD;AACjD,iEAA4D;AAC5D,uCAAiD;AACjD,+CAA0D;AAC1D,mDAA+C;AAC/C,kEAAuE;AACvE,2EAAsE;AACtE,yEAAoE;AAEpE,SAAsB,oBAAoB,CAAC,IAAU,EAAE,MAAc;;QACnE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,6CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpC,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCACxC,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAC7D,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,IAAI,OAAO,CAAC,YAAY,EAAE;YACxB,MAAM,IAAA,qCAAqB,EAAC,IAAI,EAAE;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;aACtC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EACrB,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,CAAC;IACJ,CAAC;CAAA;AArCD,oDAqCC;AAEY,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
1
+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/application/application.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AAEpB,+DAA2D;AAE3D,mDAA+C;AAC/C,6CAAyC;AACzC,mDAA+C;AAC/C,6EAAwE;AACxE,qDAAiD;AACjD,iEAA4D;AAC5D,uCAAiD;AACjD,+CAA0D;AAC1D,mDAA+C;AAC/C,kEAAuE;AACvE,2EAAsE;AACtE,yEAAoE;AAEpE,SAAsB,oBAAoB,CAAC,IAAU,EAAE,MAAc;;QACnE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAA,6CAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpC,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCACxC,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,IAAA,iDAAsB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtC,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAO,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAU,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChC,IAAA,+CAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAC5C,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;SACzE,CAAC,CAAC;QACH,IAAA,0BAAW,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE3B,IAAI,OAAO,CAAC,YAAY,EAAE;YACxB,MAAM,IAAA,qCAAqB,EAAC,IAAI,EAAE;gBAChC,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;aACtC,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EACrB,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,UAAU,CACX,CAAC;IACJ,CAAC;CAAA;AAxCD,oDAwCC;AAEY,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
@@ -0,0 +1,21 @@
1
+ import './global.<%= stylesExt %>';
2
+ import { StyledComponentsRegistry } from './registry';
3
+
4
+ export const metadata = {
5
+ title: 'Welcome to demo2',
6
+ description: 'Generated by create-nx-workspace',
7
+ };
8
+
9
+ export default function RootLayout({
10
+ children,
11
+ }: {
12
+ children: React.ReactNode;
13
+ }) {
14
+ return (
15
+ <html lang="en">
16
+ <body>
17
+ <StyledComponentsRegistry>{children}</StyledComponentsRegistry>
18
+ </body>
19
+ </html>
20
+ );
21
+ }
@@ -0,0 +1,33 @@
1
+ 'use client';
2
+
3
+ import React, { useState } from 'react';
4
+ import { useServerInsertedHTML } from 'next/navigation';
5
+ import { ServerStyleSheet, StyleSheetManager } from 'styled-components';
6
+
7
+ export function StyledComponentsRegistry({
8
+ children,
9
+ }: {
10
+ children: React.ReactNode;
11
+ }) {
12
+ // Only create stylesheet once with lazy initial state
13
+ // x-ref: https://reactjs.org/docs/hooks-reference.html#lazy-initial-state
14
+ const [styledComponentsStyleSheet] = useState(() => new ServerStyleSheet());
15
+
16
+ useServerInsertedHTML(() => {
17
+ const styles = styledComponentsStyleSheet.getStyleElement();
18
+
19
+ // Types are out of date, clearTag is not defined.
20
+ // See: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/65021
21
+ (styledComponentsStyleSheet.instance as any).clearTag();
22
+
23
+ return <>{styles}</>;
24
+ });
25
+
26
+ if (typeof window !== 'undefined') return <>{children}</>;
27
+
28
+ return (
29
+ <StyleSheetManager sheet={styledComponentsStyleSheet.instance}>
30
+ {children}
31
+ </StyleSheetManager>
32
+ );
33
+ }
@@ -0,0 +1,16 @@
1
+ import './global.<%= stylesExt %>';
2
+ import { StyledJsxRegistry } from './registry';
3
+
4
+ export default function RootLayout({
5
+ children,
6
+ }: {
7
+ children: React.ReactNode;
8
+ }) {
9
+ return (
10
+ <html>
11
+ <body>
12
+ <StyledJsxRegistry>{children}</StyledJsxRegistry>
13
+ </body>
14
+ </html>
15
+ );
16
+ }
@@ -0,0 +1,23 @@
1
+ 'use client';
2
+
3
+ import React, { useState } from 'react';
4
+ import { useServerInsertedHTML } from 'next/navigation';
5
+ import { StyleRegistry, createStyleRegistry } from 'styled-jsx';
6
+
7
+ export function StyledJsxRegistry({
8
+ children,
9
+ }: {
10
+ children: React.ReactNode;
11
+ }) {
12
+ // Only create stylesheet once with lazy initial state
13
+ // x-ref: https://reactjs.org/docs/hooks-reference.html#lazy-initial-state
14
+ const [jsxStyleRegistry] = useState(() => createStyleRegistry());
15
+
16
+ useServerInsertedHTML(() => {
17
+ const styles = jsxStyleRegistry.styles();
18
+ jsxStyleRegistry.flush();
19
+ return <>{styles}</>;
20
+ });
21
+
22
+ return <StyleRegistry registry={jsxStyleRegistry}>{children}</StyleRegistry>;
23
+ }
@@ -62,6 +62,17 @@ const nextConfig = {
62
62
  // See: https://github.com/gregberge/svgr
63
63
  svgr: false,
64
64
  },
65
+ <% if (style === 'styled-components') { %>
66
+ compiler: {
67
+ // For other options, see https://styled-components.com/docs/tooling#babel-plugin
68
+ styledComponents: true,
69
+ },
70
+ <% } else if (style === '@emotion/styled') { %>
71
+ compiler: {
72
+ // For other options, see https://nextjs.org/docs/architecture/nextjs-compiler#emotion
73
+ emotion: true,
74
+ },
75
+ <% } %>
65
76
  };
66
77
 
67
78
  const plugins = [
@@ -18,7 +18,17 @@ function createApplicationFiles(host, options) {
18
18
  (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/common'), options.appProjectRoot, templateVariables);
19
19
  if (options.appDir) {
20
20
  (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app'), (0, path_1.join)(options.appProjectRoot, 'app'), templateVariables);
21
+ // RSC is not possible to unit test without extra helpers for data fetching. Leaving it to the user to figure out.
21
22
  host.delete((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'specs', `index.spec.${options.js ? 'jsx' : 'tsx'}`));
23
+ if (options.style === 'styled-components') {
24
+ (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-styled-components'), (0, path_1.join)(options.appProjectRoot, 'app'), templateVariables);
25
+ }
26
+ else if (options.style === 'styled-jsx') {
27
+ (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-styled-jsx'), (0, path_1.join)(options.appProjectRoot, 'app'), templateVariables);
28
+ }
29
+ else {
30
+ (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/app-default-layout'), (0, path_1.join)(options.appProjectRoot, 'app'), templateVariables);
31
+ }
22
32
  }
23
33
  else {
24
34
  (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, '../files/pages'), (0, path_1.join)(options.appProjectRoot, 'pages'), templateVariables);
@@ -1 +1 @@
1
- {"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create-application-files.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/create-application-files.ts"],"names":[],"mappings":";;;;AAAA,+BAA4B;AAC5B,uCASoB;AACpB,+BAAuD;AAGvD,yFAG4C;AAE5C,SAAgB,sBAAsB,CAAC,IAAU,EAAE,OAAyB;IAC1E,MAAM,cAAc,GAAG,IAAA,uBAAe,EAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/D,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,cAAc,EACd,OAAO,CAAC,cAAc,EACtB,qBAAqB,CACtB,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,0BAAiB,EAC1C,cAAc,EACd,OAAO,CAAC,UAAU,EAClB,qBAAqB,CACtB,CAAC;IACF,MAAM,iBAAiB,iDAClB,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,GACnB,OAAO,KACV,GAAG,EAAE,GAAG,EACR,IAAI,EAAE,EAAE,EACR,cAAc;QACd,iBAAiB;QACjB,kBAAkB,EAClB,gBAAgB,EAAE,IAAA,kCAA6B,EAC7C,IAAI,EACJ,OAAO,CAAC,cAAc,CACvB,EACD,UAAU,EAAE,IAAA,+CAAY,EAAC,OAAO,CAAC,IAAI,CAAC,EACtC,YAAY,EAAE,IAAA,mDAAgB,GAAE,EAChC,gBAAgB,EAAE,UAAU,EAE5B,SAAS,EACP,OAAO,CAAC,KAAK,KAAK,MAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM;YAClD,CAAC,CAAC,OAAO,CAAC,KAAK;YACf,CAAC,CAAC,KAAK,GACZ,CAAC;IAEF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,iBAAiB,CAAC,EAClC,OAAO,CAAC,cAAc,EACtB,iBAAiB,CAClB,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,cAAc,CAAC,EAC/B,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EACnC,iBAAiB,CAClB,CAAC;QAEF,kHAAkH;QAClH,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,cAAc,EACtB,OAAO,EACP,cAAc,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAC3C,CACF,CAAC;QAEF,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE;YACzC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,gCAAgC,CAAC,EACjD,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EACnC,iBAAiB,CAClB,CAAC;SACH;aAAM,IAAI,OAAO,CAAC,KAAK,KAAK,YAAY,EAAE;YACzC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,yBAAyB,CAAC,EAC1C,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EACnC,iBAAiB,CAClB,CAAC;SACH;aAAM;YACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,6BAA6B,CAAC,EAC9C,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EACnC,iBAAiB,CAClB,CAAC;SACH;KACF;SAAM;QACL,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,WAAI,EAAC,SAAS,EAAE,gBAAgB,CAAC,EACjC,IAAA,WAAI,EAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,EACrC,iBAAiB,CAClB,CAAC;KACH;IAED,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,IAAA,mBAAU,EAAC,IAAI,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,EAAE;YAC9C,MAAM,OAAO,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;YAEhD,IAAI,EAAE,OAAO,EAAE,CAAC,KAAqB,IAAI,EAApB,WAAW,kBAAK,IAAI,EAArC,WAA8B,CAAO,CAAC;YAE1C,gFAAgF;YAChF,0DAA0D;YAC1D,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;YAElC,WAAW,mCACN,mBAAU,KACb,eAAe,kCACV,WAAW,CAAC,eAAe,GAC3B,OAAO,CAAC,eAAe,GAE5B,OAAO,EAAE;oBACP,GAAG,IAAI,GAAG,CAAC;wBACT,GAAG,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC;wBAC9B,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;qBAC3B,CAAC;iBACH,EACD,OAAO,EAAE;oBACP,GAAG,IAAI,GAAG,CAAC;wBACT,GAAG,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,CAAC;wBAC9B,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;wBAC1B,YAAY;wBACZ,QAAQ,OAAO,CAAC,IAAI,OAAO;qBAC5B,CAAC;iBACH,GACF,CAAC;YACF,OAAO,WAAW,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;KACpD;IAED,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,UAAU,OAAO,CAAC,QAAQ,WAAW,CAAC,CAAC;KAC7E;IAED,sDAAsD;IACtD,qFAAqF;IACrF,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK,EAAE;QACzB,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,WAAW,CAAC,CAAC;KACnD;IAED,IAAI,OAAO,CAAC,YAAY,EAAE;QACxB,IAAI,OAAO,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,oBAAoB,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;SAC3E;aAAM;YACL,IAAI,CAAC,MAAM,CACT,GAAG,OAAO,CAAC,cAAc,UAAU,OAAO,CAAC,QAAQ,WAAW,OAAO,CAAC,KAAK,EAAE,CAC9E,CAAC;SACH;KACF;IAED,IAAI,OAAO,CAAC,KAAK,KAAK,mBAAmB,EAAE;QACzC,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,sBAAsB,CAAC,CAAC;KAC9D;IAED,IAAI,OAAO,CAAC,EAAE,EAAE;QACd,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,aAAa,CAAC,CAAC;QACpD,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,cAAc,gBAAgB,CAAC,CAAC;KACxD;AACH,CAAC;AA3JD,wDA2JC"}
@@ -4,7 +4,7 @@ exports.showPossibleWarnings = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  function showPossibleWarnings(tree, options) {
6
6
  if (options.style === '@emotion/styled' && options.appDir) {
7
- devkit_1.logger.warn(`Emotion may not work with the App Router. See: https://beta.nextjs.org/docs/styling/css-in-js`);
7
+ devkit_1.logger.warn(`Emotion may not work with the App Router. See: https://nextjs.org/docs/app/building-your-application/styling/css-in-js`);
8
8
  }
9
9
  }
10
10
  exports.showPossibleWarnings = showPossibleWarnings;
@@ -1 +1 @@
1
- {"version":3,"file":"show-possible-warnings.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/show-possible-warnings.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAG1C,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACxE,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE;QACzD,eAAM,CAAC,IAAI,CACT,+FAA+F,CAChG,CAAC;KACH;AACH,CAAC;AAND,oDAMC"}
1
+ {"version":3,"file":"show-possible-warnings.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/show-possible-warnings.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAG1C,SAAgB,oBAAoB,CAAC,IAAU,EAAE,OAAyB;IACxE,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,IAAI,OAAO,CAAC,MAAM,EAAE;QACzD,eAAM,CAAC,IAAI,CACT,wHAAwH,CACzH,CAAC;KACH;AACH,CAAC;AAND,oDAMC"}
@@ -20,8 +20,12 @@ function getDirectory(host, options) {
20
20
  */
21
21
  function componentGenerator(host, options) {
22
22
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
23
+ const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
23
24
  const componentInstall = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { directory: getDirectory(host, options), classComponent: false, routing: false, skipFormat: true }));
24
- const styledInstall = (0, styles_1.addStyleDependencies)(host, options.style);
25
+ const styledInstall = (0, styles_1.addStyleDependencies)(host, {
26
+ style: options.style,
27
+ swc: !host.exists((0, devkit_1.joinPathFragments)(project.root, '.babelrc')),
28
+ });
25
29
  if (!options.skipFormat) {
26
30
  yield (0, devkit_1.formatFiles)(host);
27
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AAEpB,qCAA0E;AAE1E,+CAA0D;AAa1D,SAAS,YAAY,CAAC,IAAU,EAAE,OAAe;IAC/C,MAAM,SAAS,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACpC,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC;IAE/D,OAAO,OAAO,CAAC,SAAS;QACtB,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,WAAW,KAAK,aAAa;YAC/B,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,SAAsB,kBAAkB,CAAC,IAAU,EAAE,OAAe;;QAClE,MAAM,gBAAgB,GAAG,MAAM,IAAA,0BAAuB,EAAC,IAAI,kCACtD,OAAO,KACV,SAAS,EAAE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,EACtC,cAAc,EAAE,KAAK,EACrB,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,aAAa,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAEhE,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC3D,CAAC;CAAA;AAhBD,gDAgBC;AAED,kBAAe,kBAAkB,CAAC;AACrB,QAAA,kBAAkB,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC"}
1
+ {"version":3,"file":"component.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/component/component.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AAEpB,qCAA0E;AAE1E,+CAA0D;AAa1D,SAAS,YAAY,CAAC,IAAU,EAAE,OAAe;IAC/C,MAAM,SAAS,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IACpC,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC;IAE/D,OAAO,OAAO,CAAC,SAAS;QACtB,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,WAAW,KAAK,aAAa;YAC/B,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,SAAS,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,SAAsB,kBAAkB,CAAC,IAAU,EAAE,OAAe;;QAClE,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,gBAAgB,GAAG,MAAM,IAAA,0BAAuB,EAAC,IAAI,kCACtD,OAAO,KACV,SAAS,EAAE,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,EACtC,cAAc,EAAE,KAAK,EACrB,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,aAAa,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAC/C,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SAC/D,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAC3D,CAAC;CAAA;AApBD,gDAoBC;AAED,kBAAe,kBAAkB,CAAC;AACrB,QAAA,kBAAkB,GAAG,IAAA,2BAAkB,EAAC,kBAAkB,CAAC,CAAC"}
@@ -12,9 +12,13 @@ const styles_1 = require("../../utils/styles");
12
12
  */
13
13
  function pageGenerator(host, options) {
14
14
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
15
+ const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
15
16
  const directory = options.directory ? `pages/${options.directory}` : 'pages';
16
17
  const componentTask = yield (0, react_1.componentGenerator)(host, Object.assign(Object.assign({}, options), { directory, pascalCaseFiles: false, export: false, classComponent: false, routing: false, skipTests: !options.withTests, flat: !!options.flat, fileName: !options.flat ? 'index' : undefined, skipFormat: true }));
17
- const styledTask = (0, styles_1.addStyleDependencies)(host, options.style);
18
+ const styledTask = (0, styles_1.addStyleDependencies)(host, {
19
+ style: options.style,
20
+ swc: !host.exists((0, devkit_1.joinPathFragments)(project.root, '.babelrc')),
21
+ });
18
22
  if (!options.skipFormat) {
19
23
  yield (0, devkit_1.formatFiles)(host);
20
24
  }
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/page/page.ts"],"names":[],"mappings":";;;;AAAA,qCAA0E;AAC1E,uCAKoB;AAEpB,+CAA0D;AAG1D;;;;GAIG;AACH,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAe;;QAC7D,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC7E,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAuB,EAAC,IAAI,kCACnD,OAAO,KACV,SAAS,EACT,eAAe,EAAE,KAAK,EACtB,MAAM,EAAE,KAAK,EACb,cAAc,EAAE,KAAK,EACrB,OAAO,EAAE,KAAK,EACd,SAAS,EAAE,CAAC,OAAO,CAAC,SAAS,EAC7B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EACpB,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAC7C,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAE7D,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;CAAA;AAtBD,sCAsBC;AAED,kBAAe,aAAa,CAAC;AAChB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/page/page.ts"],"names":[],"mappings":";;;;AAAA,qCAA0E;AAC1E,uCAOoB;AAEpB,+CAA0D;AAG1D;;;;GAIG;AACH,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAe;;QAC7D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC7E,MAAM,aAAa,GAAG,MAAM,IAAA,0BAAuB,EAAC,IAAI,kCACnD,OAAO,KACV,SAAS,EACT,eAAe,EAAE,KAAK,EACtB,MAAM,EAAE,KAAK,EACb,cAAc,EAAE,KAAK,EACrB,OAAO,EAAE,KAAK,EACd,SAAS,EAAE,CAAC,OAAO,CAAC,SAAS,EAC7B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EACpB,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAC7C,UAAU,EAAE,IAAI,IAChB,CAAC;QAEH,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAC5C,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;SAC/D,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,yBAAgB,EAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;CAAA;AA1BD,sCA0BC;AAED,kBAAe,aAAa,CAAC;AAChB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { GeneratorCallback, Tree } from '@nx/devkit';
2
- export declare const NEXT_SPECIFIC_STYLE_DEPENDENCIES: {
2
+ export declare const nextSpecificStyleDependenciesBabel: {
3
3
  'styled-components': {
4
4
  dependencies: import("../../../../build/packages/react/src/utils/dependencies").DependencyEntries;
5
5
  devDependencies: {
@@ -37,4 +37,45 @@ export declare const NEXT_SPECIFIC_STYLE_DEPENDENCIES: {
37
37
  devDependencies: {};
38
38
  };
39
39
  };
40
- export declare function addStyleDependencies(host: Tree, style: string): GeneratorCallback;
40
+ export declare const nextSpecificStyleDependenciesSwc: {
41
+ 'styled-components': {
42
+ dependencies: import("../../../../build/packages/react/src/utils/dependencies").DependencyEntries;
43
+ devDependencies: {
44
+ 'babel-plugin-styled-components': string;
45
+ };
46
+ };
47
+ '@emotion/styled': {
48
+ dependencies: {
49
+ '@emotion/server': string;
50
+ };
51
+ devDependencies: import("../../../../build/packages/react/src/utils/dependencies").DependencyEntries;
52
+ };
53
+ css: {
54
+ dependencies: {};
55
+ devDependencies: {};
56
+ };
57
+ scss: {
58
+ dependencies: {};
59
+ devDependencies: {
60
+ sass: string;
61
+ };
62
+ };
63
+ less: {
64
+ dependencies: {};
65
+ devDependencies: {
66
+ less: string;
67
+ 'less-loader': string;
68
+ };
69
+ };
70
+ styl: {
71
+ dependencies: {
72
+ stylus: string;
73
+ 'stylus-loader': string;
74
+ };
75
+ devDependencies: {};
76
+ };
77
+ };
78
+ export declare function addStyleDependencies(host: Tree, options: {
79
+ style?: string;
80
+ swc?: boolean;
81
+ }): GeneratorCallback;
@@ -1,19 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.addStyleDependencies = exports.NEXT_SPECIFIC_STYLE_DEPENDENCIES = void 0;
3
+ exports.addStyleDependencies = exports.nextSpecificStyleDependenciesSwc = exports.nextSpecificStyleDependenciesBabel = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const versions_1 = require("@nx/react/src/utils/versions");
6
6
  const styled_1 = require("@nx/react/src/utils/styled");
7
7
  const versions_2 = require("./versions");
8
- exports.NEXT_SPECIFIC_STYLE_DEPENDENCIES = {
9
- 'styled-components': {
10
- dependencies: styled_1.CSS_IN_JS_DEPENDENCIES['styled-components'].dependencies,
11
- devDependencies: Object.assign(Object.assign({}, styled_1.CSS_IN_JS_DEPENDENCIES['styled-components'].devDependencies), { 'babel-plugin-styled-components': versions_2.babelPluginStyledComponentsVersion }),
12
- },
13
- '@emotion/styled': {
14
- dependencies: Object.assign(Object.assign({}, styled_1.CSS_IN_JS_DEPENDENCIES['@emotion/styled'].dependencies), { '@emotion/server': versions_2.emotionServerVersion }),
15
- devDependencies: styled_1.CSS_IN_JS_DEPENDENCIES['@emotion/styled'].devDependencies,
16
- },
8
+ const nextSpecificStyleDependenciesCommon = {
17
9
  css: {
18
10
  dependencies: {},
19
11
  devDependencies: {},
@@ -37,14 +29,31 @@ exports.NEXT_SPECIFIC_STYLE_DEPENDENCIES = {
37
29
  devDependencies: {},
38
30
  },
39
31
  };
40
- function addStyleDependencies(host, style) {
41
- const extraDependencies = exports.NEXT_SPECIFIC_STYLE_DEPENDENCIES[style];
32
+ exports.nextSpecificStyleDependenciesBabel = Object.assign(Object.assign({}, nextSpecificStyleDependenciesCommon), { 'styled-components': {
33
+ dependencies: styled_1.cssInJsDependenciesBabel['styled-components'].dependencies,
34
+ devDependencies: Object.assign(Object.assign({}, styled_1.cssInJsDependenciesBabel['styled-components'].devDependencies), { 'babel-plugin-styled-components': versions_2.babelPluginStyledComponentsVersion }),
35
+ }, '@emotion/styled': {
36
+ dependencies: Object.assign(Object.assign({}, styled_1.cssInJsDependenciesBabel['@emotion/styled'].dependencies), { '@emotion/server': versions_2.emotionServerVersion }),
37
+ devDependencies: styled_1.cssInJsDependenciesBabel['@emotion/styled'].devDependencies,
38
+ } });
39
+ exports.nextSpecificStyleDependenciesSwc = Object.assign(Object.assign({}, nextSpecificStyleDependenciesCommon), { 'styled-components': {
40
+ dependencies: styled_1.cssInJsDependenciesSwc['styled-components'].dependencies,
41
+ devDependencies: Object.assign(Object.assign({}, styled_1.cssInJsDependenciesSwc['styled-components'].devDependencies), { 'babel-plugin-styled-components': versions_2.babelPluginStyledComponentsVersion }),
42
+ }, '@emotion/styled': {
43
+ dependencies: Object.assign(Object.assign({}, styled_1.cssInJsDependenciesSwc['@emotion/styled'].dependencies), { '@emotion/server': versions_2.emotionServerVersion }),
44
+ devDependencies: styled_1.cssInJsDependenciesSwc['@emotion/styled'].devDependencies,
45
+ } });
46
+ function addStyleDependencies(host, options) {
47
+ const extraDependencies = options.swc
48
+ ? exports.nextSpecificStyleDependenciesSwc[options.style]
49
+ : exports.nextSpecificStyleDependenciesBabel[options.style];
42
50
  if (!extraDependencies)
43
51
  return () => { };
44
52
  const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, extraDependencies.dependencies, extraDependencies.devDependencies);
45
53
  // @zeit/next-less & @zeit/next-stylus internal configuration is working only
46
54
  // for specific CSS loader version, causing PNPM resolution to fail.
47
- if (host.exists('pnpm-lock.yaml') && (style === 'less' || style === 'styl')) {
55
+ if (host.exists('pnpm-lock.yaml') &&
56
+ (options.style === 'less' || options.style === 'styl')) {
48
57
  (0, devkit_1.updateJson)(host, `package.json`, (json) => {
49
58
  json.resolutions = Object.assign(Object.assign({}, json.resolutions), { 'css-loader': '1.0.1' });
50
59
  return json;
@@ -1 +1 @@
1
- {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/styles.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,2DAA0E;AAC1E,uDAAoE;AACpE,yCAMoB;AAEP,QAAA,gCAAgC,GAAG;IAC9C,mBAAmB,EAAE;QACnB,YAAY,EAAE,+BAAsB,CAAC,mBAAmB,CAAC,CAAC,YAAY;QACtE,eAAe,kCACV,+BAAsB,CAAC,mBAAmB,CAAC,CAAC,eAAe,KAC9D,gCAAgC,EAAE,6CAAkC,GACrE;KACF;IACD,iBAAiB,EAAE;QACjB,YAAY,kCACP,+BAAsB,CAAC,iBAAiB,CAAC,CAAC,YAAY,KACzD,iBAAiB,EAAE,+BAAoB,GACxC;QACD,eAAe,EAAE,+BAAsB,CAAC,iBAAiB,CAAC,CAAC,eAAe;KAC3E;IACD,GAAG,EAAE;QACH,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;KACpB;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE,IAAI,EAAE,sBAAW,EAAE;KACvC;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE;YACf,IAAI,EAAE,sBAAW;YACjB,aAAa,EAAE,qBAAU;SAC1B;KACF;IACD,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,MAAM,EAAE,wBAAa;YACrB,eAAe,EAAE,uBAAY;SAC9B;QACD,eAAe,EAAE,EAAE;KACpB;CACF,CAAC;AAEF,SAAgB,oBAAoB,CAClC,IAAU,EACV,KAAa;IAEb,MAAM,iBAAiB,GAAG,wCAAgC,CAAC,KAAK,CAAC,CAAC;IAElE,IAAI,CAAC,iBAAiB;QAAE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IAExC,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ,iBAAiB,CAAC,YAAY,EAC9B,iBAAiB,CAAC,eAAe,CAClC,CAAC;IAEF,6EAA6E;IAC7E,oEAAoE;IACpE,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,KAAK,MAAM,IAAI,KAAK,KAAK,MAAM,CAAC,EAAE;QAC3E,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,WAAW,mCAAQ,IAAI,CAAC,WAAW,KAAE,YAAY,EAAE,OAAO,GAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAxBD,oDAwBC"}
1
+ {"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/styles.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,2DAA0E;AAC1E,uDAGoC;AACpC,yCAMoB;AAEpB,MAAM,mCAAmC,GAAG;IAC1C,GAAG,EAAE;QACH,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;KACpB;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE,IAAI,EAAE,sBAAW,EAAE;KACvC;IACD,IAAI,EAAE;QACJ,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE;YACf,IAAI,EAAE,sBAAW;YACjB,aAAa,EAAE,qBAAU;SAC1B;KACF;IACD,IAAI,EAAE;QACJ,YAAY,EAAE;YACZ,MAAM,EAAE,wBAAa;YACrB,eAAe,EAAE,uBAAY;SAC9B;QACD,eAAe,EAAE,EAAE;KACpB;CACF,CAAC;AAEW,QAAA,kCAAkC,mCAC1C,mCAAmC,KACtC,mBAAmB,EAAE;QACnB,YAAY,EAAE,iCAAwB,CAAC,mBAAmB,CAAC,CAAC,YAAY;QACxE,eAAe,kCACV,iCAAwB,CAAC,mBAAmB,CAAC,CAAC,eAAe,KAChE,gCAAgC,EAAE,6CAAkC,GACrE;KACF,EACD,iBAAiB,EAAE;QACjB,YAAY,kCACP,iCAAwB,CAAC,iBAAiB,CAAC,CAAC,YAAY,KAC3D,iBAAiB,EAAE,+BAAoB,GACxC;QACD,eAAe,EACb,iCAAwB,CAAC,iBAAiB,CAAC,CAAC,eAAe;KAC9D,IACD;AAEW,QAAA,gCAAgC,mCACxC,mCAAmC,KACtC,mBAAmB,EAAE;QACnB,YAAY,EAAE,+BAAsB,CAAC,mBAAmB,CAAC,CAAC,YAAY;QACtE,eAAe,kCACV,+BAAsB,CAAC,mBAAmB,CAAC,CAAC,eAAe,KAC9D,gCAAgC,EAAE,6CAAkC,GACrE;KACF,EACD,iBAAiB,EAAE;QACjB,YAAY,kCACP,+BAAsB,CAAC,iBAAiB,CAAC,CAAC,YAAY,KACzD,iBAAiB,EAAE,+BAAoB,GACxC;QACD,eAAe,EAAE,+BAAsB,CAAC,iBAAiB,CAAC,CAAC,eAAe;KAC3E,IACD;AAEF,SAAgB,oBAAoB,CAClC,IAAU,EACV,OAA0C;IAE1C,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG;QACnC,CAAC,CAAC,wCAAgC,CAAC,OAAO,CAAC,KAAK,CAAC;QACjD,CAAC,CAAC,0CAAkC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEtD,IAAI,CAAC,iBAAiB;QAAE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;IAExC,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ,iBAAiB,CAAC,YAAY,EAC9B,iBAAiB,CAAC,eAAe,CAClC,CAAC;IAEF,6EAA6E;IAC7E,oEAAoE;IACpE,IACE,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAC7B,CAAC,OAAO,CAAC,KAAK,KAAK,MAAM,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,CAAC,EACtD;QACA,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,WAAW,mCAAQ,IAAI,CAAC,WAAW,KAAE,YAAY,EAAE,OAAO,GAAE,CAAC;YAClE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AA7BD,oDA6BC"}