@nrwl/next 14.8.7 → 14.9.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/LICENSE +22 -22
- package/README.md +5 -26
- package/migrations.json +34 -115
- package/package.json +14 -13
- package/plugins/with-nx.d.ts +1 -101
- package/plugins/with-nx.js +7 -3
- package/plugins/with-nx.js.map +1 -1
- package/src/executors/build/build.impl.js +19 -5
- package/src/executors/build/build.impl.js.map +1 -1
- package/src/executors/build/lib/create-next-config-file.js +1 -1
- package/src/executors/build/lib/create-next-config-file.js.map +1 -1
- package/src/executors/build/lib/update-package-json.d.ts +3 -0
- package/src/executors/build/lib/update-package-json.js +18 -0
- package/src/executors/build/lib/update-package-json.js.map +1 -0
- package/src/executors/build/schema.json +14 -4
- package/src/executors/export/export.impl.js +15 -9
- package/src/executors/export/export.impl.js.map +1 -1
- package/src/executors/export/schema.json +4 -1
- package/src/executors/server/schema.json +8 -4
- package/src/executors/server/server.impl.js +21 -14
- package/src/executors/server/server.impl.js.map +1 -1
- package/src/generators/application/application.js +1 -2
- package/src/generators/application/application.js.map +1 -1
- package/src/generators/application/files/next.config.js__tmpl__ +1 -1
- package/src/generators/application/files/tsconfig.json__tmpl__ +1 -1
- package/src/generators/application/lib/add-jest.d.ts +1 -1
- package/src/generators/application/lib/add-linting.js +19 -23
- 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.d.ts +1 -1
- package/src/generators/application/lib/create-application-files.helpers.js +2 -2
- package/src/generators/application/lib/create-application-files.js +3 -3
- package/src/generators/application/lib/create-application-files.js.map +1 -1
- package/src/generators/application/lib/normalize-options.js +6 -5
- package/src/generators/application/lib/normalize-options.js.map +1 -1
- package/src/generators/application/lib/set-defaults.js +6 -9
- package/src/generators/application/lib/set-defaults.js.map +1 -1
- package/src/generators/application/schema.d.ts +1 -1
- package/src/generators/application/schema.json +18 -17
- package/src/generators/component/component.d.ts +2 -0
- package/src/generators/component/component.js +2 -3
- package/src/generators/component/component.js.map +1 -1
- package/src/generators/component/schema.json +22 -15
- package/src/generators/custom-server/schema.json +4 -8
- package/src/generators/init/init.js +19 -15
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/init/schema.d.ts +1 -0
- package/src/generators/init/schema.json +6 -0
- package/src/generators/library/library.js +3 -4
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -0
- package/src/generators/library/schema.json +16 -15
- package/src/generators/page/page.js +1 -2
- package/src/generators/page/page.js.map +1 -1
- package/src/generators/page/schema.json +10 -11
- package/src/utils/buildable-libs.d.ts +1 -1
- package/src/utils/buildable-libs.js +1 -1
- package/src/utils/buildable-libs.js.map +1 -1
- package/src/utils/config.d.ts +1 -1
- package/src/utils/config.js +1 -1
- package/src/utils/config.js.map +1 -1
- package/src/utils/styles.js +5 -5
- package/src/utils/styles.js.map +1 -1
- package/src/utils/types.d.ts +2 -1
- package/src/utils/versions.d.ts +4 -4
- package/src/utils/versions.js +4 -4
- package/src/executors/build/lib/create-package-json.d.ts +0 -3
- package/src/executors/build/lib/create-package-json.js +0 -29
- package/src/executors/build/lib/create-package-json.js.map +0 -1
- package/src/migrations/update-10-1-0/update-10-1-0.d.ts +0 -2
- package/src/migrations/update-10-1-0/update-10-1-0.js +0 -13
- package/src/migrations/update-10-1-0/update-10-1-0.js.map +0 -1
- package/src/migrations/update-11-0-0/rename-emotion-packages-11-0-0.d.ts +0 -1
- package/src/migrations/update-11-0-0/rename-emotion-packages-11-0-0.js +0 -15
- package/src/migrations/update-11-0-0/rename-emotion-packages-11-0-0.js.map +0 -1
- package/src/migrations/update-11-0-0/update-11-0-0.d.ts +0 -2
- package/src/migrations/update-11-0-0/update-11-0-0.js +0 -13
- package/src/migrations/update-11-0-0/update-11-0-0.js.map +0 -1
- package/src/migrations/update-11-5-0/remove-tsconfig-app-11-5-0.d.ts +0 -3
- package/src/migrations/update-11-5-0/remove-tsconfig-app-11-5-0.js +0 -32
- package/src/migrations/update-11-5-0/remove-tsconfig-app-11-5-0.js.map +0 -1
- package/src/migrations/update-11-5-0/update-babel-config.d.ts +0 -3
- package/src/migrations/update-11-5-0/update-babel-config.js +0 -24
- package/src/migrations/update-11-5-0/update-babel-config.js.map +0 -1
- package/src/migrations/update-11-6-0/add-js-include-11-6-0.d.ts +0 -3
- package/src/migrations/update-11-6-0/add-js-include-11-6-0.js +0 -29
- package/src/migrations/update-11-6-0/add-js-include-11-6-0.js.map +0 -1
- package/src/migrations/update-12-6-0/add-next-eslint.d.ts +0 -3
- package/src/migrations/update-12-6-0/add-next-eslint.js +0 -40
- package/src/migrations/update-12-6-0/add-next-eslint.js.map +0 -1
- package/src/migrations/update-8-10-0/update-8-10-0.d.ts +0 -2
- package/src/migrations/update-8-10-0/update-8-10-0.js +0 -13
- package/src/migrations/update-8-10-0/update-8-10-0.js.map +0 -1
- package/src/migrations/update-9-2-0/create-next-config.d.ts +0 -2
- package/src/migrations/update-9-2-0/create-next-config.js +0 -51
- package/src/migrations/update-9-2-0/create-next-config.js.map +0 -1
- package/src/migrations/update-9-3-1/update-9-3-1.d.ts +0 -2
- package/src/migrations/update-9-3-1/update-9-3-1.js +0 -19
- package/src/migrations/update-9-3-1/update-9-3-1.js.map +0 -1
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
|
+
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package @nrwl/next
|
package/LICENSE
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
(The MIT License)
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2017-
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining
|
|
6
|
-
a copy of this software and associated documentation files (the
|
|
7
|
-
'Software'), to deal in the Software without restriction, including
|
|
8
|
-
without limitation the rights to use, copy, modify, merge, publish,
|
|
9
|
-
distribute, sublicense, and/or sell copies of the Software, and to
|
|
10
|
-
permit persons to whom the Software is furnished to do so, subject to
|
|
11
|
-
the following conditions:
|
|
12
|
-
|
|
13
|
-
The above copyright notice and this permission notice shall be
|
|
14
|
-
included in all copies or substantial portions of the Software.
|
|
15
|
-
|
|
16
|
-
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
17
|
-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
18
|
-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
19
|
-
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
20
|
-
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
21
|
-
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
22
|
-
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
1
|
+
(The MIT License)
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2017-2023 Narwhal Technologies Inc.
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
|
6
|
+
a copy of this software and associated documentation files (the
|
|
7
|
+
'Software'), to deal in the Software without restriction, including
|
|
8
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
|
9
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
|
10
|
+
permit persons to whom the Software is furnished to do so, subject to
|
|
11
|
+
the following conditions:
|
|
12
|
+
|
|
13
|
+
The above copyright notice and this permission notice shall be
|
|
14
|
+
included in all copies or substantial portions of the Software.
|
|
15
|
+
|
|
16
|
+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
|
|
17
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
18
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
19
|
+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
20
|
+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
21
|
+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
22
|
+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
package/README.md
CHANGED
|
@@ -43,40 +43,19 @@ npm init nx-workspace
|
|
|
43
43
|
yarn create nx-workspace
|
|
44
44
|
```
|
|
45
45
|
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
```
|
|
49
|
-
? What to create in the new workspace (Use arrow keys)
|
|
50
|
-
❯ apps [an empty workspace with no plugins with a layout that works best for building apps]
|
|
51
|
-
core [an empty workspace with no plugins set up to publish npm packages (similar to yarn workspaces)]
|
|
52
|
-
ts [an empty workspace with the JS/TS plugin preinstalled]
|
|
53
|
-
react [a workspace with a single React application]
|
|
54
|
-
angular [a workspace with a single Angular application]
|
|
55
|
-
next.js [a workspace with a single Next.js application]
|
|
56
|
-
nest [a workspace with a single Nest application]
|
|
57
|
-
express [a workspace with a single Express application]
|
|
58
|
-
web components [a workspace with a single app built using web components]
|
|
59
|
-
react-native [a workspace with a single React Native application]
|
|
60
|
-
react-express [a workspace with a full stack application (React + Express)]
|
|
61
|
-
```
|
|
62
|
-
|
|
63
|
-
Select the preset that works best for you
|
|
64
|
-
|
|
65
|
-
### Adding Nx to an Existing Monorepo
|
|
46
|
+
### Adding Nx to an Existing Repository
|
|
66
47
|
|
|
67
48
|
Run:
|
|
68
49
|
|
|
69
50
|
```bash
|
|
70
|
-
npx
|
|
51
|
+
npx nx@latest init
|
|
71
52
|
```
|
|
72
53
|
|
|
73
54
|
## Documentation & Resources
|
|
74
55
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
- [Nx
|
|
78
|
-
- [Tutorial: Adding Nx to an Existing Monorepo](/recipe/adding-to-monorepo)
|
|
79
|
-
- [Official Nx YouTube Channel](https://www.youtube.com/c/Nrwl_io)
|
|
56
|
+
- [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
|
|
57
|
+
- [Intro to Nx](https://nx.dev/getting-started/intro)
|
|
58
|
+
- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
|
|
80
59
|
- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
|
|
81
60
|
|
|
82
61
|
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
|
package/migrations.json
CHANGED
|
@@ -1,54 +1,5 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schematics": {
|
|
3
|
-
"update-8.10.0": {
|
|
4
|
-
"version": "8.10.0-beta.1",
|
|
5
|
-
"description": "Update Next.js libraries",
|
|
6
|
-
"factory": "./src/migrations/update-8-10-0/update-8-10-0"
|
|
7
|
-
},
|
|
8
|
-
"create-next-config-9.2.0": {
|
|
9
|
-
"version": "9.2.0-beta.1",
|
|
10
|
-
"description": "Add next.config.js file to Next apps",
|
|
11
|
-
"factory": "./src/migrations/update-9-2-0/create-next-config"
|
|
12
|
-
},
|
|
13
|
-
"update-9.3.1": {
|
|
14
|
-
"version": "9.3.1-beta.1",
|
|
15
|
-
"description": "Rename @nrwl/next:dev-server to @nrwl/next:server",
|
|
16
|
-
"factory": "./src/migrations/update-9-3-1/update-9-3-1"
|
|
17
|
-
},
|
|
18
|
-
"rename-emotion-packages-11.0.0": {
|
|
19
|
-
"version": "11.0.0-beta.0",
|
|
20
|
-
"description": "Rename emotion packages to match new 11.0.0 package names",
|
|
21
|
-
"factory": "./src/migrations/update-11-0-0/rename-emotion-packages-11-0-0"
|
|
22
|
-
},
|
|
23
|
-
"update-11.0.0": {
|
|
24
|
-
"version": "11.0.0-beta.0",
|
|
25
|
-
"description": "Update libraries",
|
|
26
|
-
"factory": "./src/migrations/update-11-0-0/update-11-0-0"
|
|
27
|
-
},
|
|
28
|
-
"update-babel-config-11.5.0": {
|
|
29
|
-
"cli": "nx",
|
|
30
|
-
"version": "11.5.0-beta.1",
|
|
31
|
-
"description": "Update .babelrc to use '@nrwl/next/babel' instead of 'next/babel'",
|
|
32
|
-
"factory": "./src/migrations/update-11-5-0/update-babel-config"
|
|
33
|
-
},
|
|
34
|
-
"remove-tsconfig-app-11.5.0": {
|
|
35
|
-
"cli": "nx",
|
|
36
|
-
"version": "11.5.0-beta.1",
|
|
37
|
-
"description": "Remove tsconfig.app.json",
|
|
38
|
-
"factory": "./src/migrations/update-11-5-0/remove-tsconfig-app-11-5-0"
|
|
39
|
-
},
|
|
40
|
-
"add-js-include-11.6.0": {
|
|
41
|
-
"cli": "nx",
|
|
42
|
-
"version": "11.6.0-beta.0",
|
|
43
|
-
"description": "Add js patterns to tsconfig.json",
|
|
44
|
-
"factory": "./src/migrations/update-11-6-0/add-js-include-11-6-0"
|
|
45
|
-
},
|
|
46
|
-
"add-next-eslint-12.6.0": {
|
|
47
|
-
"cli": "nx",
|
|
48
|
-
"version": "12.6.0-beta.0",
|
|
49
|
-
"description": "Add 'next' eslint config",
|
|
50
|
-
"factory": "./src/migrations/update-12-6-0/add-next-eslint"
|
|
51
|
-
},
|
|
52
3
|
"fix-nextjs-lib-babel-config-12.8.0": {
|
|
53
4
|
"cli": "nx",
|
|
54
5
|
"version": "12.8.0-beta.11",
|
|
@@ -105,72 +56,6 @@
|
|
|
105
56
|
}
|
|
106
57
|
},
|
|
107
58
|
"packageJsonUpdates": {
|
|
108
|
-
"8.10.0": {
|
|
109
|
-
"version": "8.10.0",
|
|
110
|
-
"packages": {
|
|
111
|
-
"next": {
|
|
112
|
-
"version": "9.1.5",
|
|
113
|
-
"alwaysAddToPackageJson": false
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
},
|
|
117
|
-
"9.2.0": {
|
|
118
|
-
"version": "9.2.0",
|
|
119
|
-
"packages": {
|
|
120
|
-
"next": {
|
|
121
|
-
"version": "9.3.3",
|
|
122
|
-
"alwaysAddToPackageJson": false
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
},
|
|
126
|
-
"10.1.0": {
|
|
127
|
-
"version": "10.1.0-beta.0",
|
|
128
|
-
"packages": {
|
|
129
|
-
"next": {
|
|
130
|
-
"version": "9.5.2",
|
|
131
|
-
"alwaysAddToPackageJson": false
|
|
132
|
-
},
|
|
133
|
-
"node-sass": {
|
|
134
|
-
"version": "4.14.1",
|
|
135
|
-
"alwaysAddToPackageJson": false
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
},
|
|
139
|
-
"11.0.0": {
|
|
140
|
-
"version": "11.0.0-beta.0",
|
|
141
|
-
"packages": {
|
|
142
|
-
"next": {
|
|
143
|
-
"version": "10.0.1",
|
|
144
|
-
"alwaysAddToPackageJson": false
|
|
145
|
-
},
|
|
146
|
-
"@emotion/server": {
|
|
147
|
-
"version": "11.0.0",
|
|
148
|
-
"alwaysAddToPackageJson": false
|
|
149
|
-
},
|
|
150
|
-
"@emotion/styled": {
|
|
151
|
-
"version": "11.0.0",
|
|
152
|
-
"alwaysAddToPackageJson": false
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
},
|
|
156
|
-
"11.5.2": {
|
|
157
|
-
"version": "11.5.2-beta.0",
|
|
158
|
-
"packages": {
|
|
159
|
-
"next": {
|
|
160
|
-
"version": "10.0.9",
|
|
161
|
-
"alwaysAddToPackageJson": false
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
},
|
|
165
|
-
"11.6.1": {
|
|
166
|
-
"version": "11.6.1-beta.0",
|
|
167
|
-
"packages": {
|
|
168
|
-
"next": {
|
|
169
|
-
"version": "10.1.2",
|
|
170
|
-
"alwaysAddToPackageJson": false
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
},
|
|
174
59
|
"12.1.2": {
|
|
175
60
|
"version": "12.1.2-beta.0",
|
|
176
61
|
"packages": {
|
|
@@ -376,6 +261,40 @@
|
|
|
376
261
|
"alwaysAddToPackageJson": false
|
|
377
262
|
}
|
|
378
263
|
}
|
|
264
|
+
},
|
|
265
|
+
"15.0.4": {
|
|
266
|
+
"version": "15.0.4-beta.0",
|
|
267
|
+
"packages": {
|
|
268
|
+
"next": {
|
|
269
|
+
"version": "13.0.0",
|
|
270
|
+
"alwaysAddToPackageJson": false
|
|
271
|
+
},
|
|
272
|
+
"eslint-config-next": {
|
|
273
|
+
"version": "13.0.0",
|
|
274
|
+
"alwaysAddToPackageJson": false
|
|
275
|
+
},
|
|
276
|
+
"less-loader": {
|
|
277
|
+
"version": "11.1.0",
|
|
278
|
+
"alwaysAddToPackageJson": false
|
|
279
|
+
},
|
|
280
|
+
"stylus-loader": {
|
|
281
|
+
"version": "7.1.0",
|
|
282
|
+
"alwaysAddToPackageJson": false
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
},
|
|
286
|
+
"15.4.5": {
|
|
287
|
+
"version": "15.4.5-beta.0",
|
|
288
|
+
"packages": {
|
|
289
|
+
"next": {
|
|
290
|
+
"version": "13.1.1",
|
|
291
|
+
"alwaysAddToPackageJson": false
|
|
292
|
+
},
|
|
293
|
+
"eslint-config-next": {
|
|
294
|
+
"version": "13.1.1",
|
|
295
|
+
"alwaysAddToPackageJson": false
|
|
296
|
+
}
|
|
297
|
+
}
|
|
379
298
|
}
|
|
380
299
|
}
|
|
381
300
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/next",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.9.0-beta.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": {
|
|
@@ -31,25 +31,26 @@
|
|
|
31
31
|
"migrations": "./migrations.json"
|
|
32
32
|
},
|
|
33
33
|
"peerDependencies": {
|
|
34
|
-
"next": "^
|
|
34
|
+
"next": "^13.0.0"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@babel/plugin-proposal-decorators": "^7.14.5",
|
|
38
|
-
"@nrwl/cypress": "14.
|
|
39
|
-
"@nrwl/devkit": "14.
|
|
40
|
-
"@nrwl/jest": "14.
|
|
41
|
-
"@nrwl/
|
|
42
|
-
"@nrwl/
|
|
43
|
-
"@nrwl/
|
|
44
|
-
"@nrwl/
|
|
38
|
+
"@nrwl/cypress": "14.9.0-beta.1",
|
|
39
|
+
"@nrwl/devkit": "14.9.0-beta.1",
|
|
40
|
+
"@nrwl/jest": "14.9.0-beta.1",
|
|
41
|
+
"@nrwl/js": "14.9.0-beta.1",
|
|
42
|
+
"@nrwl/linter": "14.9.0-beta.1",
|
|
43
|
+
"@nrwl/react": "14.9.0-beta.1",
|
|
44
|
+
"@nrwl/webpack": "14.9.0-beta.1",
|
|
45
|
+
"@nrwl/workspace": "14.9.0-beta.1",
|
|
45
46
|
"@svgr/webpack": "^6.1.2",
|
|
46
|
-
"chalk": "4.1.0",
|
|
47
|
+
"chalk": "^4.1.0",
|
|
47
48
|
"dotenv": "~10.0.0",
|
|
48
|
-
"fs-extra": "^
|
|
49
|
+
"fs-extra": "^11.1.0",
|
|
49
50
|
"ignore": "^5.0.4",
|
|
50
51
|
"semver": "7.3.4",
|
|
51
52
|
"ts-node": "10.9.1",
|
|
52
|
-
"tsconfig-paths": "^
|
|
53
|
+
"tsconfig-paths": "^4.1.2",
|
|
53
54
|
"url-loader": "^4.1.1",
|
|
54
55
|
"webpack-merge": "^5.8.0"
|
|
55
56
|
},
|
|
@@ -57,5 +58,5 @@
|
|
|
57
58
|
"access": "public"
|
|
58
59
|
},
|
|
59
60
|
"types": "./index.d.ts",
|
|
60
|
-
"gitHead": "
|
|
61
|
+
"gitHead": "b2a467bcb2bdc124ed52f3755780bca429a43855"
|
|
61
62
|
}
|
package/plugins/with-nx.d.ts
CHANGED
|
@@ -8,104 +8,4 @@ export interface WithNxContext {
|
|
|
8
8
|
workspaceRoot: string;
|
|
9
9
|
libsDir: string;
|
|
10
10
|
}
|
|
11
|
-
export declare function withNx(nextConfig?: WithNxOptions, context?: WithNxContext):
|
|
12
|
-
webpack: (config: any, options: any) => any;
|
|
13
|
-
exportPathMap?: (defaultMap: import("next/dist/server/config-shared").ExportPathMap, ctx: {
|
|
14
|
-
dev: boolean;
|
|
15
|
-
dir: string;
|
|
16
|
-
outDir: string;
|
|
17
|
-
distDir: string;
|
|
18
|
-
buildId: string;
|
|
19
|
-
}) => import("next/dist/server/config-shared").ExportPathMap | Promise<import("next/dist/server/config-shared").ExportPathMap>;
|
|
20
|
-
i18n?: import("next/dist/server/config-shared").I18NConfig;
|
|
21
|
-
eslint: import("next/dist/server/config-shared").ESLintConfig;
|
|
22
|
-
typescript?: import("next/dist/server/config-shared").TypeScriptConfig;
|
|
23
|
-
headers?: () => Promise<import("next/dist/lib/load-custom-routes").Header[]>;
|
|
24
|
-
rewrites?: () => Promise<import("next/dist/lib/load-custom-routes").Rewrite[] | {
|
|
25
|
-
beforeFiles: import("next/dist/lib/load-custom-routes").Rewrite[];
|
|
26
|
-
afterFiles: import("next/dist/lib/load-custom-routes").Rewrite[];
|
|
27
|
-
fallback: import("next/dist/lib/load-custom-routes").Rewrite[];
|
|
28
|
-
}>;
|
|
29
|
-
redirects?: () => Promise<import("next/dist/lib/load-custom-routes").Redirect[]>;
|
|
30
|
-
webpack5?: false;
|
|
31
|
-
excludeDefaultMomentLocales?: boolean;
|
|
32
|
-
trailingSlash?: boolean;
|
|
33
|
-
env?: Record<string, string>;
|
|
34
|
-
distDir?: string;
|
|
35
|
-
cleanDistDir?: boolean;
|
|
36
|
-
assetPrefix?: string;
|
|
37
|
-
useFileSystemPublicRoutes?: boolean;
|
|
38
|
-
generateBuildId?: () => string | Promise<string>;
|
|
39
|
-
generateEtags?: boolean;
|
|
40
|
-
pageExtensions?: string[];
|
|
41
|
-
compress?: boolean;
|
|
42
|
-
analyticsId?: string;
|
|
43
|
-
poweredByHeader?: boolean;
|
|
44
|
-
images?: Partial<import("next/dist/shared/lib/image-config").ImageConfigComplete>;
|
|
45
|
-
devIndicators?: {
|
|
46
|
-
buildActivity?: boolean;
|
|
47
|
-
buildActivityPosition?: "bottom-right" | "bottom-left" | "top-right" | "top-left";
|
|
48
|
-
};
|
|
49
|
-
onDemandEntries?: {
|
|
50
|
-
maxInactiveAge?: number;
|
|
51
|
-
pagesBufferLength?: number;
|
|
52
|
-
};
|
|
53
|
-
amp?: {
|
|
54
|
-
canonicalBase?: string;
|
|
55
|
-
};
|
|
56
|
-
basePath?: string;
|
|
57
|
-
sassOptions?: {
|
|
58
|
-
[key: string]: any;
|
|
59
|
-
};
|
|
60
|
-
productionBrowserSourceMaps?: boolean;
|
|
61
|
-
optimizeFonts?: boolean;
|
|
62
|
-
reactStrictMode?: boolean;
|
|
63
|
-
publicRuntimeConfig?: {
|
|
64
|
-
[key: string]: any;
|
|
65
|
-
};
|
|
66
|
-
serverRuntimeConfig?: {
|
|
67
|
-
[key: string]: any;
|
|
68
|
-
};
|
|
69
|
-
httpAgentOptions?: {
|
|
70
|
-
keepAlive?: boolean;
|
|
71
|
-
};
|
|
72
|
-
future?: {
|
|
73
|
-
webpack5?: false;
|
|
74
|
-
};
|
|
75
|
-
outputFileTracing?: boolean;
|
|
76
|
-
staticPageGenerationTimeout?: number;
|
|
77
|
-
crossOrigin?: false | "anonymous" | "use-credentials";
|
|
78
|
-
swcMinify?: boolean;
|
|
79
|
-
compiler?: {
|
|
80
|
-
reactRemoveProperties?: boolean | {
|
|
81
|
-
properties?: string[];
|
|
82
|
-
};
|
|
83
|
-
relay?: {
|
|
84
|
-
src: string;
|
|
85
|
-
artifactDirectory?: string;
|
|
86
|
-
language?: "typescript" | "flow";
|
|
87
|
-
};
|
|
88
|
-
removeConsole?: boolean | {
|
|
89
|
-
exclude?: string[];
|
|
90
|
-
};
|
|
91
|
-
styledComponents?: boolean | {
|
|
92
|
-
displayName?: boolean;
|
|
93
|
-
topLevelImportPaths?: string[];
|
|
94
|
-
ssr?: boolean;
|
|
95
|
-
fileName?: boolean;
|
|
96
|
-
meaninglessFileNames?: string[];
|
|
97
|
-
minify?: boolean;
|
|
98
|
-
transpileTemplateLiterals?: boolean;
|
|
99
|
-
namespace?: string;
|
|
100
|
-
pure?: boolean;
|
|
101
|
-
cssProp?: boolean;
|
|
102
|
-
};
|
|
103
|
-
emotion?: boolean | {
|
|
104
|
-
sourceMap?: boolean;
|
|
105
|
-
autoLabel?: "dev-only" | "always" | "never";
|
|
106
|
-
labelFormat?: string;
|
|
107
|
-
};
|
|
108
|
-
};
|
|
109
|
-
output?: "standalone";
|
|
110
|
-
experimental?: import("next/dist/server/config-shared").ExperimentalConfig;
|
|
111
|
-
};
|
|
11
|
+
export declare function withNx(nextConfig?: WithNxOptions, context?: WithNxContext): NextConfig;
|
package/plugins/with-nx.js
CHANGED
|
@@ -23,6 +23,10 @@ function getWithNxContext() {
|
|
|
23
23
|
}
|
|
24
24
|
function withNx(nextConfig = {}, context = getWithNxContext()) {
|
|
25
25
|
var _a;
|
|
26
|
+
// If `next-compose-plugins` is used, the context argument is invalid.
|
|
27
|
+
if (!context.libsDir || !context.workspaceRoot) {
|
|
28
|
+
context = getWithNxContext();
|
|
29
|
+
}
|
|
26
30
|
const userWebpack = nextConfig.webpack || ((x) => x);
|
|
27
31
|
const { nx } = nextConfig, validNextConfig = tslib_1.__rest(nextConfig, ["nx"]);
|
|
28
32
|
return Object.assign(Object.assign({ eslint: Object.assign({ ignoreDuringBuilds: true }, ((_a = validNextConfig.eslint) !== null && _a !== void 0 ? _a : {})) }, validNextConfig), { webpack: (config, options) => {
|
|
@@ -49,7 +53,7 @@ function withNx(nextConfig = {}, context = getWithNxContext()) {
|
|
|
49
53
|
*/
|
|
50
54
|
const nextCssLoader = nextCssLoaders.oneOf.find((rule) => rule.sideEffects === false && regexEqual(rule.test, /\.module\.css$/));
|
|
51
55
|
// Might not be found if Next.js webpack config changes in the future
|
|
52
|
-
if (nextCssLoader) {
|
|
56
|
+
if (nextCssLoader && nextCssLoader.issuer) {
|
|
53
57
|
nextCssLoader.issuer.or = nextCssLoader.issuer.and
|
|
54
58
|
? nextCssLoader.issuer.and.concat(includes)
|
|
55
59
|
: includes;
|
|
@@ -61,7 +65,7 @@ function withNx(nextConfig = {}, context = getWithNxContext()) {
|
|
|
61
65
|
const nextSassLoader = nextCssLoaders.oneOf.find((rule) => rule.sideEffects === false &&
|
|
62
66
|
regexEqual(rule.test, /\.module\.(scss|sass)$/));
|
|
63
67
|
// Might not be found if Next.js webpack config changes in the future
|
|
64
|
-
if (nextSassLoader) {
|
|
68
|
+
if (nextSassLoader && nextSassLoader.issuer) {
|
|
65
69
|
nextSassLoader.issuer.or = nextSassLoader.issuer.and
|
|
66
70
|
? nextSassLoader.issuer.and.concat(includes)
|
|
67
71
|
: includes;
|
|
@@ -90,7 +94,7 @@ function withNx(nextConfig = {}, context = getWithNxContext()) {
|
|
|
90
94
|
return (_b = (_a = rule.include) === null || _a === void 0 ? void 0 : _a.and) === null || _b === void 0 ? void 0 : _b.find((include) => regexEqual(include, /node_modules/));
|
|
91
95
|
});
|
|
92
96
|
// Might not be found if Next.js webpack config changes in the future
|
|
93
|
-
if (nextGlobalCssLoader) {
|
|
97
|
+
if (nextGlobalCssLoader && nextGlobalCssLoader.issuer) {
|
|
94
98
|
nextGlobalCssLoader.issuer.or = nextGlobalCssLoader.issuer.and
|
|
95
99
|
? nextGlobalCssLoader.issuer.and.concat(includes)
|
|
96
100
|
: includes;
|
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,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,cAAc,CAAC,CAAC;IACnE,OAAO;QACL,aAAa;QACb,OAAO,EAAE,eAAe,EAAE,CAAC,OAAO;KACnC,CAAC;AACJ,CAAC;AAED,SAAgB,MAAM,CACpB,aAAa,EAAmB,EAChC,UAAyB,gBAAgB,EAAE;;IAE3C,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACrD,MAAM,EAAE,EAAE,KAAyB,UAAU,EAA9B,eAAe,kBAAK,UAAU,EAAvC,MAA0B,CAAa,CAAC;IAC9C,qCACE,MAAM,kBACJ,kBAAkB,EAAE,IAAI,IACrB,CAAC,MAAA,eAAe,CAAC,MAAM,mCAAI,EAAE,CAAC,KAEhC,eAAe,KAClB,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAC3B;;;eAGG;YACH,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;YACpD,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAEzD;;;eAGG;YAEH,6CAA6C;YAC7C,MAAM,QAAQ,GAAG;gBACf,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC;aAC7D,CAAC;YAEF,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAC7C,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CACzC,CAAC;YAEF,oCAAoC;YACpC,IAAI,CAAC,cAAc;gBAAE,OAAO,MAAM,CAAC;YAEnC;;eAEG;YACH,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAC7C,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,WAAW,KAAK,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CACxE,CAAC;YACF,qEAAqE;YACrE,IAAI,aAAa,EAAE;
|
|
1
|
+
{"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../packages/next/plugins/with-nx.ts"],"names":[],"mappings":";;;;AAaA,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,cAAc,CAAC,CAAC;IACnE,OAAO;QACL,aAAa;QACb,OAAO,EAAE,eAAe,EAAE,CAAC,OAAO;KACnC,CAAC;AACJ,CAAC;AAED,SAAgB,MAAM,CACpB,aAAa,EAAmB,EAChC,UAAyB,gBAAgB,EAAE;;IAE3C,sEAAsE;IACtE,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;QAC9C,OAAO,GAAG,gBAAgB,EAAE,CAAC;KAC9B;IACD,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IACrD,MAAM,EAAE,EAAE,KAAyB,UAAU,EAA9B,eAAe,kBAAK,UAAU,EAAvC,MAA0B,CAAa,CAAC;IAC9C,qCACE,MAAM,kBACJ,kBAAkB,EAAE,IAAI,IACrB,CAAC,MAAA,eAAe,CAAC,MAAM,mCAAI,EAAE,CAAC,KAEhC,eAAe,KAClB,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAC3B;;;eAGG;YACH,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;YACpD,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAEzD;;;eAGG;YAEH,6CAA6C;YAC7C,MAAM,QAAQ,GAAG;gBACf,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC;aAC7D,CAAC;YAEF,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAC7C,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CACzC,CAAC;YAEF,oCAAoC;YACpC,IAAI,CAAC,cAAc;gBAAE,OAAO,MAAM,CAAC;YAEnC;;eAEG;YACH,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAC7C,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,WAAW,KAAK,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CACxE,CAAC;YACF,qEAAqE;YACrE,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,EAAE;gBACzC,aAAa,CAAC,MAAM,CAAC,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG;oBAChD,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;oBAC3C,CAAC,CAAC,QAAQ,CAAC;gBACb,OAAO,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC;aACjC;YAED;;eAEG;YACH,MAAM,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAC9C,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,WAAW,KAAK,KAAK;gBAC1B,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAClD,CAAC;YACF,qEAAqE;YACrE,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,EAAE;gBAC3C,cAAc,CAAC,MAAM,CAAC,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG;oBAClD,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;oBAC5C,CAAC,CAAC,QAAQ,CAAC;gBACb,OAAO,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC;aAClC;YAED;;eAEG;YACH,MAAM,wBAAwB,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CACxD,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,GAAG;gBACR,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,cAAc;gBAClC,IAAI,CAAC,GAAG,CAAC,OAAO;gBAChB,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM;oBACtB,kGAAkG;wBAChG,mDAAmD;oBACrD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM;wBACrB,6GAA6G,CAAC,CACrH,CAAC;YACF,qEAAqE;YACrE,IAAI,wBAAwB,EAAE;gBAC5B,wBAAwB,CAAC,OAAO,GAAG,QAAQ,CAAC;aAC7C;YAED;;eAEG;YACH,MAAM,mBAAmB,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;;gBAC7D,OAAA,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,GAAG,0CAAE,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAClC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CACpC,CAAA;aAAA,CACF,CAAC;YACF,qEAAqE;YACrE,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,MAAM,EAAE;gBACrD,mBAAmB,CAAC,MAAM,CAAC,EAAE,GAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG;oBAC5D,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;oBACjD,CAAC,CAAC,QAAQ,CAAC;gBACb,OAAO,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC;aACvC;YAED;;eAEG;YACH,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAE1B;;eAEG;YAEH,8CAA8C;YAC9C,IAAI,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,IAAI,MAAK,KAAK,EAAE;gBACtB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;oBACvB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE;wBACL,6EAA6E;wBAC7E;4BACE,MAAM,EAAE,YAAY;4BACpB,GAAG,EAAE;gCACH;oCACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC;oCACxC,OAAO,EAAE;wCACP,IAAI,EAAE,KAAK;wCACX,SAAS,EAAE,IAAI;wCACf,GAAG,EAAE,IAAI;qCACV;iCACF;gCACD;oCACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;oCACrC,OAAO,EAAE;wCACP,KAAK,EAAE,KAAK;wCACZ,IAAI,EAAE,uBAAuB;qCAC9B;iCACF;6BACF;yBACF;wBACD,sGAAsG;wBACtG;4BACE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC;4BACrC,OAAO,EAAE;gCACP,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,uBAAuB;6BAC9B;yBACF;qBACF;iBACF,CAAC,CAAC;aACJ;YAED,OAAO,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC,IACD;AACJ,CAAC;AA7JD,wBA6JC;AAED,SAAS,yBAAyB;IAChC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;SAC5B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAClC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACnB,GAAG,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACX,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAW;;IACpC,MAAM,iBAAiB,GAAG,MAAA,MAAM,CAAC,OAAO,0CAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;;QACxD,OAAO,MAAA,MAAM,CAAC,WAAW,0CAAG,sBAAsB,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,IAAI,iBAAiB,EAAE;QACrB,MAAM,GAAG,GAAG,yBAAyB,EAAE,CAAC;QAExC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC;aAChB,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,IAAI,EAAE,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;aAC7D,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACxD,OAAO,CACN,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CACjE,CAAC;KACL;AACH,CAAC;AAED,4FAA4F;AAC5F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;AACxB,uEAAuE;AACvE,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC"}
|
|
@@ -3,18 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
require("dotenv/config");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
|
+
const js_1 = require("@nrwl/js");
|
|
6
7
|
const build_1 = require("next/dist/build");
|
|
7
8
|
const path_1 = require("path");
|
|
8
9
|
const fs_extra_1 = require("fs-extra");
|
|
9
10
|
const semver_1 = require("semver");
|
|
10
11
|
const fileutils_1 = require("@nrwl/workspace/src/utilities/fileutils");
|
|
11
|
-
const buildable_libs_utils_1 = require("@nrwl/
|
|
12
|
-
const
|
|
12
|
+
const buildable_libs_utils_1 = require("@nrwl/js/src/utils/buildable-libs-utils");
|
|
13
|
+
const semver_2 = require("@nrwl/devkit/src/utils/semver");
|
|
13
14
|
const config_1 = require("../../utils/config");
|
|
14
|
-
const
|
|
15
|
+
const update_package_json_1 = require("./lib/update-package-json");
|
|
15
16
|
const create_next_config_file_1 = require("./lib/create-next-config-file");
|
|
16
17
|
const check_project_1 = require("./lib/check-project");
|
|
17
18
|
const constants_1 = require("../../utils/constants");
|
|
19
|
+
const lock_file_1 = require("nx/src/lock-file/lock-file");
|
|
18
20
|
function buildExecutor(options, context) {
|
|
19
21
|
var _a, _b, _c;
|
|
20
22
|
var _d, _e;
|
|
@@ -37,7 +39,7 @@ function buildExecutor(options, context) {
|
|
|
37
39
|
const rootPackageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(devkit_1.workspaceRoot, 'package.json'));
|
|
38
40
|
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'];
|
|
39
41
|
const hasReact18 = reactDomVersion &&
|
|
40
|
-
(0, semver_1.gte)((0,
|
|
42
|
+
(0, semver_1.gte)((0, semver_2.checkAndCleanWithSemver)('react-dom', reactDomVersion), '18.0.0');
|
|
41
43
|
if (hasReact18) {
|
|
42
44
|
(_e = process.env).__NEXT_REACT_ROOT || (_e.__NEXT_REACT_ROOT = 'true');
|
|
43
45
|
}
|
|
@@ -46,7 +48,19 @@ function buildExecutor(options, context) {
|
|
|
46
48
|
if (!(0, fileutils_1.directoryExists)(options.outputPath)) {
|
|
47
49
|
(0, fs_extra_1.mkdir)(options.outputPath);
|
|
48
50
|
}
|
|
49
|
-
|
|
51
|
+
const builtPackageJson = (0, js_1.createPackageJson)(context.projectName, context.projectGraph, {
|
|
52
|
+
target: context.targetName,
|
|
53
|
+
root: context.root,
|
|
54
|
+
isProduction: !options.includeDevDependenciesInPackageJson, // By default we remove devDependencies since this is a production build.
|
|
55
|
+
});
|
|
56
|
+
(0, update_package_json_1.updatePackageJson)(builtPackageJson, context);
|
|
57
|
+
(0, devkit_1.writeJsonFile)(`${options.outputPath}/package.json`, builtPackageJson);
|
|
58
|
+
if (options.generateLockfile) {
|
|
59
|
+
const lockFile = (0, js_1.createLockFile)(builtPackageJson);
|
|
60
|
+
(0, fs_extra_1.writeFileSync)(`${options.outputPath}/${(0, lock_file_1.getLockFileName)()}`, lockFile, {
|
|
61
|
+
encoding: 'utf-8',
|
|
62
|
+
});
|
|
63
|
+
}
|
|
50
64
|
(0, create_next_config_file_1.createNextConfigFile)(options, context);
|
|
51
65
|
(0, fs_extra_1.copySync)((0, path_1.join)(root, 'public'), (0, path_1.join)(options.outputPath, 'public'));
|
|
52
66
|
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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"}
|
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const ts = require("typescript");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
-
const typescript_1 = require("
|
|
8
|
+
const typescript_1 = require("nx/src/utils/typescript");
|
|
9
9
|
function createNextConfigFile(options, context) {
|
|
10
10
|
const nextConfigPath = options.nextConfig
|
|
11
11
|
? (0, path_1.join)(context.root, options.nextConfig)
|
|
@@ -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,yCAMsB;AACtB,iCAAiC;AACjC,2BAA6D;AAC7D,+BAA4B;AAG5B,
|
|
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,yCAMsB;AACtB,iCAAiC;AACjC,2BAA6D;AAC7D,+BAA4B;AAG5B,wDAAoD;AAEpD,SAAgB,oBAAoB,CAClC,OAAgC,EAChC,OAAwB;IAExB,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU;QACvC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC;QACxC,CAAC,CAAC,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAEvD,sGAAsG;IACtG,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC,EAAE;QAC9B,IAAA,kBAAa,EAAC,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC1E,IAAA,kBAAa,EACX,IAAA,WAAI,EAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAC1C,IAAA,iBAAY,EAAC,cAAc,CAAC;aACzB,QAAQ,EAAE;aACV,OAAO,CAAC,4BAA4B,EAAE,cAAc,CAAC,CACzD,CAAC;KACH;AACH,CAAC;AAlBD,oDAkBC;AAED,SAAS,gBAAgB;;IACvB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,gCAAgC,CAAC,CAAC;IACrE,IAAI,aAAa,GAAG,IAAA,iBAAY,EAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,EAAE,CAAC,gBAAgB,CACtC,UAAU,EACV,aAAa,EACb,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;IACF,MAAM,2BAA2B,GAAG,MAAA,IAAA,sBAAS,EAC3C,YAAY,EACZ,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAClC,0CAAE,IAAI,CACL,CAAC,IAA4B,EAAE,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,IAAI,MAAK,kBAAkB,CAAA,EAAA,CACzE,CAAC;IAEF,IAAI,2BAA2B,EAAE;QAC/B,aAAa,GAAG,IAAA,6BAAoB,EAAC,aAAa,EAAE;YAClD;gBACE,IAAI,EAAE,mBAAU,CAAC,MAAM;gBACvB,KAAK,EAAE,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACzD,MAAM,EAAE,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC;aAC3D;YACD;gBACE,IAAI,EAAE,mBAAU,CAAC,MAAM;gBACvB,KAAK,EAAE,2BAA2B,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACzD,IAAI,EAAE,IAAA,qBAAY,EAAA;;8BAEI,sBAAa;wBACnB,IAAA,wBAAe,GAAE,CAAC,OAAO;;UAEvC;aACH;SACF,CAAC,CAAC;KACJ;IAED,OAAO,aAAa,CAAC;AACvB,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updatePackageJson = void 0;
|
|
4
|
+
function updatePackageJson(packageJson, context) {
|
|
5
|
+
if (!packageJson.scripts) {
|
|
6
|
+
packageJson.scripts = {};
|
|
7
|
+
}
|
|
8
|
+
if (!packageJson.scripts.start) {
|
|
9
|
+
packageJson.scripts.start = 'next start';
|
|
10
|
+
}
|
|
11
|
+
const typescriptNode = context.projectGraph.externalNodes['npm:typescript'];
|
|
12
|
+
if (typescriptNode) {
|
|
13
|
+
packageJson.dependencies = packageJson.dependencies || {};
|
|
14
|
+
packageJson.dependencies['typescript'] = typescriptNode.data.version;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
exports.updatePackageJson = updatePackageJson;
|
|
18
|
+
//# sourceMappingURL=update-package-json.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"update-package-json.js","sourceRoot":"","sources":["../../../../../../../packages/next/src/executors/build/lib/update-package-json.ts"],"names":[],"mappings":";;;AAGA,SAAgB,iBAAiB,CAC/B,WAAwB,EACxB,OAAwB;IAExB,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;QACxB,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;KAC1B;IACD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE;QAC9B,WAAW,CAAC,OAAO,CAAC,KAAK,GAAG,YAAY,CAAC;KAC1C;IAED,MAAM,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;IAC5E,IAAI,cAAc,EAAE;QAClB,WAAW,CAAC,YAAY,GAAG,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;QAC1D,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC;KACtE;AACH,CAAC;AAhBD,8CAgBC"}
|