@nx/next 16.3.0-beta.9 → 16.3.1
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/migrations.json +6 -0
- package/package.json +9 -9
- package/plugins/with-nx.d.ts +1 -0
- package/plugins/with-nx.js +5 -3
- package/plugins/with-nx.js.map +1 -1
- package/src/executors/build/build.impl.js +6 -6
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/executors/build/lib/create-next-config-file.js +6 -5
- package/src/executors/build/lib/create-next-config-file.js.map +1 -1
- package/src/executors/build/schema.json +1 -6
- package/src/executors/export/export.impl.js +2 -3
- package/src/executors/export/export.impl.js.map +1 -1
- package/src/executors/server/custom-server.impl.js +2 -2
- package/src/executors/server/custom-server.impl.js.map +1 -1
- package/src/executors/server/server.impl.js +3 -3
- package/src/executors/server/server.impl.js.map +1 -1
- package/src/generators/application/application.js +4 -1
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/app-styled-components/layout.tsx__tmpl__ +21 -0
- package/src/generators/application/files/app-styled-components/registry.tsx__tmpl__ +33 -0
- package/src/generators/application/files/app-styled-jsx/layout.tsx__tmpl__ +16 -0
- package/src/generators/application/files/app-styled-jsx/registry.tsx__tmpl__ +23 -0
- package/src/generators/application/files/common/next.config.js__tmpl__ +11 -0
- package/src/generators/application/lib/add-project.js +0 -1
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/create-application-files.js +10 -0
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/show-possible-warnings.js +1 -1
- package/src/generators/application/lib/show-possible-warnings.js.map +1 -1
- package/src/generators/component/component.js +5 -1
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/custom-server/files/server/main.ts__tmpl__ +1 -1
- package/src/generators/custom-server/files/tsconfig.server.json__tmpl__ +1 -1
- package/src/generators/page/page.js +5 -1
- package/src/generators/page/page.js.map +1 -1
- package/src/migrations/update-16-3-0/remove-root-build-option.d.ts +2 -0
- package/src/migrations/update-16-3-0/remove-root-build-option.js +21 -0
- package/src/migrations/update-16-3-0/remove-root-build-option.js.map +1 -0
- package/src/utils/styles.d.ts +43 -2
- package/src/utils/styles.js +22 -13
- package/src/utils/styles.js.map +1 -1
- package/src/utils/types.d.ts +0 -1
- /package/src/generators/application/files/{app → app-default-layout}/layout.tsx__tmpl__ +0 -0
package/migrations.json
CHANGED
|
@@ -65,6 +65,12 @@
|
|
|
65
65
|
"version": "16.0.0-beta.1",
|
|
66
66
|
"description": "Replace @nrwl/next with @nx/next",
|
|
67
67
|
"implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
|
|
68
|
+
},
|
|
69
|
+
"update-16-3-0-remove-root-build-option": {
|
|
70
|
+
"cli": "nx",
|
|
71
|
+
"version": "16.3.0-beta.9",
|
|
72
|
+
"description": "Remove root build option from project configurations since it is not needed.",
|
|
73
|
+
"implementation": "./src/migrations/update-16-3-0/remove-root-build-option"
|
|
68
74
|
}
|
|
69
75
|
},
|
|
70
76
|
"packageJsonUpdates": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/next",
|
|
3
|
-
"version": "16.3.
|
|
3
|
+
"version": "16.3.1",
|
|
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.
|
|
39
|
-
"@nx/devkit": "16.3.
|
|
40
|
-
"@nx/js": "16.3.
|
|
41
|
-
"@nx/linter": "16.3.
|
|
42
|
-
"@nx/react": "16.3.
|
|
43
|
-
"@nx/web": "16.3.
|
|
44
|
-
"@nx/workspace": "16.3.
|
|
38
|
+
"@nrwl/next": "16.3.1",
|
|
39
|
+
"@nx/devkit": "16.3.1",
|
|
40
|
+
"@nx/js": "16.3.1",
|
|
41
|
+
"@nx/linter": "16.3.1",
|
|
42
|
+
"@nx/react": "16.3.1",
|
|
43
|
+
"@nx/web": "16.3.1",
|
|
44
|
+
"@nx/workspace": "16.3.1",
|
|
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": "
|
|
64
|
+
"gitHead": "29dc4bd6d069abfd91d8f4e0640047b23ceafac5"
|
|
65
65
|
}
|
package/plugins/with-nx.d.ts
CHANGED
package/plugins/with-nx.js
CHANGED
|
@@ -125,7 +125,7 @@ function withNx(_nextConfig = {}, context = getWithNxContext()) {
|
|
|
125
125
|
: joinPathFragments(outputDir, '.next');
|
|
126
126
|
const userWebpackConfig = nextConfig.webpack;
|
|
127
127
|
const { createWebpackConfig } = require('../src/utils/config');
|
|
128
|
-
nextConfig.webpack = (a, b) => createWebpackConfig(workspaceRoot,
|
|
128
|
+
nextConfig.webpack = (a, b) => createWebpackConfig(workspaceRoot, projectDirectory, options.fileReplacements, options.assets, dependencies, path.join(workspaceRoot, context.libsDir))(userWebpackConfig ? userWebpackConfig(a, b) : a, b);
|
|
129
129
|
return nextConfig;
|
|
130
130
|
}
|
|
131
131
|
});
|
|
@@ -144,8 +144,10 @@ function getNextConfig(nextConfig = {}, context = getWithNxContext()) {
|
|
|
144
144
|
* Update babel to support our monorepo setup.
|
|
145
145
|
* The 'upward' mode allows the root babel.config.json and per-project .babelrc files to be picked up.
|
|
146
146
|
*/
|
|
147
|
-
|
|
148
|
-
|
|
147
|
+
if (nx === null || nx === void 0 ? void 0 : nx.babelUpwardRootMode) {
|
|
148
|
+
options.defaultLoaders.babel.options.babelrc = true;
|
|
149
|
+
options.defaultLoaders.babel.options.rootMode = 'upward';
|
|
150
|
+
}
|
|
149
151
|
/*
|
|
150
152
|
* Modify the Next.js webpack config to allow workspace libs to use css modules.
|
|
151
153
|
* Note: This would be easier if Next.js exposes css-loader and sass-loader on `defaultLoaders`.
|
package/plugins/with-nx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,14 +20,14 @@ function buildExecutor(options, context) {
|
|
|
20
20
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
// Cast to any to overwrite NODE_ENV
|
|
22
22
|
(_d = process.env).NODE_ENV || (_d.NODE_ENV = 'production');
|
|
23
|
-
const
|
|
24
|
-
(0, check_project_1.checkPublicDirectory)(
|
|
23
|
+
const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
|
|
24
|
+
(0, check_project_1.checkPublicDirectory)(projectRoot);
|
|
25
25
|
// Set `__NEXT_REACT_ROOT` based on installed ReactDOM version
|
|
26
|
-
const packageJsonPath = (0, path_1.join)(
|
|
26
|
+
const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
|
|
27
27
|
const packageJson = (0, fs_extra_1.existsSync)(packageJsonPath)
|
|
28
28
|
? (0, devkit_1.readJsonFile)(packageJsonPath)
|
|
29
29
|
: undefined;
|
|
30
|
-
const rootPackageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(
|
|
30
|
+
const rootPackageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(context.root, 'package.json'));
|
|
31
31
|
const reactDomVersion = (_b = (_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['react-dom']) !== null && _b !== void 0 ? _b : (_c = rootPackageJson.dependencies) === null || _c === void 0 ? void 0 : _c['react-dom'];
|
|
32
32
|
const hasReact18 = reactDomVersion &&
|
|
33
33
|
(0, semver_1.gte)((0, semver_2.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
|
|
@@ -40,7 +40,7 @@ function buildExecutor(options, context) {
|
|
|
40
40
|
const execSyncOptions = {
|
|
41
41
|
stdio: 'inherit',
|
|
42
42
|
encoding: 'utf-8',
|
|
43
|
-
cwd:
|
|
43
|
+
cwd: projectRoot,
|
|
44
44
|
};
|
|
45
45
|
try {
|
|
46
46
|
(0, child_process_1.execSync)(command, execSyncOptions);
|
|
@@ -67,7 +67,7 @@ function buildExecutor(options, context) {
|
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
(0, create_next_config_file_1.createNextConfigFile)(options, context);
|
|
70
|
-
(0, fs_extra_1.copySync)((0, path_1.join)(
|
|
70
|
+
(0, fs_extra_1.copySync)((0, path_1.join)(projectRoot, 'public'), (0, path_1.join)(options.outputPath, 'public'), {
|
|
71
71
|
dereference: true,
|
|
72
72
|
});
|
|
73
73
|
return { success: true };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,11 @@ const fs_extra_1 = require("fs-extra");
|
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const typescript_1 = require("nx/src/utils/typescript");
|
|
9
9
|
function createNextConfigFile(options, context) {
|
|
10
|
-
const
|
|
10
|
+
const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
|
|
11
|
+
const configRelativeToProjectRoot = findNextConfigPath(projectRoot,
|
|
11
12
|
// If user passed a config then it is relative to the workspace root, need to normalize it to be relative to the project root.
|
|
12
|
-
options.nextConfig ? (0, path_1.relative)(
|
|
13
|
-
const configAbsolutePath = (0, path_1.join)(
|
|
13
|
+
options.nextConfig ? (0, path_1.relative)(projectRoot, options.nextConfig) : undefined);
|
|
14
|
+
const configAbsolutePath = (0, path_1.join)(projectRoot, configRelativeToProjectRoot);
|
|
14
15
|
if (!(0, fs_extra_1.existsSync)(configAbsolutePath)) {
|
|
15
16
|
throw new Error('next.config.js not found');
|
|
16
17
|
}
|
|
@@ -32,10 +33,10 @@ function createNextConfigFile(options, context) {
|
|
|
32
33
|
.replace('@nx/next/plugins/with-nx', './.nx-helpers/compiled.js')
|
|
33
34
|
.replace('@nrwl/next/plugins/with-nx', './.nx-helpers/compiled.js'));
|
|
34
35
|
// Find all relative imports needed by next.config.js and copy them to the dist folder.
|
|
35
|
-
const moduleFilesToCopy = getRelativeFilesToCopy(configRelativeToProjectRoot,
|
|
36
|
+
const moduleFilesToCopy = getRelativeFilesToCopy(configRelativeToProjectRoot, projectRoot);
|
|
36
37
|
for (const moduleFile of moduleFilesToCopy) {
|
|
37
38
|
(0, fs_extra_1.ensureDirSync)((0, path_1.dirname)((0, path_1.join)(context.root, options.outputPath, moduleFile)));
|
|
38
|
-
(0, fs_extra_1.copyFileSync)((0, path_1.join)(context.root,
|
|
39
|
+
(0, fs_extra_1.copyFileSync)((0, path_1.join)(context.root, projectRoot, moduleFile), (0, path_1.join)(context.root, options.outputPath, moduleFile));
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
42
|
exports.createNextConfigFile = createNextConfigFile;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-next-config-file.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/create-next-config-file.ts"],"names":[],"mappings":";;;AACA,uCAMoB;AACpB,iCAAiC;AACjC,uCAOkB;AAClB,+BAAwD;AACxD,wDAAoD;AAIpD,SAAgB,oBAAoB,CAClC,OAAgC,EAChC,OAAwB;IAExB,MAAM,
|
|
1
|
+
{"version":3,"file":"create-next-config-file.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/create-next-config-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,6 @@
|
|
|
7
7
|
"description": "Build a Next.js app.",
|
|
8
8
|
"type": "object",
|
|
9
9
|
"properties": {
|
|
10
|
-
"root": {
|
|
11
|
-
"description": "The source root",
|
|
12
|
-
"type": "string",
|
|
13
|
-
"x-priority": "important"
|
|
14
|
-
},
|
|
15
10
|
"outputPath": {
|
|
16
11
|
"type": "string",
|
|
17
12
|
"description": "The output path of the generated files.",
|
|
@@ -76,5 +71,5 @@
|
|
|
76
71
|
"description": "Only build 'app' routes"
|
|
77
72
|
}
|
|
78
73
|
},
|
|
79
|
-
"required": ["
|
|
74
|
+
"required": ["outputPath"]
|
|
80
75
|
}
|
|
@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
require("dotenv/config");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const export_1 = require("next/dist/export");
|
|
7
|
-
const path_1 = require("path");
|
|
8
7
|
const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
|
|
9
8
|
const nextTrace = require("next/dist/trace");
|
|
10
9
|
const os_1 = require("os");
|
|
@@ -43,11 +42,11 @@ function exportExecutor(options, context) {
|
|
|
43
42
|
throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
|
|
44
43
|
}
|
|
45
44
|
const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
|
|
46
|
-
const
|
|
45
|
+
const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
|
|
47
46
|
// Taken from:
|
|
48
47
|
// https://github.com/vercel/next.js/blob/ead56eaab68409e96c19f7d9139747bac1197aa9/packages/next/cli/next-export.ts#L13
|
|
49
48
|
const nextExportCliSpan = nextTrace.trace('next-export-cli');
|
|
50
|
-
yield (0, export_1.default)(
|
|
49
|
+
yield (0, export_1.default)(projectRoot, {
|
|
51
50
|
statusMessage: 'Exporting',
|
|
52
51
|
silent: options.silent,
|
|
53
52
|
threads: options.threads,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/export/export.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,uCAKoB;AACpB,6CAAyC;
|
|
1
|
+
{"version":3,"file":"export.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/export/export.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,uCAKoB;AACpB,6CAAyC;AAEzC,gFAG+C;AAO/C,6CAA8C;AAC9C,2BAA8B;AAC9B,iDAA6C;AAC7C,+BAA+B;AAE/B,iCAAiC;AACjC,MAAM,KAAK,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;AAEzD;;;;;;;;;;;IAWI;AACJ,SAA8B,cAAc,CAC1C,OAAiC,EACjC,OAAwB;;QAExB,IAAI,YAAY,GAAoC,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;YAChC,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,EAAE,6BAA6B;YACtC,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;SACpC;QAED,MAAM,WAAW,GAAG,IAAA,0BAAiB,EACnC,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,YAAY,CACrB,CAAC;QAEF,IAAI;YACF,MAAM,IAAI,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAA,4BAAY,EAAC,KAAK,EAAE,IAAI,EAAE;gBACxB,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;SACJ;QAAC,WAAM;YACN,MAAM,IAAI,KAAK,CAAC,wBAAwB,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;SAC5E;QAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,WAAW,EACX,OAAO,CACR,CAAC;QACF,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAE9E,cAAc;QACd,uHAAuH;QACvH,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAE7D,MAAM,IAAA,gBAAS,EACb,WAAW,EACX;YACE,aAAa,EAAE,WAAW;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,GAAG,YAAY,CAAC,UAAU,WAAW;SACvC,EACR,iBAAiB,CAClB,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;CAAA;AApDD,iCAoDC;AAED,SAAS,qBAAqB,CAAC,OAAiC;IAC9D,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC/C,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -15,8 +15,8 @@ function serveExecutor(options, context) {
|
|
|
15
15
|
// Setting port that the custom server should use.
|
|
16
16
|
process.env.PORT = options.port;
|
|
17
17
|
const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph), context);
|
|
18
|
-
const
|
|
19
|
-
yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(
|
|
18
|
+
const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
|
|
19
|
+
yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(runCustomServer(projectRoot, options, context))));
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
exports.default = serveExecutor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/custom-server.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,uCAKoB;AACpB,+BAAqC;AAOrC,SAA+B,aAAa,CAC1C,OAAgC,EAChC,OAAwB;;QAExB,oCAAoC;QACnC,OAAO,CAAC,GAAW,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ;YAClD,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;YACtB,CAAC,CAAC,OAAO,CAAC,GAAG;gBACb,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,YAAY,CAAC;QAEjB,kDAAkD;QACjD,OAAO,CAAC,GAAW,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAEzC,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,EAC5D,OAAO,CACR,CAAC;QACF,MAAM,
|
|
1
|
+
{"version":3,"file":"custom-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/custom-server.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,uCAKoB;AACpB,+BAAqC;AAOrC,SAA+B,aAAa,CAC1C,OAAgC,EAChC,OAAwB;;QAExB,oCAAoC;QACnC,OAAO,CAAC,GAAW,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ;YAClD,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;YACtB,CAAC,CAAC,OAAO,CAAC,GAAG;gBACb,CAAC,CAAC,aAAa;gBACf,CAAC,CAAC,YAAY,CAAC;QAEjB,kDAAkD;QACjD,OAAO,CAAC,GAAW,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAEzC,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,EAC5D,OAAO,CACR,CAAC;QACF,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAE9E,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,eAAe,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA,CAAA,CAAA,CAAC;IACxD,CAAC;CAAA;AArBD,gCAqBC;AAED,SAAgB,eAAe,CAC7B,IAAY,EACZ,OAAgC,EAChC,OAAwB;;;QAExB,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEtD,MAAM,OAAO,GAAG,UAAU,OAAO,CAAC,QAAQ,IAAI,WAAW,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QAE5E,MAAM,iBAAiB,GAAG,sBAAM,IAAA,oBAAW,EACzC,IAAA,0BAAiB,EAAC,OAAO,CAAC,kBAAkB,EAAE,OAAO,CAAC,YAAY,CAAC,EACnE;YACE,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;SAClC,EACD,OAAO,CACR,CAAA,CAAC;;YAEF,KAA2B,eAAA,sBAAA,sBAAA,iBAAiB,CAAA,uBAAA;gBAAjB,iCAAiB;gBAAjB,WAAiB;;oBAAjC,MAAM,MAAM,KAAA,CAAA;oBACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;wBACnB,6BAAO,MAAM,EAAC;qBACf;oBACD,4BAAM;wBACJ,OAAO,EAAE,IAAI;wBACb,OAAO;qBACR,CAAA,CAAC;;;;;aACH;;;;;;;;;QAED,6BAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC;IAC3B,CAAC;CAAA"}
|
|
@@ -15,10 +15,10 @@ function serveExecutor(options, context) {
|
|
|
15
15
|
return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, custom_server_impl_1.default)(options, context)))));
|
|
16
16
|
}
|
|
17
17
|
const buildOptions = (0, devkit_1.readTargetOptions)((0, devkit_1.parseTargetString)(options.buildTarget, context.projectGraph), context);
|
|
18
|
-
const
|
|
18
|
+
const projectRoot = context.workspace.projects[context.projectName].root;
|
|
19
19
|
const { port, keepAliveTimeout, hostname } = options;
|
|
20
20
|
// This is required for the default custom server to work. See the @nx/next:app generator.
|
|
21
|
-
process.env.NX_NEXT_DIR =
|
|
21
|
+
process.env.NX_NEXT_DIR = projectRoot;
|
|
22
22
|
// Cast to any to overwrite NODE_ENV
|
|
23
23
|
process.env.NODE_ENV = process.env.NODE_ENV
|
|
24
24
|
? process.env.NODE_ENV
|
|
@@ -35,7 +35,7 @@ function serveExecutor(options, context) {
|
|
|
35
35
|
yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, async_iterable_1.createAsyncIterable)(({ done, next, error }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
36
|
var _a;
|
|
37
37
|
const server = (0, child_process_1.fork)(nextBin, [mode, ...args, turbo], {
|
|
38
|
-
cwd: options.dev ?
|
|
38
|
+
cwd: options.dev ? projectRoot : nextDir,
|
|
39
39
|
stdio: 'inherit',
|
|
40
40
|
});
|
|
41
41
|
server.once('exit', (code) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,uCAIoB;AACpB,+BAAqC;AAMrC,iDAAqC;AACrC,6DAAgD;AAChD,uEAAkE;AAClE,wEAA0E;AAC1E,6EAAuE;AAEvE,SAA+B,aAAa,CAC1C,OAAgC,EAChC,OAAwB;;QAExB,IAAI,OAAO,CAAC,kBAAkB,EAAE;YAC9B,6BAAO,sBAAA,KAAK,CAAC,CAAC,yBAAA,sBAAA,IAAA,4BAAY,EAAC,OAAO,EAAE,OAAO,CAAC,CAAA,CAAA,CAAA,EAAC;SAC9C;QAED,MAAM,YAAY,GAAG,IAAA,0BAAiB,EACpC,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC,EAC5D,OAAO,CACR,CAAC;QACF,MAAM,
|
|
1
|
+
{"version":3,"file":"server.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/server/server.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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,
|
|
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 = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AAEpB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,OAAO,CAAC,KAAK,GAAG;QACd,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,
|
|
1
|
+
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,uCAIoB;AAEpB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,OAAO,CAAC,KAAK,GAAG;QACd,QAAQ,EAAE,gBAAgB;QAC1B,OAAO,EAAE,CAAC,sBAAsB,CAAC;QACjC,oBAAoB,EAAE,YAAY;QAClC,OAAO,EAAE;YACP,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,UAAU,EAAE,OAAO,CAAC,cAAc;aACnC;YACD,UAAU,EAAE,EAAE;SACf;KACF,CAAC;IAEF,OAAO,CAAC,KAAK,GAAG;QACd,QAAQ,EAAE,iBAAiB;QAC3B,oBAAoB,EAAE,aAAa;QACnC,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,QAAQ;YAC3C,GAAG,EAAE,IAAI;SACV;QACD,cAAc,EAAE;YACd,WAAW,EAAE;gBACX,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,oBAAoB;gBACvD,GAAG,EAAE,IAAI;aACV;YACD,UAAU,EAAE;gBACV,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;gBACtD,GAAG,EAAE,KAAK;aACX;SACF;KACF,CAAC;IAEF,OAAO,CAAC,MAAM,GAAG;QACf,QAAQ,EAAE,iBAAiB;QAC3B,OAAO,EAAE;YACP,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,mBAAmB;SACvD;KACF,CAAC;IAEF,MAAM,OAAO,GAAyB;QACpC,IAAI,EAAE,OAAO,CAAC,cAAc;QAC5B,UAAU,EAAE,OAAO,CAAC,cAAc;QAClC,WAAW,EAAE,aAAa;QAC1B,OAAO;QACP,IAAI,EAAE,OAAO,CAAC,UAAU;KACzB,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,WAAW,oBAC5C,OAAO,EACV,CAAC;AACL,CAAC;AAvDD,gCAuDC"}
|
|
@@ -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":";;;;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;
|
|
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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"}
|
|
@@ -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://
|
|
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
|
|
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,
|
|
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,
|
|
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,
|
|
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,
|
|
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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const devkit_1 = require("@nx/devkit");
|
|
5
|
+
const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
|
|
6
|
+
function update(tree) {
|
|
7
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/next:build', (options, projectName, targetName) => {
|
|
9
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
10
|
+
delete projectConfig.targets[targetName].options.root;
|
|
11
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
|
|
12
|
+
});
|
|
13
|
+
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/next:build', (options, projectName, targetName) => {
|
|
14
|
+
const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, projectName);
|
|
15
|
+
delete projectConfig.targets[targetName].options.root;
|
|
16
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfig);
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
exports.default = update;
|
|
21
|
+
//# sourceMappingURL=remove-root-build-option.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-root-build-option.js","sourceRoot":"","sources":["../../../../../../packages/next/src/migrations/update-16-3-0/remove-root-build-option.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AACpB,6FAA0F;AAE1F,SAA8B,MAAM,CAAC,IAAU;;QAC7C,IAAA,+CAAsB,EACpB,IAAI,EACJ,gBAAgB,EAChB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE;YACnC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAClE,OAAO,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;YACtD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QAC/D,CAAC,CACF,CAAC;QACF,IAAA,+CAAsB,EACpB,IAAI,EACJ,kBAAkB,EAClB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE;YACnC,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAClE,OAAO,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;YACtD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;QAC/D,CAAC,CACF,CAAC;IACJ,CAAC;CAAA;AAnBD,yBAmBC"}
|
package/src/utils/styles.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { GeneratorCallback, Tree } from '@nx/devkit';
|
|
2
|
-
export declare const
|
|
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
|
|
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;
|
package/src/utils/styles.js
CHANGED
|
@@ -1,19 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addStyleDependencies = exports.
|
|
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
|
-
|
|
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
|
-
|
|
41
|
-
|
|
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') &&
|
|
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;
|
package/src/utils/styles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styles.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/styles.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAEpB,2DAA0E;AAC1E,
|
|
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"}
|
package/src/utils/types.d.ts
CHANGED
|
File without changes
|