@nrwl/next 14.5.3 → 14.6.0-beta.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/CHANGELOG.md +1 -1
- package/package.json +10 -10
- package/plugins/with-less.d.ts +8 -1
- package/plugins/with-less.js +3 -0
- package/plugins/with-less.js.map +1 -1
- package/plugins/with-nx.d.ts +93 -0
- package/plugins/with-nx.js +5 -0
- package/plugins/with-nx.js.map +1 -1
- package/plugins/with-stylus.d.ts +1 -1
- package/plugins/with-stylus.js +3 -0
- package/plugins/with-stylus.js.map +1 -1
- package/src/executors/build/build.impl.js +2 -1
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/generators/application/files/next.config.js__tmpl__ +5 -3
- package/src/generators/application/files/pages/_document.tsx__tmpl__ +14 -13
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
# [14.6.0-beta.1](https://github.com/nrwl/nx/compare/14.5.4...14.6.0-beta.1) (2022-08-11)
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/next
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.6.0-beta.1",
|
|
4
4
|
"description": "When 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.\n\nThe Next.js plugin 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.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,23 +34,23 @@
|
|
|
34
34
|
},
|
|
35
35
|
"dependencies": {
|
|
36
36
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
37
|
-
"@nrwl/cypress": "14.
|
|
38
|
-
"@nrwl/devkit": "14.
|
|
39
|
-
"@nrwl/jest": "14.
|
|
40
|
-
"@nrwl/linter": "14.
|
|
41
|
-
"@nrwl/react": "14.
|
|
42
|
-
"@nrwl/web": "14.
|
|
43
|
-
"@nrwl/workspace": "14.
|
|
37
|
+
"@nrwl/cypress": "14.6.0-beta.1",
|
|
38
|
+
"@nrwl/devkit": "14.6.0-beta.1",
|
|
39
|
+
"@nrwl/jest": "14.6.0-beta.1",
|
|
40
|
+
"@nrwl/linter": "14.6.0-beta.1",
|
|
41
|
+
"@nrwl/react": "14.6.0-beta.1",
|
|
42
|
+
"@nrwl/web": "14.6.0-beta.1",
|
|
43
|
+
"@nrwl/workspace": "14.6.0-beta.1",
|
|
44
44
|
"@svgr/webpack": "^6.1.2",
|
|
45
45
|
"chalk": "4.1.0",
|
|
46
46
|
"dotenv": "~10.0.0",
|
|
47
47
|
"eslint-config-next": "^12.1.0",
|
|
48
48
|
"fs-extra": "^10.1.0",
|
|
49
49
|
"ignore": "^5.0.4",
|
|
50
|
-
"ts-node": "
|
|
50
|
+
"ts-node": "10.9.1",
|
|
51
51
|
"tsconfig-paths": "^3.9.0",
|
|
52
52
|
"url-loader": "^4.1.1",
|
|
53
53
|
"webpack-merge": "^5.8.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "918ddf6d4b93849e3925b00f0e95457727cf3972"
|
|
56
56
|
}
|
package/plugins/with-less.d.ts
CHANGED
package/plugins/with-less.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.withLess = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
5
|
// Adapted from https://raw.githubusercontent.com/elado/next-with-less/main/src/index.js
|
|
5
6
|
const webpack_merge_1 = require("webpack-merge");
|
|
@@ -69,6 +70,8 @@ function withLess(_a) {
|
|
|
69
70
|
},
|
|
70
71
|
});
|
|
71
72
|
}
|
|
73
|
+
exports.withLess = withLess;
|
|
72
74
|
module.exports = withLess;
|
|
75
|
+
module.exports.withLess = withLess;
|
|
73
76
|
module.exports.patchNext = patchNextCSSWithLess;
|
|
74
77
|
//# sourceMappingURL=with-less.js.map
|
package/plugins/with-less.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-less.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-less.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"with-less.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-less.ts"],"names":[],"mappings":"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"}
|
package/plugins/with-nx.d.ts
CHANGED
|
@@ -3,3 +3,96 @@ import type { WebpackConfigOptions } from '../src/utils/types';
|
|
|
3
3
|
export interface WithNxOptions extends NextConfig {
|
|
4
4
|
nx?: WebpackConfigOptions;
|
|
5
5
|
}
|
|
6
|
+
export declare function withNx(nextConfig?: WithNxOptions): {
|
|
7
|
+
webpack: (config: any, options: any) => any;
|
|
8
|
+
i18n?: import("next/dist/server/config-shared").I18NConfig;
|
|
9
|
+
eslint: import("next/dist/server/config-shared").ESLintConfig;
|
|
10
|
+
typescript?: import("next/dist/server/config-shared").TypeScriptConfig;
|
|
11
|
+
headers?: () => Promise<import("next/dist/lib/load-custom-routes").Header[]>;
|
|
12
|
+
rewrites?: () => Promise<import("next/dist/lib/load-custom-routes").Rewrite[] | {
|
|
13
|
+
beforeFiles: import("next/dist/lib/load-custom-routes").Rewrite[];
|
|
14
|
+
afterFiles: import("next/dist/lib/load-custom-routes").Rewrite[];
|
|
15
|
+
fallback: import("next/dist/lib/load-custom-routes").Rewrite[];
|
|
16
|
+
}>;
|
|
17
|
+
redirects?: () => Promise<import("next/dist/lib/load-custom-routes").Redirect[]>;
|
|
18
|
+
webpack5?: false;
|
|
19
|
+
excludeDefaultMomentLocales?: boolean;
|
|
20
|
+
trailingSlash?: boolean;
|
|
21
|
+
env?: Record<string, string>;
|
|
22
|
+
distDir?: string;
|
|
23
|
+
cleanDistDir?: boolean;
|
|
24
|
+
assetPrefix?: string;
|
|
25
|
+
useFileSystemPublicRoutes?: boolean;
|
|
26
|
+
generateBuildId?: () => string | Promise<string>;
|
|
27
|
+
generateEtags?: boolean;
|
|
28
|
+
pageExtensions?: string[];
|
|
29
|
+
compress?: boolean;
|
|
30
|
+
poweredByHeader?: boolean;
|
|
31
|
+
images?: Partial<import("next/dist/shared/lib/image-config").ImageConfigComplete>;
|
|
32
|
+
devIndicators?: {
|
|
33
|
+
buildActivity?: boolean;
|
|
34
|
+
buildActivityPosition?: "bottom-right" | "bottom-left" | "top-right" | "top-left";
|
|
35
|
+
};
|
|
36
|
+
onDemandEntries?: {
|
|
37
|
+
maxInactiveAge?: number;
|
|
38
|
+
pagesBufferLength?: number;
|
|
39
|
+
};
|
|
40
|
+
amp?: {
|
|
41
|
+
canonicalBase?: string;
|
|
42
|
+
};
|
|
43
|
+
basePath?: string;
|
|
44
|
+
sassOptions?: {
|
|
45
|
+
[key: string]: any;
|
|
46
|
+
};
|
|
47
|
+
productionBrowserSourceMaps?: boolean;
|
|
48
|
+
optimizeFonts?: boolean;
|
|
49
|
+
reactStrictMode?: boolean;
|
|
50
|
+
publicRuntimeConfig?: {
|
|
51
|
+
[key: string]: any;
|
|
52
|
+
};
|
|
53
|
+
serverRuntimeConfig?: {
|
|
54
|
+
[key: string]: any;
|
|
55
|
+
};
|
|
56
|
+
httpAgentOptions?: {
|
|
57
|
+
keepAlive?: boolean;
|
|
58
|
+
};
|
|
59
|
+
future?: {
|
|
60
|
+
webpack5?: false;
|
|
61
|
+
};
|
|
62
|
+
outputFileTracing?: boolean;
|
|
63
|
+
staticPageGenerationTimeout?: number;
|
|
64
|
+
crossOrigin?: false | "anonymous" | "use-credentials";
|
|
65
|
+
swcMinify?: boolean;
|
|
66
|
+
compiler?: {
|
|
67
|
+
reactRemoveProperties?: boolean | {
|
|
68
|
+
properties?: string[];
|
|
69
|
+
};
|
|
70
|
+
relay?: {
|
|
71
|
+
src: string;
|
|
72
|
+
artifactDirectory?: string;
|
|
73
|
+
language?: "typescript" | "flow";
|
|
74
|
+
};
|
|
75
|
+
removeConsole?: boolean | {
|
|
76
|
+
exclude?: string[];
|
|
77
|
+
};
|
|
78
|
+
styledComponents?: boolean | {
|
|
79
|
+
displayName?: boolean;
|
|
80
|
+
topLevelImportPaths?: string[];
|
|
81
|
+
ssr?: boolean;
|
|
82
|
+
fileName?: boolean;
|
|
83
|
+
meaninglessFileNames?: string[];
|
|
84
|
+
minify?: boolean;
|
|
85
|
+
transpileTemplateLiterals?: boolean;
|
|
86
|
+
namespace?: string;
|
|
87
|
+
pure?: boolean;
|
|
88
|
+
cssProp?: boolean;
|
|
89
|
+
};
|
|
90
|
+
emotion?: boolean | {
|
|
91
|
+
sourceMap?: boolean;
|
|
92
|
+
autoLabel?: "dev-only" | "always" | "never";
|
|
93
|
+
labelFormat?: string;
|
|
94
|
+
};
|
|
95
|
+
};
|
|
96
|
+
output?: "standalone";
|
|
97
|
+
experimental?: import("next/dist/server/config-shared").ExperimentalConfig;
|
|
98
|
+
};
|
package/plugins/with-nx.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.withNx = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
5
|
const { join } = require('path');
|
|
5
6
|
const { workspaceRoot } = require('@nrwl/devkit');
|
|
@@ -92,6 +93,7 @@ function withNx(nextConfig = {}) {
|
|
|
92
93
|
return userWebpack(config, options);
|
|
93
94
|
} });
|
|
94
95
|
}
|
|
96
|
+
exports.withNx = withNx;
|
|
95
97
|
function getNxEnvironmentVariables() {
|
|
96
98
|
return Object.keys(process.env)
|
|
97
99
|
.filter((env) => /^NX_/i.test(env))
|
|
@@ -113,5 +115,8 @@ function addNxEnvVariables(config) {
|
|
|
113
115
|
.forEach(([name, value]) => (maybeDefinePlugin.definitions[name] = value));
|
|
114
116
|
}
|
|
115
117
|
}
|
|
118
|
+
// Support for older generated code: `const withNx = require('@nrwl/next/plugins/with-nx');`
|
|
116
119
|
module.exports = withNx;
|
|
120
|
+
// Support for newer generated code: `const { withNx } = require(...);`
|
|
121
|
+
module.exports.withNx = withNx;
|
|
117
122
|
//# sourceMappingURL=with-nx.js.map
|
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":"
|
|
1
|
+
{"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":"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"}
|
package/plugins/with-stylus.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export {};
|
|
1
|
+
export declare function withStylus({ stylusLoaderOptions, ...nextConfig }: any): any;
|
package/plugins/with-stylus.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.withStylus = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
5
|
// Adapted from https://raw.githubusercontent.com/elado/next-with-less/main/src/index.js
|
|
5
6
|
const webpack_merge_1 = require("webpack-merge");
|
|
@@ -69,6 +70,8 @@ function withStylus(_a) {
|
|
|
69
70
|
},
|
|
70
71
|
});
|
|
71
72
|
}
|
|
73
|
+
exports.withStylus = withStylus;
|
|
72
74
|
module.exports = withStylus;
|
|
75
|
+
module.exports.withStylus = withStylus;
|
|
73
76
|
module.exports.patchNext = patchNextCSSWithStylus;
|
|
74
77
|
//# sourceMappingURL=with-stylus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-stylus.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-stylus.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"with-stylus.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-stylus.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,10 +15,11 @@ const create_next_config_file_1 = require("./lib/create-next-config-file");
|
|
|
15
15
|
const check_project_1 = require("./lib/check-project");
|
|
16
16
|
const constants_1 = require("../../utils/constants");
|
|
17
17
|
function buildExecutor(options, context) {
|
|
18
|
-
var _a;
|
|
18
|
+
var _a, _b;
|
|
19
19
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
// Cast to any to overwrite NODE_ENV
|
|
21
21
|
(_a = process.env).NODE_ENV || (_a.NODE_ENV = 'production');
|
|
22
|
+
(_b = process.env).__NEXT_REACT_ROOT || (_b.__NEXT_REACT_ROOT = 'true');
|
|
22
23
|
let dependencies = [];
|
|
23
24
|
const root = (0, path_1.resolve)(context.root, options.root);
|
|
24
25
|
const libsDir = (0, path_1.join)(context.root, (0, devkit_2.workspaceLayout)().libsDir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AAEvB,2CAAoC;AACpC,+BAAqC;AACrC,uCAA2C;AAC3C,uEAA0E;AAC1E,yCAAsD;AACtD,6FAG4D;AAC5D,yCAA+C;AAE/C,+CAAmD;AACnD,mEAA8D;AAC9D,2EAAqE;AACrE,uDAA2D;AAE3D,qDAA+D;AAE/D,SAA8B,aAAa,CACzC,OAAgC,EAChC,OAAwB;;;QAExB,oCAAoC;QACpC,MAAC,OAAO,CAAC,GAAW,EAAC,QAAQ,QAAR,QAAQ,GAAK,YAAY,EAAC;
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AAEvB,2CAAoC;AACpC,+BAAqC;AACrC,uCAA2C;AAC3C,uEAA0E;AAC1E,yCAAsD;AACtD,6FAG4D;AAC5D,yCAA+C;AAE/C,+CAAmD;AACnD,mEAA8D;AAC9D,2EAAqE;AACrE,uDAA2D;AAE3D,qDAA+D;AAE/D,SAA8B,aAAa,CACzC,OAAgC,EAChC,OAAwB;;;QAExB,oCAAoC;QACpC,MAAC,OAAO,CAAC,GAAW,EAAC,QAAQ,QAAR,QAAQ,GAAK,YAAY,EAAC;QAC/C,MAAC,OAAO,CAAC,GAAW,EAAC,iBAAiB,QAAjB,iBAAiB,GAAK,MAAM,EAAC;QAElD,IAAI,YAAY,GAAoC,EAAE,CAAC;QACvD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,wBAAe,GAAE,CAAC,OAAO,CAAC,CAAC;QAE9D,IAAA,oCAAoB,EAAC,IAAI,CAAC,CAAC;QAE3B,IAAI,CAAC,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,UAAU,EAAE;YACtD,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,IAAA,+BAAsB,GAAE,EACxB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;SACpC;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,sBAAa,EAChC,kCAAsB,EACtB,OAAO,EACP,OAAO,EACP,YAAY,EACZ,OAAO,CACR,CAAC;QAEF,MAAM,IAAA,eAAK,EAAC,IAAI,EAAE,MAAa,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAA,2BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxC,IAAA,gBAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QAED,MAAM,IAAA,uCAAiB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1C,IAAA,8CAAoB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEvC,IAAA,mBAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEnE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AA7CD,gCA6CC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
//@ts-check
|
|
2
|
+
|
|
1
3
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
2
|
-
const withNx = require('@nrwl/next/plugins/with-nx');
|
|
4
|
+
const { withNx } = require('@nrwl/next/plugins/with-nx');
|
|
3
5
|
|
|
4
6
|
<% if (style === 'less') { %>
|
|
5
7
|
// This plugin is needed until this PR is merged.
|
|
6
8
|
// https://github.com/vercel/next.js/pull/23185
|
|
7
|
-
const withLess = require('@nrwl/next/plugins/with-less');
|
|
9
|
+
const { withLess } = require('@nrwl/next/plugins/with-less');
|
|
8
10
|
|
|
9
11
|
/**
|
|
10
12
|
* @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
|
|
@@ -19,7 +21,7 @@ const nextConfig = {
|
|
|
19
21
|
|
|
20
22
|
module.exports = withLess(withNx(nextConfig));
|
|
21
23
|
<% } else if (style === 'styl') { %>
|
|
22
|
-
const withStylus = require('@nrwl/next/plugins/with-stylus');
|
|
24
|
+
const { withStylus } = require('@nrwl/next/plugins/with-stylus');
|
|
23
25
|
|
|
24
26
|
/**
|
|
25
27
|
* @type {import('@nrwl/next/plugins/with-nx').WithNxOptions}
|
|
@@ -1,27 +1,28 @@
|
|
|
1
1
|
/* eslint-disable react/display-name */
|
|
2
|
-
import {
|
|
3
|
-
import Document, { Html, Head, Main, NextScript } from 'next/document';
|
|
2
|
+
import Document, { Html, Head, Main, NextScript, DocumentContext, DocumentInitialProps } from 'next/document';
|
|
4
3
|
import { ServerStyleSheet } from 'styled-components';
|
|
5
4
|
|
|
6
|
-
export default class CustomDocument extends Document
|
|
7
|
-
static getInitialProps(
|
|
8
|
-
|
|
5
|
+
export default class CustomDocument extends Document {
|
|
6
|
+
static async getInitialProps(ctx: DocumentContext): Promise<DocumentInitialProps> {
|
|
7
|
+
const originalRenderPage = ctx.renderPage;
|
|
9
8
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
const sheet = new ServerStyleSheet();
|
|
10
|
+
|
|
11
|
+
ctx.renderPage = () => originalRenderPage({
|
|
12
|
+
enhanceApp: (App) => (props) => sheet.collectStyles(<App {...props} />),
|
|
13
|
+
enhanceComponent: (Component) => Component,
|
|
14
|
+
});
|
|
13
15
|
|
|
14
|
-
|
|
16
|
+
const intialProps = await Document.getInitialProps(ctx);
|
|
17
|
+
const styles = sheet.getStyleElement();
|
|
15
18
|
|
|
16
|
-
|
|
19
|
+
return {...intialProps, styles };
|
|
17
20
|
}
|
|
18
21
|
|
|
19
22
|
render() {
|
|
20
23
|
return (
|
|
21
24
|
<Html>
|
|
22
|
-
<Head>
|
|
23
|
-
{this.props.styleTags}
|
|
24
|
-
</Head>
|
|
25
|
+
<Head>{this.props.styles}</Head>
|
|
25
26
|
<body>
|
|
26
27
|
<Main />
|
|
27
28
|
<NextScript />
|