@nx/next 16.0.0-beta.2 → 16.0.0-beta.4
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/generators.json +1 -1
- package/package.json +8 -8
- package/plugins/with-nx.js +8 -2
- package/plugins/with-nx.js.map +1 -1
- package/src/executors/build/build.impl.js +1 -2
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/generators/application/files/common/.babelrc__tmpl__ +2 -2
- package/src/generators/application/files/common/next.config.js__tmpl__ +11 -11
- package/src/generators/application/lib/add-linting.js +2 -2
- package/src/generators/application/lib/add-linting.js.map +1 -1
- package/src/generators/application/lib/add-project.js +3 -3
- package/src/generators/application/lib/add-project.js.map +1 -1
- package/src/generators/application/lib/create-application-files.helpers.js +2 -2
- package/src/generators/application/lib/set-defaults.js +7 -4
- package/src/generators/application/lib/set-defaults.js.map +1 -1
- package/src/generators/application/lib/update-jest-config.js +2 -2
- package/src/generators/application/lib/update-jest-config.js.map +1 -1
- package/src/generators/custom-server/custom-server.js +13 -12
- package/src/generators/custom-server/custom-server.js.map +1 -1
- package/src/generators/custom-server/files/server/main.ts__tmpl__ +1 -1
- package/src/generators/init/init.js +1 -1
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/library.js +4 -4
- package/src/generators/library/library.js.map +1 -1
- package/src/utils/generate-globs.js +1 -1
- package/src/utils/generate-globs.js.map +1 -1
package/generators.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/next",
|
|
3
|
-
"version": "16.0.0-beta.
|
|
3
|
+
"version": "16.0.0-beta.4",
|
|
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,12 +35,12 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
38
|
-
"@nrwl/next": "16.0.0-beta.
|
|
39
|
-
"@nx/devkit": "16.0.0-beta.
|
|
40
|
-
"@nx/js": "16.0.0-beta.
|
|
41
|
-
"@nx/linter": "16.0.0-beta.
|
|
42
|
-
"@nx/react": "16.0.0-beta.
|
|
43
|
-
"@nx/workspace": "16.0.0-beta.
|
|
38
|
+
"@nrwl/next": "16.0.0-beta.4",
|
|
39
|
+
"@nx/devkit": "16.0.0-beta.4",
|
|
40
|
+
"@nx/js": "16.0.0-beta.4",
|
|
41
|
+
"@nx/linter": "16.0.0-beta.4",
|
|
42
|
+
"@nx/react": "16.0.0-beta.4",
|
|
43
|
+
"@nx/workspace": "16.0.0-beta.4",
|
|
44
44
|
"@svgr/webpack": "^6.1.2",
|
|
45
45
|
"chalk": "^4.1.0",
|
|
46
46
|
"copy-webpack-plugin": "^10.2.4",
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"access": "public"
|
|
61
61
|
},
|
|
62
62
|
"types": "./index.d.ts",
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "0fc3d4441eb6900f8bdf0091c39f65e3cd1977ba"
|
|
64
64
|
}
|
package/plugins/with-nx.js
CHANGED
|
@@ -40,7 +40,8 @@ function getOptions(graph, target) {
|
|
|
40
40
|
}
|
|
41
41
|
function getNxContext(graph, target) {
|
|
42
42
|
const targetConfig = getTargetConfig(graph, target);
|
|
43
|
-
if ('@
|
|
43
|
+
if ('@nx/next:build' === targetConfig.executor ||
|
|
44
|
+
'@nrwl/next:build' === targetConfig.executor) {
|
|
44
45
|
return {
|
|
45
46
|
node: graph.nodes[target.project],
|
|
46
47
|
options: getOptions(graph, target),
|
|
@@ -55,7 +56,12 @@ function getNxContext(graph, target) {
|
|
|
55
56
|
const devServerTarget = (0, devkit_1.parseTargetString)(targetOptions.devServerTarget, graph);
|
|
56
57
|
return getNxContext(graph, devServerTarget);
|
|
57
58
|
}
|
|
58
|
-
else if ([
|
|
59
|
+
else if ([
|
|
60
|
+
'@nx/next:server',
|
|
61
|
+
'@nx/next:export',
|
|
62
|
+
'@nrwl/next:server',
|
|
63
|
+
'@nrwl/next:export',
|
|
64
|
+
].includes(targetConfig.executor)) {
|
|
59
65
|
const buildTarget = (0, devkit_1.parseTargetString)(targetOptions.buildTarget, graph);
|
|
60
66
|
return getNxContext(graph, buildTarget);
|
|
61
67
|
}
|
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":";;;;AAAA,uCASoB;AACpB,gFAG+C;AAE/C,8CAAyD;AAEzD,6BAA6B;AAC7B,gDAAwE;AAcxE,SAAS,UAAU,CAAC,CAAC,EAAE,CAAC;IACtB,OAAO,CACL,CAAC,YAAY,MAAM;QACnB,CAAC,YAAY,MAAM;QACnB,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;QACrB,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;QACrB,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,UAAU;QAC7B,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,SAAS,CAC5B,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,gBAAgB;IACvB,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IACjE,OAAO;QACL,aAAa;QACb,OAAO,EAAE,eAAe,EAAE,CAAC,OAAO;KACnC,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAmB,EAAE,MAAc;IAC1D,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAChD,OAAO,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,UAAU,CAAC,KAAmB,EAAE,MAAc;IACrD,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC;IACrC,IAAI,MAAM,CAAC,aAAa,EAAE;QACxB,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;KAC3E;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,YAAY,CACnB,KAAmB,EACnB,MAAc;IAQd,MAAM,YAAY,GAAG,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEpD,
|
|
1
|
+
{"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,6 @@ const semver_2 = require("@nx/devkit/src/utils/semver");
|
|
|
13
13
|
const update_package_json_1 = require("./lib/update-package-json");
|
|
14
14
|
const create_next_config_file_1 = require("./lib/create-next-config-file");
|
|
15
15
|
const check_project_1 = require("./lib/check-project");
|
|
16
|
-
const lock_file_1 = require("nx/src/plugins/js/lock-file/lock-file");
|
|
17
16
|
function buildExecutor(options, context) {
|
|
18
17
|
var _a, _b, _c;
|
|
19
18
|
var _d, _e;
|
|
@@ -47,7 +46,7 @@ function buildExecutor(options, context) {
|
|
|
47
46
|
(0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, builtPackageJson);
|
|
48
47
|
if (options.generateLockfile) {
|
|
49
48
|
const lockFile = (0, js_1.createLockFile)(builtPackageJson);
|
|
50
|
-
(0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0,
|
|
49
|
+
(0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, js_1.getLockFileName)()}`, lockFile, {
|
|
51
50
|
encoding: 'utf-8',
|
|
52
51
|
});
|
|
53
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,uCAKoB;AACpB,+
|
|
1
|
+
{"version":3,"file":"build.impl.js","sourceRoot":"","sources":["../../../../../../packages/next/src/executors/build/build.impl.ts"],"names":[],"mappings":";;;AAAA,yBAAuB;AACvB,uCAKoB;AACpB,+BAA4E;AAC5E,2CAAoC;AACpC,+BAAqC;AACrC,uCAAsE;AACtE,mCAA6B;AAC7B,qEAAwE;AACxE,wDAAsE;AAEtE,mEAA8D;AAC9D,2EAAqE;AACrE,uDAA2D;AAG3D,SAA8B,aAAa,CACzC,OAAgC,EAChC,OAAwB;;;;QAExB,oCAAoC;QACpC,MAAC,OAAO,CAAC,GAAW,EAAC,QAAQ,QAAR,QAAQ,GAAK,YAAY,EAAC;QAE/C,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAA,oCAAoB,EAAC,IAAI,CAAC,CAAC;QAE3B,8DAA8D;QAC9D,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACnD,MAAM,WAAW,GAAG,IAAA,qBAAU,EAAC,eAAe,CAAC;YAC7C,CAAC,CAAC,IAAA,qBAAY,EAAC,eAAe,CAAC;YAC/B,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,eAAe,GAAG,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,sBAAa,EAAE,cAAc,CAAC,CAAC,CAAC;QAC1E,MAAM,eAAe,GACnB,MAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,YAAY,0CAAG,WAAW,CAAC,mCACxC,MAAA,eAAe,CAAC,YAAY,0CAAG,WAAW,CAAC,CAAC;QAC9C,MAAM,UAAU,GACd,eAAe;YACf,IAAA,YAAG,EAAC,IAAA,gCAAuB,EAAC,WAAW,EAAE,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvE,IAAI,UAAU,EAAE;YACd,MAAC,OAAO,CAAC,GAAW,EAAC,iBAAiB,QAAjB,iBAAiB,GAAK,MAAM,EAAC;SACnD;QAED,MAAM,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC;QAElB,IAAI,CAAC,IAAA,2BAAe,EAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxC,IAAA,gBAAK,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SAC3B;QAED,MAAM,gBAAgB,GAAG,IAAA,sBAAiB,EACxC,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,YAAY,EACpB;YACE,MAAM,EAAE,OAAO,CAAC,UAAU;YAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,YAAY,EAAE,CAAC,OAAO,CAAC,mCAAmC,EAAE,yEAAyE;SACtI,CACF,CAAC;QACF,IAAA,uCAAiB,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAA,sBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,eAAe,EAAE,gBAAgB,CAAC,CAAC;QAEtE,IAAI,OAAO,CAAC,gBAAgB,EAAE;YAC5B,MAAM,QAAQ,GAAG,IAAA,mBAAc,EAAC,gBAAgB,CAAC,CAAC;YAClD,IAAA,wBAAa,EAAC,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,oBAAe,GAAE,EAAE,EAAE,QAAQ,EAAE;gBACpE,QAAQ,EAAE,OAAO;aAClB,CAAC,CAAC;SACJ;QAED,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,EAAE;YACjE,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;CAC1B;AA3DD,gCA2DC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"presets": [
|
|
3
3
|
<% if (style === '@emotion/styled') { %>
|
|
4
4
|
[
|
|
5
|
-
"@
|
|
5
|
+
"@nx/next/babel",
|
|
6
6
|
{
|
|
7
7
|
"preset-react": {
|
|
8
8
|
"runtime": "automatic",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
}
|
|
12
12
|
]
|
|
13
13
|
<% } else { %>
|
|
14
|
-
"@
|
|
14
|
+
"@nx/next/babel"
|
|
15
15
|
<% } %>
|
|
16
16
|
],
|
|
17
17
|
"plugins": [
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
//@ts-check
|
|
2
2
|
|
|
3
3
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
4
|
-
const { composePlugins, withNx } = require('@
|
|
4
|
+
const { composePlugins, withNx } = require('@nx/next');
|
|
5
5
|
|
|
6
6
|
<% if (style === 'less') { %>
|
|
7
7
|
// This plugin is needed until this PR is merged.
|
|
8
8
|
// https://github.com/vercel/next.js/pull/23185
|
|
9
|
-
const { withLess } = require('@
|
|
9
|
+
const { withLess } = require('@nx/next/plugins/with-less');
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
|
-
* @type {import('@
|
|
12
|
+
* @type {import('@nx/next/plugins/with-nx').WithNxOptions}
|
|
13
13
|
**/
|
|
14
14
|
const nextConfig = {
|
|
15
15
|
nx: {
|
|
@@ -18,7 +18,7 @@ const nextConfig = {
|
|
|
18
18
|
svgr: false,
|
|
19
19
|
},
|
|
20
20
|
<% if(appDir) { %>
|
|
21
|
-
experimental: {
|
|
21
|
+
experimental: {
|
|
22
22
|
appDir: true
|
|
23
23
|
},
|
|
24
24
|
<% } %>
|
|
@@ -32,10 +32,10 @@ const plugins = [
|
|
|
32
32
|
|
|
33
33
|
module.exports = composePlugins(...plugins)(nextConfig));
|
|
34
34
|
<% } else if (style === 'styl') { %>
|
|
35
|
-
const { withStylus } = require('@
|
|
35
|
+
const { withStylus } = require('@nx/next/plugins/with-stylus');
|
|
36
36
|
|
|
37
37
|
/**
|
|
38
|
-
* @type {import('@
|
|
38
|
+
* @type {import('@nx/next/plugins/with-nx').WithNxOptions}
|
|
39
39
|
**/
|
|
40
40
|
const nextConfig = {
|
|
41
41
|
nx: {
|
|
@@ -44,7 +44,7 @@ const nextConfig = {
|
|
|
44
44
|
svgr: false,
|
|
45
45
|
},
|
|
46
46
|
<% if(appDir) { %>
|
|
47
|
-
experimental: {
|
|
47
|
+
experimental: {
|
|
48
48
|
appDir: true
|
|
49
49
|
},
|
|
50
50
|
<% } %>
|
|
@@ -64,7 +64,7 @@ module.exports = composePlugins(...plugins)(nextConfig);
|
|
|
64
64
|
|| style === 'none'
|
|
65
65
|
) { %>
|
|
66
66
|
/**
|
|
67
|
-
* @type {import('@
|
|
67
|
+
* @type {import('@nx/next/plugins/with-nx').WithNxOptions}
|
|
68
68
|
**/
|
|
69
69
|
const nextConfig = {
|
|
70
70
|
nx: {
|
|
@@ -73,7 +73,7 @@ const nextConfig = {
|
|
|
73
73
|
svgr: false,
|
|
74
74
|
},
|
|
75
75
|
<% if(appDir) { %>
|
|
76
|
-
experimental: {
|
|
76
|
+
experimental: {
|
|
77
77
|
appDir: true
|
|
78
78
|
},
|
|
79
79
|
<% } %>
|
|
@@ -88,7 +88,7 @@ module.exports = composePlugins(...plugins)(nextConfig);
|
|
|
88
88
|
<% } else {
|
|
89
89
|
// Defaults to CSS/SASS (which don't need plugin as of Next 9.3) %>
|
|
90
90
|
/**
|
|
91
|
-
* @type {import('@
|
|
91
|
+
* @type {import('@nx/next/plugins/with-nx').WithNxOptions}
|
|
92
92
|
**/
|
|
93
93
|
const nextConfig = {
|
|
94
94
|
nx: {
|
|
@@ -97,7 +97,7 @@ const nextConfig = {
|
|
|
97
97
|
svgr: false,
|
|
98
98
|
},
|
|
99
99
|
<% if(appDir) { %>
|
|
100
|
-
experimental: {
|
|
100
|
+
experimental: {
|
|
101
101
|
appDir: true
|
|
102
102
|
},
|
|
103
103
|
<% } %>
|
|
@@ -49,8 +49,8 @@ function addLinting(host, options) {
|
|
|
49
49
|
// add next.js configuration
|
|
50
50
|
json.extends.unshift(...['next', 'next/core-web-vitals']);
|
|
51
51
|
// remove nx/react plugin, as it conflicts with the next.js one
|
|
52
|
-
json.extends = json.extends.filter((name) => name !== 'plugin:@
|
|
53
|
-
json.extends.unshift('plugin:@
|
|
52
|
+
json.extends = json.extends.filter((name) => name !== 'plugin:@nx/nx/react');
|
|
53
|
+
json.extends.unshift('plugin:@nx/nx/react-typescript');
|
|
54
54
|
if (!json.env) {
|
|
55
55
|
json.env = {};
|
|
56
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":";;;;AAAA,uCAA0D;AAC1D,uCAOoB;AACpB,mDAGkC;AAGlC,SAAsB,UAAU,CAC9B,IAAU,EACV,OAAyB;;QAEzB,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;YAChD,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,OAAO,EAAE,OAAO,CAAC,WAAW;YAC5B,aAAa,EAAE;gBACb,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,mBAAmB,CAAC;aAC/D;YACD,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,kBAAkB,EAAE,CAAC,GAAG,OAAO,CAAC,cAAc,uBAAuB,CAAC;YACtE,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;YACpC,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,gBAAgB,CAAC,EAC3D,CAAC,IAAI,EAAE,EAAE;;gBACP,IAAI,GAAG,IAAA,4BAAqB,EAAC,IAAI,CAAC,CAAC;gBAEnC,yGAAyG;gBACzG,4GAA4G;gBAE5G,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;gBAE7D,IAAI,CAAC,KAAK,mBACR,mCAAmC,EAAE,KAAK,IACvC,IAAI,CAAC,KAAK,CACd,CAAC;gBAEF,uDAAuD;gBACvD,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAChD,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAC/C,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CACtB,CACF,CAAC;gBACF,IAAI,cAAc,EAAE;oBAClB,mGAAmG;oBACnG,IAAI,MAAA,cAAc,CAAC,aAAa,0CAAE,OAAO,EAAE;wBACzC,cAAc,CAAC,aAAa,CAAC,OAAO,GAAG;4BACrC,GAAG,OAAO,CAAC,cAAc,qBAAqB;yBAC/C,CAAC;qBACH;oBACD,iDAAiD;oBACjD,IAAI,cAAc,CAAC,KAAK,EAAE;wBACxB,cAAc,CAAC,KAAK,mCACf,cAAc,CAAC,KAAK,KACvB,mCAAmC,EAAE;gCACnC,OAAO;gCACP,GAAG,OAAO,CAAC,cAAc,QAAQ;6BAClC,GACF,CAAC;qBACH;iBACF;gBAED,MAAA,IAAI,CAAC,OAAO,oCAAZ,IAAI,CAAC,OAAO,GAAK,EAAE,EAAC;gBACpB,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;oBACpC,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC/B;gBACD,4BAA4B;gBAC5B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC,CAAC;gBAC1D,+DAA+D;gBAC/D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAChC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"add-linting.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-linting.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
|
|
|
5
5
|
function addProject(host, options) {
|
|
6
6
|
const targets = {};
|
|
7
7
|
targets.build = {
|
|
8
|
-
executor: '@
|
|
8
|
+
executor: '@nx/next:build',
|
|
9
9
|
outputs: ['{options.outputPath}'],
|
|
10
10
|
defaultConfiguration: 'production',
|
|
11
11
|
options: {
|
|
@@ -20,7 +20,7 @@ function addProject(host, options) {
|
|
|
20
20
|
},
|
|
21
21
|
};
|
|
22
22
|
targets.serve = {
|
|
23
|
-
executor: '@
|
|
23
|
+
executor: '@nx/next:server',
|
|
24
24
|
defaultConfiguration: 'development',
|
|
25
25
|
options: {
|
|
26
26
|
buildTarget: `${options.projectName}:build`,
|
|
@@ -38,7 +38,7 @@ function addProject(host, options) {
|
|
|
38
38
|
},
|
|
39
39
|
};
|
|
40
40
|
targets.export = {
|
|
41
|
-
executor: '@
|
|
41
|
+
executor: '@nx/next:export',
|
|
42
42
|
options: {
|
|
43
43
|
buildTarget: `${options.projectName}:build:production`,
|
|
44
44
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AAEpB,SAAgB,UAAU,CAAC,IAAU,EAAE,OAAyB;IAC9D,MAAM,OAAO,GAAwB,EAAE,CAAC;IAExC,OAAO,CAAC,KAAK,GAAG;QACd,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"add-project.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/add-project.ts"],"names":[],"mappings":";;;AACA,uCAKoB;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,IAAI,EAAE,OAAO,CAAC,cAAc;YAC5B,UAAU,EAAE,IAAA,0BAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;SAC9D;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;AAxDD,gCAwDC"}
|
|
@@ -325,9 +325,9 @@ function createAppJsx(name) {
|
|
|
325
325
|
</summary>
|
|
326
326
|
<pre>
|
|
327
327
|
<span># Generate UI lib</span>
|
|
328
|
-
nx g @
|
|
328
|
+
nx g @nx/next:library ui
|
|
329
329
|
<span># Add a component</span>
|
|
330
|
-
nx g @
|
|
330
|
+
nx g @nx/next:component button --project=ui
|
|
331
331
|
</pre>
|
|
332
332
|
</details>
|
|
333
333
|
<details>
|
|
@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setDefaults = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
function setDefaults(host, options) {
|
|
6
|
+
var _a, _b, _c, _d, _e;
|
|
7
|
+
var _f, _g, _h, _j;
|
|
6
8
|
const nxJson = (0, devkit_1.readNxJson)(host);
|
|
7
|
-
nxJson.generators
|
|
8
|
-
nxJson.generators['@
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
(_a = nxJson.generators) !== null && _a !== void 0 ? _a : (nxJson.generators = {});
|
|
10
|
+
(_b = (_f = nxJson.generators)['@nx/next']) !== null && _b !== void 0 ? _b : (_f['@nx/next'] = {});
|
|
11
|
+
(_c = (_g = nxJson.generators['@nx/next']).application) !== null && _c !== void 0 ? _c : (_g.application = {});
|
|
12
|
+
(_d = (_h = nxJson.generators['@nx/next'].application).style) !== null && _d !== void 0 ? _d : (_h.style = options.style);
|
|
13
|
+
(_e = (_j = nxJson.generators['@nx/next'].application).linter) !== null && _e !== void 0 ? _e : (_j.linter = options.linter);
|
|
11
14
|
(0, devkit_1.updateNxJson)(host, nxJson);
|
|
12
15
|
}
|
|
13
16
|
exports.setDefaults = setDefaults;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,uCAA4D;AAI5D,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB
|
|
1
|
+
{"version":3,"file":"set-defaults.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/set-defaults.ts"],"names":[],"mappings":";;;AAAA,uCAA4D;AAI5D,SAAgB,WAAW,CAAC,IAAU,EAAE,OAAyB;;;IAC/D,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,MAAA,MAAM,CAAC,UAAU,oCAAjB,MAAM,CAAC,UAAU,GAAK,EAAE,EAAC;IACzB,YAAA,MAAM,CAAC,UAAU,EAAC,UAAU,wCAAV,UAAU,IAAM,EAAE,EAAC;IACrC,YAAA,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,EAAC,WAAW,uCAAX,WAAW,GAAK,EAAE,EAAC;IACjD,YAAA,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,WAAW,EAAC,KAAK,uCAAL,KAAK,GAAK,OAAO,CAAC,KAAK,EAAC;IAClE,YAAA,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,WAAW,EAAC,MAAM,uCAAN,MAAM,GAAK,OAAO,CAAC,MAAM,EAAC;IAEpE,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAVD,kCAUC"}
|
|
@@ -8,8 +8,8 @@ function updateJestConfig(host, options) {
|
|
|
8
8
|
const configPath = `${options.appProjectRoot}/jest.config.${options.js ? 'js' : 'ts'}`;
|
|
9
9
|
const originalContent = host.read(configPath, 'utf-8');
|
|
10
10
|
const content = originalContent
|
|
11
|
-
.replace('transform: {', "transform: {\n '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@
|
|
12
|
-
.replace(`'babel-jest'`, `['babel-jest', { presets: ['@
|
|
11
|
+
.replace('transform: {', "transform: {\n '^(?!.*\\\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',")
|
|
12
|
+
.replace(`'babel-jest'`, `['babel-jest', { presets: ['@nx/next/babel'] }]`);
|
|
13
13
|
host.write(configPath, content);
|
|
14
14
|
}
|
|
15
15
|
exports.updateJestConfig = updateJestConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAGA,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,gBAC1C,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IACtB,EAAE,CAAC;IACH,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,eAAe;SAC5B,OAAO,CACN,cAAc,EACd,
|
|
1
|
+
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/generators/application/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAGA,SAAgB,gBAAgB,CAAC,IAAU,EAAE,OAAyB;IACpE,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;QACrC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,cAAc,gBAC1C,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IACtB,EAAE,CAAC;IACH,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,eAAe;SAC5B,OAAO,CACN,cAAc,EACd,sFAAsF,CACvF;SACA,OAAO,CAAC,cAAc,EAAE,iDAAiD,CAAC,CAAC;IAC9E,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAhBD,4CAgBC"}
|
|
@@ -4,24 +4,25 @@ exports.customServerSchematic = exports.customServerGenerator = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
function customServerGenerator(host, options) {
|
|
7
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
7
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
9
9
|
const project = (0, devkit_1.readProjectConfiguration)(host, options.project);
|
|
10
|
-
if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) !== '@
|
|
11
|
-
|
|
10
|
+
if (((_b = (_a = project.targets) === null || _a === void 0 ? void 0 : _a.build) === null || _b === void 0 ? void 0 : _b.executor) !== '@nx/next:build' &&
|
|
11
|
+
((_d = (_c = project.targets) === null || _c === void 0 ? void 0 : _c.build) === null || _d === void 0 ? void 0 : _d.executor) !== '@nrwl/next:build') {
|
|
12
|
+
devkit_1.logger.error(`Project ${options.project} is not a Next.js project. Did you generate it with "nx g @nx/next:app"?`);
|
|
12
13
|
return;
|
|
13
14
|
}
|
|
14
|
-
const outputPath = (
|
|
15
|
-
const root = (
|
|
15
|
+
const outputPath = (_g = (_f = (_e = project.targets) === null || _e === void 0 ? void 0 : _e.build) === null || _f === void 0 ? void 0 : _f.options) === null || _g === void 0 ? void 0 : _g.outputPath;
|
|
16
|
+
const root = (_k = (_j = (_h = project.targets) === null || _h === void 0 ? void 0 : _h.build) === null || _j === void 0 ? void 0 : _j.options) === null || _k === void 0 ? void 0 : _k.root;
|
|
16
17
|
if (!root ||
|
|
17
18
|
!outputPath ||
|
|
18
|
-
!((
|
|
19
|
-
!((
|
|
20
|
-
devkit_1.logger.error(`Project ${options.project} has invalid config. Did you generate it with "nx g @
|
|
19
|
+
!((_o = (_m = (_l = project.targets) === null || _l === void 0 ? void 0 : _l.build) === null || _m === void 0 ? void 0 : _m.configurations) === null || _o === void 0 ? void 0 : _o.development) ||
|
|
20
|
+
!((_r = (_q = (_p = project.targets) === null || _p === void 0 ? void 0 : _p.build) === null || _q === void 0 ? void 0 : _q.configurations) === null || _r === void 0 ? void 0 : _r.production)) {
|
|
21
|
+
devkit_1.logger.error(`Project ${options.project} has invalid config. Did you generate it with "nx g @nx/next:app"?`);
|
|
21
22
|
return;
|
|
22
23
|
}
|
|
23
|
-
if (((
|
|
24
|
-
((
|
|
24
|
+
if (((_s = project.targets) === null || _s === void 0 ? void 0 : _s['build-custom-server']) ||
|
|
25
|
+
((_t = project.targets) === null || _t === void 0 ? void 0 : _t['serve-custom-server'])) {
|
|
25
26
|
devkit_1.logger.warn(`Project ${options.project} has custom server targets already: build-custom-server, serve-custom-server. Remove these targets from project and try again.`);
|
|
26
27
|
return;
|
|
27
28
|
}
|
|
@@ -31,7 +32,7 @@ function customServerGenerator(host, options) {
|
|
|
31
32
|
project.targets.serve.configurations.development.customServerTarget = `${options.project}:serve-custom-server:development`;
|
|
32
33
|
project.targets.serve.configurations.production.customServerTarget = `${options.project}:serve-custom-server:production`;
|
|
33
34
|
project.targets['build-custom-server'] = {
|
|
34
|
-
executor: '@
|
|
35
|
+
executor: '@nx/js:tsc',
|
|
35
36
|
defaultConfiguration: 'production',
|
|
36
37
|
options: {
|
|
37
38
|
outputPath,
|
|
@@ -46,7 +47,7 @@ function customServerGenerator(host, options) {
|
|
|
46
47
|
},
|
|
47
48
|
};
|
|
48
49
|
project.targets['serve-custom-server'] = {
|
|
49
|
-
executor: '@
|
|
50
|
+
executor: '@nx/js:node',
|
|
50
51
|
defaultConfiguration: 'development',
|
|
51
52
|
options: {
|
|
52
53
|
buildTarget: `${options.project}:build-custom-server`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-server.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/custom-server/custom-server.ts"],"names":[],"mappings":";;;;AACA,uCASoB;AAGpB,SAAsB,qBAAqB,CACzC,IAAU,EACV,OAA2B;;;QAE3B,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhE,
|
|
1
|
+
{"version":3,"file":"custom-server.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/custom-server/custom-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ import * as path from 'path';
|
|
|
12
12
|
import next from 'next';
|
|
13
13
|
|
|
14
14
|
// Next.js server options:
|
|
15
|
-
// - The environment variable is set by `@
|
|
15
|
+
// - The environment variable is set by `@nx/next:server` when running the dev server.
|
|
16
16
|
// - The fallback `__dirname` is for production builds.
|
|
17
17
|
// - Feel free to change this to suit your needs.
|
|
18
18
|
const dir = process.env.NX_NEXT_DIR || path.join(__dirname, '..');
|
|
@@ -10,7 +10,7 @@ const versions_2 = require("../../utils/versions");
|
|
|
10
10
|
const add_gitignore_entry_1 = require("../../utils/add-gitignore-entry");
|
|
11
11
|
function updateDependencies(host) {
|
|
12
12
|
return (0, devkit_1.addDependenciesToPackageJson)(host, {
|
|
13
|
-
'@
|
|
13
|
+
'@nx/next': versions_2.nxVersion,
|
|
14
14
|
next: versions_2.nextVersion,
|
|
15
15
|
react: versions_1.reactVersion,
|
|
16
16
|
'react-dom': versions_1.reactDomVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AAEpB,2DAA6E;AAC7E,6DAAoE;AACpE,+BAA0D;AAE1D,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,uCAOoB;AAEpB,2DAA6E;AAC7E,6DAAoE;AACpE,+BAA0D;AAE1D,mDAK8B;AAE9B,yEAAoE;AAEpE,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,UAAU,EAAE,oBAAS;QACrB,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,uBAAY;QACnB,WAAW,EAAE,0BAAe;QAC5B,KAAK,EAAE,uBAAY;KACpB,EACD;QACE,oBAAoB,EAAE,kCAAuB;KAC9C,CACF,CAAC;AACJ,CAAC;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,MAAkB;;QACpE,MAAM,KAAK,GAAwB,EAAE,CAAC;QAEtC,KAAK,CAAC,IAAI,CACR,MAAM,IAAA,kBAAe,EAAC,IAAI,kCACrB,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,EAAE;YAC9D,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,sBAAa,EACzC,UAAU,EACV,oBAAS,CACV,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtB;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,aAAa,KAAK,SAAS,EAAE;YAC/D,MAAM,EAAE,oBAAoB,EAAE,GAAG,IAAA,sBAAa,EAE5C,aAAa,EAAE,oBAAS,CAAC,CAAC;YAC5B,MAAM,WAAW,GAAG,MAAM,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,cAAkB,EAAC,IAAI,kCAC1C,MAAM,KACT,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAC3B,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;YAC7C,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SACzB;QAED,IAAA,uCAAiB,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,IAAA,yBAAgB,EAAC,GAAG,KAAK,CAAC,CAAC;IACpC,CAAC;CAAA;AAxCD,8CAwCC;AAED,kBAAe,iBAAiB,CAAC;AACpB,QAAA,iBAAiB,GAAG,IAAA,2BAAkB,EAAC,iBAAiB,CAAC,CAAC"}
|
|
@@ -28,7 +28,7 @@ function libraryGenerator(host, rawOptions) {
|
|
|
28
28
|
if (options.style === '@emotion/styled') {
|
|
29
29
|
json.presets = [
|
|
30
30
|
[
|
|
31
|
-
'@
|
|
31
|
+
'@nx/next/babel',
|
|
32
32
|
{
|
|
33
33
|
'preset-react': {
|
|
34
34
|
runtime: 'automatic',
|
|
@@ -41,11 +41,11 @@ function libraryGenerator(host, rawOptions) {
|
|
|
41
41
|
else if (options.style === 'styled-jsx') {
|
|
42
42
|
// next.js doesn't require the `styled-jsx/babel' plugin as it is already
|
|
43
43
|
// built-into the `next/babel` preset
|
|
44
|
-
json.presets = ['@
|
|
44
|
+
json.presets = ['@nx/next/babel'];
|
|
45
45
|
json.plugins = (json.plugins || []).filter((x) => x !== 'styled-jsx/babel');
|
|
46
46
|
}
|
|
47
47
|
else {
|
|
48
|
-
json.presets = ['@
|
|
48
|
+
json.presets = ['@nx/next/babel'];
|
|
49
49
|
}
|
|
50
50
|
return json;
|
|
51
51
|
});
|
|
@@ -61,7 +61,7 @@ function libraryGenerator(host, rawOptions) {
|
|
|
61
61
|
}
|
|
62
62
|
json.files = json.files.map((path) => {
|
|
63
63
|
if (path.endsWith('react/typings/image.d.ts')) {
|
|
64
|
-
return path.replace('@
|
|
64
|
+
return path.replace('@nx/react/typings/image.d.ts', '@nx/next/typings/image.d.ts');
|
|
65
65
|
}
|
|
66
66
|
return path;
|
|
67
67
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":";;;;AAAA,uCAQoB;AACpB,sEAAqG;AACrG,+BAAyC;AAEzC,uCAAiD;AAEjD,+DAA2D;AAE3D,SAAsB,gBAAgB,CAAC,IAAU,EAAE,UAAkB;;QACnE,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACnD,MAAM,KAAK,GAAwB,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCACxC,OAAO,KACV,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAErB,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAqB,EAAC,IAAI,kCAC3C,OAAO,KACV,QAAQ,EAAE,KAAK,EACf,UAAU,EAAE,IAAI,IAChB,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpB,MAAM,SAAS,GAAG,IAAA,0BAAiB,EACjC,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,SAAS,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CACpC,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,CACR,SAAS,EACT,8HAA8H,YAAY,EAAE,CAC7I,CAAC;QACF,8GAA8G;QAC9G,yJAAyJ;QACzJ,+CAA+C;QAC/C,MAAM,eAAe,GAAG,IAAA,0BAAiB,EACvC,OAAO,CAAC,WAAW,EACnB,OAAO,EACP,SAAS,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CACvC,CAAC;QACF,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,UAAU,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CACrC,EACD,sDAAsD,CACvD,CAAC;QACF,IAAA,oBAAe,EAAC,IAAI,EAAE,GAAG,OAAO,CAAC,UAAU,SAAS,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;QAEzE,IAAA,mBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,EAClD,CAAC,IAAI,EAAE,EAAE;YACP,IAAI,OAAO,CAAC,KAAK,KAAK,iBAAiB,EAAE;gBACvC,IAAI,CAAC,OAAO,GAAG;oBACb;wBACE,
|
|
1
|
+
{"version":3,"file":"library.js","sourceRoot":"","sources":["../../../../../../packages/next/src/generators/library/library.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ const path_1 = require("path");
|
|
|
10
10
|
* @deprecated Use createGlobPatternsForDependencies instead
|
|
11
11
|
*/
|
|
12
12
|
function createGlobPatternsOfDependentProjects(projectName, fileGlobPattern = '/**/!(*.stories|*.spec).tsx') {
|
|
13
|
-
devkit_1.logger.warn(`createGlobPatternsOfDependentProjects is deprecated. Use "createGlobPatternsForDependencies(__dirname)" from "@
|
|
13
|
+
devkit_1.logger.warn(`createGlobPatternsOfDependentProjects is deprecated. Use "createGlobPatternsForDependencies(__dirname)" from "@nx/next/tailwind" instead`);
|
|
14
14
|
try {
|
|
15
15
|
const [projectDirs, warnings] = (0, project_graph_utils_1.getSourceDirOfDependentProjects)(projectName);
|
|
16
16
|
if (warnings.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/generate-globs.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AACvD,uCAA2C;AAC3C,0EAAmF;AACnF,+BAA+B;AAE/B;;;GAGG;AACH,SAAgB,qCAAqC,CACnD,WAAmB,EACnB,kBAA0B,6BAA6B;IAEvD,eAAM,CAAC,IAAI,CACT,
|
|
1
|
+
{"version":3,"file":"generate-globs.js","sourceRoot":"","sources":["../../../../../packages/next/src/utils/generate-globs.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AACvD,uCAA2C;AAC3C,0EAAmF;AACnF,+BAA+B;AAE/B;;;GAGG;AACH,SAAgB,qCAAqC,CACnD,WAAmB,EACnB,kBAA0B,6BAA6B;IAEvD,eAAM,CAAC,IAAI,CACT,0IAA0I,CAC3I,CAAC;IAEF,IAAI;QACF,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAC3B,IAAA,qDAA+B,EAAC,WAAW,CAAC,CAAC;QAE/C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,eAAM,CAAC,IAAI,CAAC;;EAEhB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;;OAEhB,CAAC,CAAC;SACJ;QAED,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACnC,IAAA,cAAO,EAAC,sBAAa,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CACtE,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,uEAAuE,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CACpF,CAAC;KACH;AACH,CAAC;AA5BD,sFA4BC"}
|