@typestyles/next 0.0.0-unstable.8bf64b0f3f7d → 0.0.0-unstable.8e0520fa003f
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/LICENSE +204 -0
- package/README.md +12 -2
- package/dist/build.cjs +30 -5
- package/dist/build.js +34 -5
- package/dist/client.cjs +2 -3
- package/dist/client.js +3 -4
- package/dist/index.cjs +3 -3
- package/dist/index.js +4 -4
- package/dist/server.cjs +3 -0
- package/dist/server.js +2 -0
- package/package.json +5 -5
- package/src/build-route-css.test.ts +48 -0
- package/src/build-theme-extract.test.ts +40 -0
- package/src/build.d.ts +29 -0
- package/src/build.test.ts +10 -2
- package/src/build.ts +51 -10
- package/src/client.tsx +4 -3
- package/src/server.d.ts +2 -0
- package/src/server.ts +2 -1
package/LICENSE
ADDED
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
|
|
2
|
+
Apache License
|
|
3
|
+
Version 2.0, January 2004
|
|
4
|
+
http://www.apache.org/licenses/
|
|
5
|
+
|
|
6
|
+
Copyright 2026 The TypeStyles Authors
|
|
7
|
+
|
|
8
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
9
|
+
|
|
10
|
+
1. Definitions.
|
|
11
|
+
|
|
12
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
13
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
14
|
+
|
|
15
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
16
|
+
the copyright owner that is granting the License.
|
|
17
|
+
|
|
18
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
19
|
+
other entities that control, are controlled by, or are under common
|
|
20
|
+
control with that entity. For the purposes of this definition,
|
|
21
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
22
|
+
direction or management of such entity, whether by contract or
|
|
23
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
24
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
25
|
+
|
|
26
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
27
|
+
exercising permissions granted by this License.
|
|
28
|
+
|
|
29
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
30
|
+
including but not limited to software source code, documentation
|
|
31
|
+
source, and configuration files.
|
|
32
|
+
|
|
33
|
+
"Object" form shall mean any form resulting from mechanical
|
|
34
|
+
transformation or translation of a Source form, including but
|
|
35
|
+
not limited to compiled object code, generated documentation,
|
|
36
|
+
and conversions to other media types.
|
|
37
|
+
|
|
38
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
39
|
+
Object form, made available under the License, as indicated by a
|
|
40
|
+
copyright notice that is included in or attached to the work
|
|
41
|
+
(an example is provided in the Appendix below).
|
|
42
|
+
|
|
43
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
44
|
+
form, that is based on (or derived from) the Work and for which the
|
|
45
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
46
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
47
|
+
of this License, Derivative Works shall not include works that remain
|
|
48
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
49
|
+
the Work and Derivative Works thereof.
|
|
50
|
+
|
|
51
|
+
"Contribution" shall mean any work of authorship, including
|
|
52
|
+
the original version of the Work and any modifications or additions
|
|
53
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
54
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
55
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
56
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
57
|
+
means any form of electronic, verbal, or written communication sent
|
|
58
|
+
to the Licensor or its representatives, including but not limited to
|
|
59
|
+
communication on electronic mailing lists, source code control systems,
|
|
60
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
61
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
62
|
+
excluding communication that is conspicuously marked or otherwise
|
|
63
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
64
|
+
|
|
65
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
66
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
67
|
+
subsequently incorporated within the Work.
|
|
68
|
+
|
|
69
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
70
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
71
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
72
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
73
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
74
|
+
Work and such Derivative Works in Source or Object form.
|
|
75
|
+
|
|
76
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
77
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
78
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
79
|
+
(except as stated in this section) patent license to make, have made,
|
|
80
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
81
|
+
where such license applies only to those patent claims licensable
|
|
82
|
+
by such Contributor that are necessarily infringed by their
|
|
83
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
84
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
85
|
+
institute patent litigation against any entity (including a
|
|
86
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
87
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
88
|
+
or contributory patent infringement, then any patent licenses
|
|
89
|
+
granted to You under this License for that Work shall terminate
|
|
90
|
+
as of the date such litigation is filed.
|
|
91
|
+
|
|
92
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
93
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
94
|
+
modifications, and in Source or Object form, provided that You
|
|
95
|
+
meet the following conditions:
|
|
96
|
+
|
|
97
|
+
(a) You must give any other recipients of the Work or
|
|
98
|
+
Derivative Works a copy of this License; and
|
|
99
|
+
|
|
100
|
+
(b) You must cause any modified files to carry prominent notices
|
|
101
|
+
stating that You changed the files; and
|
|
102
|
+
|
|
103
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
104
|
+
that You distribute, all copyright, patent, trademark, and
|
|
105
|
+
attribution notices from the Source form of the Work,
|
|
106
|
+
excluding those notices that do not pertain to any part of
|
|
107
|
+
the Derivative Works; and
|
|
108
|
+
|
|
109
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
110
|
+
distribution, then any Derivative Works that You distribute must
|
|
111
|
+
include a readable copy of the attribution notices contained
|
|
112
|
+
within such NOTICE file, excluding those notices that do not
|
|
113
|
+
pertain to any part of the Derivative Works, in at least one
|
|
114
|
+
of the following places: within a NOTICE text file distributed
|
|
115
|
+
as part of the Derivative Works; within the Source form or
|
|
116
|
+
documentation, if provided along with the Derivative Works; or,
|
|
117
|
+
within a display generated by the Derivative Works, if and
|
|
118
|
+
wherever such third-party notices normally appear. The contents
|
|
119
|
+
of the NOTICE file are for informational purposes only and
|
|
120
|
+
do not modify the License. You may add Your own attribution
|
|
121
|
+
notices within Derivative Works that You distribute, alongside
|
|
122
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
123
|
+
that such additional attribution notices cannot be construed
|
|
124
|
+
as modifying the License.
|
|
125
|
+
|
|
126
|
+
You may add Your own copyright statement to Your modifications and
|
|
127
|
+
may provide additional or different license terms and conditions
|
|
128
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
129
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
130
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
131
|
+
the conditions stated in this License.
|
|
132
|
+
|
|
133
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
134
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
135
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
136
|
+
this License, without any additional terms or conditions.
|
|
137
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
138
|
+
the terms of any separate license agreement you may have executed
|
|
139
|
+
with Licensor regarding such Contributions.
|
|
140
|
+
|
|
141
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
142
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
143
|
+
except as required for reasonable and customary use in describing the
|
|
144
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
145
|
+
|
|
146
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
147
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
148
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
149
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
150
|
+
implied, including, without limitation, any warranties or conditions
|
|
151
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
152
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
153
|
+
appropriateness of using or redistributing the Work and assume any
|
|
154
|
+
risks associated with Your exercise of permissions under this License.
|
|
155
|
+
|
|
156
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
157
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
158
|
+
unless required by applicable law (such as deliberate and grossly
|
|
159
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
160
|
+
liable to You for damages, including any direct, indirect, special,
|
|
161
|
+
incidental, or consequential damages of any character arising as a
|
|
162
|
+
result of this License or out of the use or inability to use the
|
|
163
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
164
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
165
|
+
other commercial damages or losses), even if such Contributor
|
|
166
|
+
has been advised of the possibility of such damages.
|
|
167
|
+
|
|
168
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
169
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
170
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
171
|
+
or other liability obligations and/or rights consistent with this
|
|
172
|
+
License. However, in accepting such obligations, You may act only
|
|
173
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
174
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
175
|
+
defend, and hold each Contributor harmless for any liability
|
|
176
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
177
|
+
of your accepting any such warranty or additional liability.
|
|
178
|
+
|
|
179
|
+
END OF TERMS AND CONDITIONS
|
|
180
|
+
|
|
181
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
182
|
+
|
|
183
|
+
To apply the Apache License to your work, attach the following
|
|
184
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
185
|
+
replaced with your own identifying information. (Don't include
|
|
186
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
187
|
+
comment syntax for the file format. We also recommend that a
|
|
188
|
+
file or class name and description of purpose be included on the
|
|
189
|
+
same "printed page" as the copyright notice for easier
|
|
190
|
+
identification within third-party archives.
|
|
191
|
+
|
|
192
|
+
Copyright [yyyy] [name of copyright owner]
|
|
193
|
+
|
|
194
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
195
|
+
you may not use this file except in compliance with the License.
|
|
196
|
+
You may obtain a copy of the License at
|
|
197
|
+
|
|
198
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
199
|
+
|
|
200
|
+
Unless required by applicable law or agreed to in writing, software
|
|
201
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
202
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
203
|
+
See the License for the specific language governing permissions and
|
|
204
|
+
limitations under the License.
|
package/README.md
CHANGED
|
@@ -144,7 +144,7 @@ const css = await getTypestylesMetadata(<Home />);
|
|
|
144
144
|
|
|
145
145
|
To ship a static stylesheet and avoid client-side `<style>` injection (uses `typestyles/build` under the hood):
|
|
146
146
|
|
|
147
|
-
1. Run **`buildTypestylesForNext({ root })`** before `next build`. It discovers the same **convention entry** as `@typestyles/vite` (see `DEFAULT_EXTRACT_MODULE_CANDIDATES` from `@typestyles/build-runner`) and by default writes **`app/typestyles.css`** plus **`app/typestyles.manifest.json`** (override paths or pass explicit `modules` when needed).
|
|
147
|
+
1. Run **`buildTypestylesForNext({ root })`** before `next build`. It discovers the same **convention entry** as `@typestyles/vite` (see `DEFAULT_EXTRACT_MODULE_CANDIDATES` from `@typestyles/build-runner`) and by default writes **`app/typestyles.css`** plus **`app/typestyles.manifest.json`** (override paths or pass explicit `modules` when needed). When `app/` exists, it also emits **per-route CSS** under `app/_typestyles/routes/` and a **manifest v2** `routes` map (`routeCss: false` to disable).
|
|
148
148
|
2. Import that CSS from your root layout (e.g. `import './typestyles.css'`).
|
|
149
149
|
3. Wrap config with **`withTypestyles`** from `@typestyles/next/build` — in **production**, if a convention entry exists, it applies **`withTypestylesExtract`**; in **development** it leaves your config unchanged so the runtime stays on.
|
|
150
150
|
|
|
@@ -167,6 +167,16 @@ You still typically run extraction before production builds (CI or `prebuild`).
|
|
|
167
167
|
|
|
168
168
|
## API Reference
|
|
169
169
|
|
|
170
|
+
### getRouteCss
|
|
171
|
+
|
|
172
|
+
Read pre-extracted CSS for an App Router route from the build manifest (v2). Falls back to the full-app stylesheet when no route entry exists.
|
|
173
|
+
|
|
174
|
+
```tsx
|
|
175
|
+
import { getRouteCss } from '@typestyles/next/server';
|
|
176
|
+
|
|
177
|
+
const css = getRouteCss('/about', { root: process.cwd() });
|
|
178
|
+
```
|
|
179
|
+
|
|
170
180
|
### getRegisteredCss
|
|
171
181
|
|
|
172
182
|
Returns all currently registered CSS as a string. This is the simplest way to get styles for SSR.
|
|
@@ -329,4 +339,4 @@ Ensure you have `"moduleResolution": "bundler"` or `"node"` in your `tsconfig.js
|
|
|
329
339
|
|
|
330
340
|
## License
|
|
331
341
|
|
|
332
|
-
|
|
342
|
+
Apache-2.0
|
package/dist/build.cjs
CHANGED
|
@@ -20,19 +20,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
20
20
|
// src/build.ts
|
|
21
21
|
var build_exports = {};
|
|
22
22
|
__export(build_exports, {
|
|
23
|
-
DEFAULT_EXTRACT_MODULE_CANDIDATES: () =>
|
|
23
|
+
DEFAULT_EXTRACT_MODULE_CANDIDATES: () => import_build_runner2.DEFAULT_EXTRACT_MODULE_CANDIDATES,
|
|
24
|
+
VerifyTypestylesBuildError: () => import_build_runner2.VerifyTypestylesBuildError,
|
|
24
25
|
buildTypestylesForNext: () => buildTypestylesForNext,
|
|
25
|
-
discoverDefaultExtractModules: () =>
|
|
26
|
+
discoverDefaultExtractModules: () => import_build_runner2.discoverDefaultExtractModules,
|
|
27
|
+
getRouteCss: () => import_build_runner2.getRouteCss,
|
|
28
|
+
verifyTypestylesBuild: () => import_build_runner2.verifyTypestylesBuild,
|
|
26
29
|
withTypestyles: () => withTypestyles,
|
|
27
30
|
withTypestylesExtract: () => withTypestylesExtract
|
|
28
31
|
});
|
|
29
32
|
module.exports = __toCommonJS(build_exports);
|
|
33
|
+
var import_node_fs = require("fs");
|
|
30
34
|
var import_promises = require("fs/promises");
|
|
31
35
|
var import_node_module = require("module");
|
|
32
36
|
var import_node_path = require("path");
|
|
33
37
|
var import_node_url = require("url");
|
|
34
38
|
var import_build_runner = require("@typestyles/build-runner");
|
|
35
39
|
var import_build = require("typestyles/build");
|
|
40
|
+
var import_build_runner2 = require("@typestyles/build-runner");
|
|
36
41
|
function resolveExtractModulesForNext(root, modules) {
|
|
37
42
|
if (modules !== void 0) {
|
|
38
43
|
return modules;
|
|
@@ -51,9 +56,12 @@ async function buildTypestylesForNext(options) {
|
|
|
51
56
|
modules,
|
|
52
57
|
cssOutFile = "app/typestyles.css",
|
|
53
58
|
manifestOutFile,
|
|
54
|
-
manifestCssPath
|
|
59
|
+
manifestCssPath,
|
|
60
|
+
routeCssOutDir = "app/_typestyles/routes",
|
|
61
|
+
appDir = "app"
|
|
55
62
|
} = options;
|
|
56
63
|
const resolvedModules = resolveExtractModulesForNext(root, modules);
|
|
64
|
+
const enableRouteCss = options.routeCss ?? discoverNextAppRoutesEnabled(root, appDir);
|
|
57
65
|
const loaders = resolvedModules.map((mod) => {
|
|
58
66
|
const abs = (0, import_node_path.resolve)(root, mod);
|
|
59
67
|
const href = (0, import_node_url.pathToFileURL)(abs).href;
|
|
@@ -65,16 +73,30 @@ async function buildTypestylesForNext(options) {
|
|
|
65
73
|
await (0, import_promises.writeFile)(outAbs, css, "utf8");
|
|
66
74
|
const manifestRel = manifestOutFile === false ? void 0 : manifestOutFile ?? "app/typestyles.manifest.json";
|
|
67
75
|
if (manifestRel) {
|
|
68
|
-
const
|
|
76
|
+
const cssPath = manifestCssPath ?? cssOutFile;
|
|
77
|
+
let manifest = {
|
|
69
78
|
version: 1,
|
|
70
|
-
css:
|
|
79
|
+
css: cssPath
|
|
71
80
|
};
|
|
81
|
+
if (enableRouteCss) {
|
|
82
|
+
const { routes } = await (0, import_build_runner.collectAndWriteRouteCss)({
|
|
83
|
+
root,
|
|
84
|
+
sharedModules: resolvedModules,
|
|
85
|
+
appDir,
|
|
86
|
+
routeCssOutDir,
|
|
87
|
+
collectCss: import_build.collectStylesFromModules
|
|
88
|
+
});
|
|
89
|
+
manifest = (0, import_build_runner.buildManifestV2)(cssPath, routes);
|
|
90
|
+
}
|
|
72
91
|
const manAbs = (0, import_node_path.resolve)(root, manifestRel);
|
|
73
92
|
await (0, import_promises.mkdir)((0, import_node_path.dirname)(manAbs), { recursive: true });
|
|
74
93
|
await (0, import_promises.writeFile)(manAbs, `${JSON.stringify(manifest, null, 2)}
|
|
75
94
|
`, "utf8");
|
|
76
95
|
}
|
|
77
96
|
}
|
|
97
|
+
function discoverNextAppRoutesEnabled(root, appDir) {
|
|
98
|
+
return (0, import_node_fs.existsSync)((0, import_node_path.resolve)(root, appDir));
|
|
99
|
+
}
|
|
78
100
|
function withTypestyles(nextConfig = {}, options = {}) {
|
|
79
101
|
const projectRoot = options.root ?? process.cwd();
|
|
80
102
|
const hasConventionEntry = (0, import_build_runner.discoverDefaultExtractModules)(projectRoot).length > 0;
|
|
@@ -119,8 +141,11 @@ function withTypestylesExtract(nextConfig = {}, options = {}) {
|
|
|
119
141
|
// Annotate the CommonJS export names for ESM import in node:
|
|
120
142
|
0 && (module.exports = {
|
|
121
143
|
DEFAULT_EXTRACT_MODULE_CANDIDATES,
|
|
144
|
+
VerifyTypestylesBuildError,
|
|
122
145
|
buildTypestylesForNext,
|
|
123
146
|
discoverDefaultExtractModules,
|
|
147
|
+
getRouteCss,
|
|
148
|
+
verifyTypestylesBuild,
|
|
124
149
|
withTypestyles,
|
|
125
150
|
withTypestylesExtract
|
|
126
151
|
});
|
package/dist/build.js
CHANGED
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
// src/build.ts
|
|
2
|
+
import { existsSync } from "fs";
|
|
2
3
|
import { mkdir, writeFile } from "fs/promises";
|
|
3
4
|
import { createRequire } from "module";
|
|
4
5
|
import { dirname, join, resolve } from "path";
|
|
5
6
|
import { pathToFileURL } from "url";
|
|
6
7
|
import {
|
|
7
|
-
|
|
8
|
+
buildManifestV2,
|
|
9
|
+
collectAndWriteRouteCss,
|
|
8
10
|
discoverDefaultExtractModules
|
|
9
11
|
} from "@typestyles/build-runner";
|
|
10
12
|
import { collectStylesFromModules } from "typestyles/build";
|
|
13
|
+
import {
|
|
14
|
+
DEFAULT_EXTRACT_MODULE_CANDIDATES,
|
|
15
|
+
discoverDefaultExtractModules as discoverDefaultExtractModules2,
|
|
16
|
+
verifyTypestylesBuild,
|
|
17
|
+
VerifyTypestylesBuildError,
|
|
18
|
+
getRouteCss
|
|
19
|
+
} from "@typestyles/build-runner";
|
|
11
20
|
function resolveExtractModulesForNext(root, modules) {
|
|
12
21
|
if (modules !== void 0) {
|
|
13
22
|
return modules;
|
|
@@ -26,9 +35,12 @@ async function buildTypestylesForNext(options) {
|
|
|
26
35
|
modules,
|
|
27
36
|
cssOutFile = "app/typestyles.css",
|
|
28
37
|
manifestOutFile,
|
|
29
|
-
manifestCssPath
|
|
38
|
+
manifestCssPath,
|
|
39
|
+
routeCssOutDir = "app/_typestyles/routes",
|
|
40
|
+
appDir = "app"
|
|
30
41
|
} = options;
|
|
31
42
|
const resolvedModules = resolveExtractModulesForNext(root, modules);
|
|
43
|
+
const enableRouteCss = options.routeCss ?? discoverNextAppRoutesEnabled(root, appDir);
|
|
32
44
|
const loaders = resolvedModules.map((mod) => {
|
|
33
45
|
const abs = resolve(root, mod);
|
|
34
46
|
const href = pathToFileURL(abs).href;
|
|
@@ -40,16 +52,30 @@ async function buildTypestylesForNext(options) {
|
|
|
40
52
|
await writeFile(outAbs, css, "utf8");
|
|
41
53
|
const manifestRel = manifestOutFile === false ? void 0 : manifestOutFile ?? "app/typestyles.manifest.json";
|
|
42
54
|
if (manifestRel) {
|
|
43
|
-
const
|
|
55
|
+
const cssPath = manifestCssPath ?? cssOutFile;
|
|
56
|
+
let manifest = {
|
|
44
57
|
version: 1,
|
|
45
|
-
css:
|
|
58
|
+
css: cssPath
|
|
46
59
|
};
|
|
60
|
+
if (enableRouteCss) {
|
|
61
|
+
const { routes } = await collectAndWriteRouteCss({
|
|
62
|
+
root,
|
|
63
|
+
sharedModules: resolvedModules,
|
|
64
|
+
appDir,
|
|
65
|
+
routeCssOutDir,
|
|
66
|
+
collectCss: collectStylesFromModules
|
|
67
|
+
});
|
|
68
|
+
manifest = buildManifestV2(cssPath, routes);
|
|
69
|
+
}
|
|
47
70
|
const manAbs = resolve(root, manifestRel);
|
|
48
71
|
await mkdir(dirname(manAbs), { recursive: true });
|
|
49
72
|
await writeFile(manAbs, `${JSON.stringify(manifest, null, 2)}
|
|
50
73
|
`, "utf8");
|
|
51
74
|
}
|
|
52
75
|
}
|
|
76
|
+
function discoverNextAppRoutesEnabled(root, appDir) {
|
|
77
|
+
return existsSync(resolve(root, appDir));
|
|
78
|
+
}
|
|
53
79
|
function withTypestyles(nextConfig = {}, options = {}) {
|
|
54
80
|
const projectRoot = options.root ?? process.cwd();
|
|
55
81
|
const hasConventionEntry = discoverDefaultExtractModules(projectRoot).length > 0;
|
|
@@ -93,8 +119,11 @@ function withTypestylesExtract(nextConfig = {}, options = {}) {
|
|
|
93
119
|
}
|
|
94
120
|
export {
|
|
95
121
|
DEFAULT_EXTRACT_MODULE_CANDIDATES,
|
|
122
|
+
VerifyTypestylesBuildError,
|
|
96
123
|
buildTypestylesForNext,
|
|
97
|
-
discoverDefaultExtractModules,
|
|
124
|
+
discoverDefaultExtractModules2 as discoverDefaultExtractModules,
|
|
125
|
+
getRouteCss,
|
|
126
|
+
verifyTypestylesBuild,
|
|
98
127
|
withTypestyles,
|
|
99
128
|
withTypestylesExtract
|
|
100
129
|
};
|
package/dist/client.cjs
CHANGED
|
@@ -32,10 +32,9 @@ var import_server = require("typestyles/server");
|
|
|
32
32
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
33
33
|
function useTypestyles() {
|
|
34
34
|
return (0, import_react.useSyncExternalStore)(
|
|
35
|
-
|
|
36
|
-
},
|
|
35
|
+
import_server.subscribeRegisteredCss,
|
|
37
36
|
() => (0, import_server.getRegisteredCss)(),
|
|
38
|
-
() =>
|
|
37
|
+
() => (0, import_server.getRegisteredCss)()
|
|
39
38
|
);
|
|
40
39
|
}
|
|
41
40
|
function TypestylesStylesheet({ children }) {
|
package/dist/client.js
CHANGED
|
@@ -2,14 +2,13 @@
|
|
|
2
2
|
|
|
3
3
|
// src/client.tsx
|
|
4
4
|
import { useState, useEffect, useServerInsertedHTML, useSyncExternalStore } from "react";
|
|
5
|
-
import { getRegisteredCss } from "typestyles/server";
|
|
5
|
+
import { getRegisteredCss, subscribeRegisteredCss } from "typestyles/server";
|
|
6
6
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
7
7
|
function useTypestyles() {
|
|
8
8
|
return useSyncExternalStore(
|
|
9
|
-
|
|
10
|
-
},
|
|
9
|
+
subscribeRegisteredCss,
|
|
11
10
|
() => getRegisteredCss(),
|
|
12
|
-
() =>
|
|
11
|
+
() => getRegisteredCss()
|
|
13
12
|
);
|
|
14
13
|
}
|
|
15
14
|
function TypestylesStylesheet({ children }) {
|
package/dist/index.cjs
CHANGED
|
@@ -42,6 +42,7 @@ module.exports = __toCommonJS(index_exports);
|
|
|
42
42
|
|
|
43
43
|
// src/server.ts
|
|
44
44
|
var import_server = require("typestyles/server");
|
|
45
|
+
var import_build_runner = require("@typestyles/build-runner");
|
|
45
46
|
async function collectStylesFromComponent(component) {
|
|
46
47
|
const { renderToString } = await import("react-dom/server");
|
|
47
48
|
const { css } = (0, import_server.collectStyles)(() => renderToString(component));
|
|
@@ -57,10 +58,9 @@ var import_server2 = require("typestyles/server");
|
|
|
57
58
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
58
59
|
function useTypestyles() {
|
|
59
60
|
return (0, import_react.useSyncExternalStore)(
|
|
60
|
-
|
|
61
|
-
},
|
|
61
|
+
import_server2.subscribeRegisteredCss,
|
|
62
62
|
() => (0, import_server2.getRegisteredCss)(),
|
|
63
|
-
() =>
|
|
63
|
+
() => (0, import_server2.getRegisteredCss)()
|
|
64
64
|
);
|
|
65
65
|
}
|
|
66
66
|
function TypestylesStylesheet({ children }) {
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// src/server.ts
|
|
2
2
|
import { collectStyles, getRegisteredCss } from "typestyles/server";
|
|
3
|
+
import { getRouteCss } from "@typestyles/build-runner";
|
|
3
4
|
async function collectStylesFromComponent(component) {
|
|
4
5
|
const { renderToString } = await import("react-dom/server");
|
|
5
6
|
const { css } = collectStyles(() => renderToString(component));
|
|
@@ -11,14 +12,13 @@ async function getTypestylesMetadata(component) {
|
|
|
11
12
|
|
|
12
13
|
// src/client.tsx
|
|
13
14
|
import { useState, useEffect, useServerInsertedHTML, useSyncExternalStore } from "react";
|
|
14
|
-
import { getRegisteredCss as getRegisteredCss2 } from "typestyles/server";
|
|
15
|
+
import { getRegisteredCss as getRegisteredCss2, subscribeRegisteredCss } from "typestyles/server";
|
|
15
16
|
import { Fragment, jsx, jsxs } from "react/jsx-runtime";
|
|
16
17
|
function useTypestyles() {
|
|
17
18
|
return useSyncExternalStore(
|
|
18
|
-
|
|
19
|
-
},
|
|
19
|
+
subscribeRegisteredCss,
|
|
20
20
|
() => getRegisteredCss2(),
|
|
21
|
-
() =>
|
|
21
|
+
() => getRegisteredCss2()
|
|
22
22
|
);
|
|
23
23
|
}
|
|
24
24
|
function TypestylesStylesheet({ children }) {
|
package/dist/server.cjs
CHANGED
|
@@ -32,10 +32,12 @@ var server_exports = {};
|
|
|
32
32
|
__export(server_exports, {
|
|
33
33
|
collectStylesFromComponent: () => collectStylesFromComponent,
|
|
34
34
|
getRegisteredCss: () => import_server.getRegisteredCss,
|
|
35
|
+
getRouteCss: () => import_build_runner.getRouteCss,
|
|
35
36
|
getTypestylesMetadata: () => getTypestylesMetadata
|
|
36
37
|
});
|
|
37
38
|
module.exports = __toCommonJS(server_exports);
|
|
38
39
|
var import_server = require("typestyles/server");
|
|
40
|
+
var import_build_runner = require("@typestyles/build-runner");
|
|
39
41
|
async function collectStylesFromComponent(component) {
|
|
40
42
|
const { renderToString } = await import("react-dom/server");
|
|
41
43
|
const { css } = (0, import_server.collectStyles)(() => renderToString(component));
|
|
@@ -48,5 +50,6 @@ async function getTypestylesMetadata(component) {
|
|
|
48
50
|
0 && (module.exports = {
|
|
49
51
|
collectStylesFromComponent,
|
|
50
52
|
getRegisteredCss,
|
|
53
|
+
getRouteCss,
|
|
51
54
|
getTypestylesMetadata
|
|
52
55
|
});
|
package/dist/server.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// src/server.ts
|
|
2
2
|
import { collectStyles, getRegisteredCss } from "typestyles/server";
|
|
3
|
+
import { getRouteCss } from "@typestyles/build-runner";
|
|
3
4
|
async function collectStylesFromComponent(component) {
|
|
4
5
|
const { renderToString } = await import("react-dom/server");
|
|
5
6
|
const { css } = collectStyles(() => renderToString(component));
|
|
@@ -11,5 +12,6 @@ async function getTypestylesMetadata(component) {
|
|
|
11
12
|
export {
|
|
12
13
|
collectStylesFromComponent,
|
|
13
14
|
getRegisteredCss,
|
|
15
|
+
getRouteCss,
|
|
14
16
|
getTypestylesMetadata
|
|
15
17
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typestyles/next",
|
|
3
|
-
"version": "0.0.0-unstable.
|
|
3
|
+
"version": "0.0.0-unstable.8e0520fa003f",
|
|
4
4
|
"description": "Next.js integration for typestyles SSR",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.cjs",
|
|
@@ -40,10 +40,10 @@
|
|
|
40
40
|
"ssr",
|
|
41
41
|
"react"
|
|
42
42
|
],
|
|
43
|
-
"license": "
|
|
43
|
+
"license": "Apache-2.0",
|
|
44
44
|
"repository": {
|
|
45
45
|
"type": "git",
|
|
46
|
-
"url": "https://github.com/
|
|
46
|
+
"url": "https://github.com/type-styles/typestyles",
|
|
47
47
|
"directory": "packages/next"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
}
|
|
69
69
|
},
|
|
70
70
|
"dependencies": {
|
|
71
|
-
"@typestyles/build-runner": "0.0.0-unstable.
|
|
71
|
+
"@typestyles/build-runner": "0.0.0-unstable.8e0520fa003f"
|
|
72
72
|
},
|
|
73
73
|
"devDependencies": {
|
|
74
74
|
"eslint": "^9.39.2",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"react": "^18.0.0",
|
|
81
81
|
"react-dom": "^18.0.0",
|
|
82
82
|
"tsup": "^8.0.0",
|
|
83
|
-
"typestyles": "0.0.0-unstable.
|
|
83
|
+
"typestyles": "0.0.0-unstable.8e0520fa003f",
|
|
84
84
|
"typescript": "^5.4.0",
|
|
85
85
|
"webpack": "^5.97.1"
|
|
86
86
|
},
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { describe, expect, it } from 'vitest';
|
|
5
|
+
import { buildTypestylesForNext } from './build';
|
|
6
|
+
|
|
7
|
+
describe('buildTypestylesForNext route CSS', () => {
|
|
8
|
+
it('emits manifest v2 with per-route CSS files', async () => {
|
|
9
|
+
const root = mkdtempSync(join(tmpdir(), 'typestyles-next-build-routes-'));
|
|
10
|
+
mkdirSync(join(root, 'styles'), { recursive: true });
|
|
11
|
+
mkdirSync(join(root, 'app/about'), { recursive: true });
|
|
12
|
+
|
|
13
|
+
writeFileSync(
|
|
14
|
+
join(root, 'styles/typestyles-entry.ts'),
|
|
15
|
+
`import { styles } from 'typestyles';\nstyles.class('shared', { margin: '0' });\n`,
|
|
16
|
+
);
|
|
17
|
+
writeFileSync(
|
|
18
|
+
join(root, 'app/layout.tsx'),
|
|
19
|
+
`export default function Layout() { return null; }\n`,
|
|
20
|
+
);
|
|
21
|
+
writeFileSync(
|
|
22
|
+
join(root, 'app/page.tsx'),
|
|
23
|
+
`import { styles } from 'typestyles';\nstyles.class('home', { color: 'red' });\nexport default function Home() { return null; }\n`,
|
|
24
|
+
);
|
|
25
|
+
writeFileSync(
|
|
26
|
+
join(root, 'app/about/page.tsx'),
|
|
27
|
+
`import { styles } from 'typestyles';\nstyles.class('about', { color: 'blue' });\nexport default function About() { return null; }\n`,
|
|
28
|
+
);
|
|
29
|
+
|
|
30
|
+
try {
|
|
31
|
+
await buildTypestylesForNext({ root });
|
|
32
|
+
|
|
33
|
+
const manifest = JSON.parse(readFileSync(join(root, 'app/typestyles.manifest.json'), 'utf8'));
|
|
34
|
+
expect(manifest.version).toBe(2);
|
|
35
|
+
expect(manifest.routes['/']).toBeDefined();
|
|
36
|
+
expect(manifest.routes['/about']).toBeDefined();
|
|
37
|
+
expect(existsSync(join(root, manifest.routes['/'].css))).toBe(true);
|
|
38
|
+
expect(existsSync(join(root, manifest.routes['/about'].css))).toBe(true);
|
|
39
|
+
|
|
40
|
+
const homeCss = readFileSync(join(root, manifest.routes['/'].css), 'utf8');
|
|
41
|
+
const aboutCss = readFileSync(join(root, manifest.routes['/about'].css), 'utf8');
|
|
42
|
+
expect(homeCss).toContain('.home {');
|
|
43
|
+
expect(aboutCss).toContain('.about {');
|
|
44
|
+
} finally {
|
|
45
|
+
rmSync(root, { recursive: true, force: true });
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
});
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { describe, expect, it } from 'vitest';
|
|
5
|
+
import { buildTypestylesForNext, verifyTypestylesBuild } from './build';
|
|
6
|
+
|
|
7
|
+
describe('buildTypestylesForNext theme extraction', () => {
|
|
8
|
+
it('extracts tokens.create and createTheme CSS into the global stylesheet', async () => {
|
|
9
|
+
const root = mkdtempSync(join(tmpdir(), 'typestyles-next-theme-'));
|
|
10
|
+
mkdirSync(join(root, 'styles'), { recursive: true });
|
|
11
|
+
|
|
12
|
+
writeFileSync(
|
|
13
|
+
join(root, 'styles/typestyles-entry.ts'),
|
|
14
|
+
`import { tokens, createTheme } from 'typestyles';
|
|
15
|
+
const color = tokens.create('next-color', { primary: '#0066ff' });
|
|
16
|
+
createTheme('next-dark', { base: { 'next-color': { primary: '#66aaff' } } });
|
|
17
|
+
`,
|
|
18
|
+
);
|
|
19
|
+
|
|
20
|
+
try {
|
|
21
|
+
await buildTypestylesForNext({ root });
|
|
22
|
+
|
|
23
|
+
// Theme/token CSS is a byproduct of normal extraction — verify with the P1.7 build verifier.
|
|
24
|
+
const result = verifyTypestylesBuild({
|
|
25
|
+
root,
|
|
26
|
+
cssFile: 'app/typestyles.css',
|
|
27
|
+
manifestFile: 'app/typestyles.manifest.json',
|
|
28
|
+
requiredCssSubstrings: [
|
|
29
|
+
'--next-color-primary: #0066ff',
|
|
30
|
+
'.theme-next-dark',
|
|
31
|
+
'--next-color-primary: #66aaff',
|
|
32
|
+
],
|
|
33
|
+
});
|
|
34
|
+
expect(result.cssBytes).toBeGreaterThan(0);
|
|
35
|
+
expect(result.manifestVersion).toBe(1);
|
|
36
|
+
} finally {
|
|
37
|
+
rmSync(root, { recursive: true, force: true });
|
|
38
|
+
}
|
|
39
|
+
});
|
|
40
|
+
});
|
package/src/build.d.ts
CHANGED
|
@@ -5,6 +5,18 @@ export interface TypestylesExtractManifestV1 {
|
|
|
5
5
|
css: string;
|
|
6
6
|
}
|
|
7
7
|
|
|
8
|
+
export interface TypestylesRouteCssEntry {
|
|
9
|
+
css: string;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export interface TypestylesExtractManifestV2 {
|
|
13
|
+
version: 2;
|
|
14
|
+
css: string;
|
|
15
|
+
routes: Record<string, TypestylesRouteCssEntry>;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export type TypestylesExtractManifest = TypestylesExtractManifestV1 | TypestylesExtractManifestV2;
|
|
19
|
+
|
|
8
20
|
export declare const DEFAULT_EXTRACT_MODULE_CANDIDATES: readonly string[];
|
|
9
21
|
|
|
10
22
|
export declare function discoverDefaultExtractModules(root: string): string[];
|
|
@@ -15,6 +27,9 @@ export interface BuildTypestylesForNextOptions {
|
|
|
15
27
|
cssOutFile?: string;
|
|
16
28
|
manifestOutFile?: string | false;
|
|
17
29
|
manifestCssPath?: string;
|
|
30
|
+
routeCss?: boolean;
|
|
31
|
+
routeCssOutDir?: string;
|
|
32
|
+
appDir?: string;
|
|
18
33
|
}
|
|
19
34
|
|
|
20
35
|
export declare function buildTypestylesForNext(
|
|
@@ -39,3 +54,17 @@ export declare function withTypestylesExtract(
|
|
|
39
54
|
nextConfig?: NextConfig,
|
|
40
55
|
options?: WithTypestylesExtractOptions,
|
|
41
56
|
): NextConfig;
|
|
57
|
+
|
|
58
|
+
export interface GetRouteCssOptions {
|
|
59
|
+
root: string;
|
|
60
|
+
manifestFile?: string;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
export declare function getRouteCss(routePath: string, options: GetRouteCssOptions): string;
|
|
64
|
+
|
|
65
|
+
export {
|
|
66
|
+
verifyTypestylesBuild,
|
|
67
|
+
VerifyTypestylesBuildError,
|
|
68
|
+
type VerifyTypestylesBuildOptions,
|
|
69
|
+
type VerifyTypestylesBuildResult,
|
|
70
|
+
} from '@typestyles/build-runner';
|
package/src/build.test.ts
CHANGED
|
@@ -30,7 +30,11 @@ describe('withTypestylesExtract', () => {
|
|
|
30
30
|
});
|
|
31
31
|
const merged = withTypestylesExtract({ webpack: userWebpack });
|
|
32
32
|
const config = { plugins: [] as unknown[] };
|
|
33
|
-
const
|
|
33
|
+
const webpackHook = merged.webpack;
|
|
34
|
+
if (typeof webpackHook !== 'function') {
|
|
35
|
+
throw new Error('expected webpack hook');
|
|
36
|
+
}
|
|
37
|
+
const result = webpackHook(
|
|
34
38
|
config as Configuration,
|
|
35
39
|
{
|
|
36
40
|
isServer: false,
|
|
@@ -82,7 +86,11 @@ describe('withTypestylesExtract', () => {
|
|
|
82
86
|
const webpackMod = await import('webpack');
|
|
83
87
|
const merged = withTypestylesExtract({});
|
|
84
88
|
const config = { plugins: [] as unknown[] };
|
|
85
|
-
const
|
|
89
|
+
const webpackHook = merged.webpack;
|
|
90
|
+
if (typeof webpackHook !== 'function') {
|
|
91
|
+
throw new Error('expected webpack hook');
|
|
92
|
+
}
|
|
93
|
+
const result = webpackHook(
|
|
86
94
|
config as Configuration,
|
|
87
95
|
{
|
|
88
96
|
isServer: true,
|
package/src/build.ts
CHANGED
|
@@ -1,22 +1,31 @@
|
|
|
1
|
+
import { existsSync } from 'node:fs';
|
|
1
2
|
import { mkdir, writeFile } from 'node:fs/promises';
|
|
2
3
|
import { createRequire } from 'node:module';
|
|
3
4
|
import { dirname, join, resolve } from 'node:path';
|
|
4
5
|
import { pathToFileURL } from 'node:url';
|
|
5
6
|
import {
|
|
6
|
-
|
|
7
|
+
buildManifestV2,
|
|
8
|
+
collectAndWriteRouteCss,
|
|
7
9
|
discoverDefaultExtractModules,
|
|
10
|
+
type TypestylesExtractManifestV1,
|
|
11
|
+
type TypestylesExtractManifestV2,
|
|
8
12
|
} from '@typestyles/build-runner';
|
|
9
13
|
import { collectStylesFromModules } from 'typestyles/build';
|
|
10
14
|
import type { NextConfig } from 'next';
|
|
11
15
|
|
|
12
16
|
/** Re-export shared convention paths (aligned with `@typestyles/vite`). */
|
|
13
|
-
export {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
export {
|
|
18
|
+
DEFAULT_EXTRACT_MODULE_CANDIDATES,
|
|
19
|
+
discoverDefaultExtractModules,
|
|
20
|
+
verifyTypestylesBuild,
|
|
21
|
+
VerifyTypestylesBuildError,
|
|
22
|
+
getRouteCss,
|
|
23
|
+
type TypestylesExtractManifestV1,
|
|
24
|
+
type TypestylesExtractManifestV2,
|
|
25
|
+
type VerifyTypestylesBuildOptions,
|
|
26
|
+
type VerifyTypestylesBuildResult,
|
|
27
|
+
type GetRouteCssOptions,
|
|
28
|
+
} from '@typestyles/build-runner';
|
|
20
29
|
|
|
21
30
|
/** Shape of `require('webpack')` for `DefinePlugin` only (webpack is an optional peer). */
|
|
22
31
|
type WebpackWithDefinePlugin = {
|
|
@@ -39,6 +48,15 @@ export interface BuildTypestylesForNextOptions {
|
|
|
39
48
|
manifestOutFile?: string | false;
|
|
40
49
|
/** Value stored in the manifest `css` field. Defaults to `cssOutFile`. */
|
|
41
50
|
manifestCssPath?: string;
|
|
51
|
+
/**
|
|
52
|
+
* Emit per-route critical CSS for App Router pages and include mappings in the manifest (v2).
|
|
53
|
+
* Defaults to `true` when an `app/` directory exists under `root`.
|
|
54
|
+
*/
|
|
55
|
+
routeCss?: boolean;
|
|
56
|
+
/** Output directory for per-route CSS relative to `root`. Default: `app/_typestyles/routes`. */
|
|
57
|
+
routeCssOutDir?: string;
|
|
58
|
+
/** App Router directory relative to `root`. Default: `app`. */
|
|
59
|
+
appDir?: string;
|
|
42
60
|
}
|
|
43
61
|
|
|
44
62
|
function resolveExtractModulesForNext(root: string, modules?: string[]): string[] {
|
|
@@ -60,6 +78,9 @@ function resolveExtractModulesForNext(root: string, modules?: string[]): string[
|
|
|
60
78
|
*
|
|
61
79
|
* Defaults mirror `@typestyles/vite`: discovers a convention entry when `modules` is omitted,
|
|
62
80
|
* writes `app/typestyles.css` and `app/typestyles.manifest.json` unless overridden.
|
|
81
|
+
*
|
|
82
|
+
* When route CSS is enabled (default for App Router apps), the manifest is v2 and includes
|
|
83
|
+
* per-route CSS paths under `app/_typestyles/routes/` (override with `routeCssOutDir`).
|
|
63
84
|
*/
|
|
64
85
|
export async function buildTypestylesForNext(
|
|
65
86
|
options: BuildTypestylesForNextOptions,
|
|
@@ -70,9 +91,12 @@ export async function buildTypestylesForNext(
|
|
|
70
91
|
cssOutFile = 'app/typestyles.css',
|
|
71
92
|
manifestOutFile,
|
|
72
93
|
manifestCssPath,
|
|
94
|
+
routeCssOutDir = 'app/_typestyles/routes',
|
|
95
|
+
appDir = 'app',
|
|
73
96
|
} = options;
|
|
74
97
|
|
|
75
98
|
const resolvedModules = resolveExtractModulesForNext(root, modules);
|
|
99
|
+
const enableRouteCss = options.routeCss ?? discoverNextAppRoutesEnabled(root, appDir);
|
|
76
100
|
|
|
77
101
|
const loaders = resolvedModules.map((mod) => {
|
|
78
102
|
const abs = resolve(root, mod);
|
|
@@ -88,16 +112,33 @@ export async function buildTypestylesForNext(
|
|
|
88
112
|
manifestOutFile === false ? undefined : (manifestOutFile ?? 'app/typestyles.manifest.json');
|
|
89
113
|
|
|
90
114
|
if (manifestRel) {
|
|
91
|
-
const
|
|
115
|
+
const cssPath = manifestCssPath ?? cssOutFile;
|
|
116
|
+
let manifest: TypestylesExtractManifestV1 | TypestylesExtractManifestV2 = {
|
|
92
117
|
version: 1,
|
|
93
|
-
css:
|
|
118
|
+
css: cssPath,
|
|
94
119
|
};
|
|
120
|
+
|
|
121
|
+
if (enableRouteCss) {
|
|
122
|
+
const { routes } = await collectAndWriteRouteCss({
|
|
123
|
+
root,
|
|
124
|
+
sharedModules: resolvedModules,
|
|
125
|
+
appDir,
|
|
126
|
+
routeCssOutDir,
|
|
127
|
+
collectCss: collectStylesFromModules,
|
|
128
|
+
});
|
|
129
|
+
manifest = buildManifestV2(cssPath, routes);
|
|
130
|
+
}
|
|
131
|
+
|
|
95
132
|
const manAbs = resolve(root, manifestRel);
|
|
96
133
|
await mkdir(dirname(manAbs), { recursive: true });
|
|
97
134
|
await writeFile(manAbs, `${JSON.stringify(manifest, null, 2)}\n`, 'utf8');
|
|
98
135
|
}
|
|
99
136
|
}
|
|
100
137
|
|
|
138
|
+
function discoverNextAppRoutesEnabled(root: string, appDir: string): boolean {
|
|
139
|
+
return existsSync(resolve(root, appDir));
|
|
140
|
+
}
|
|
141
|
+
|
|
101
142
|
export interface WithTypestylesExtractOptions {
|
|
102
143
|
/**
|
|
103
144
|
* When true (default), client bundles skip DOM style injection (`__TYPESTYLES_RUNTIME_DISABLED__`).
|
package/src/client.tsx
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
|
|
3
3
|
import React, { useState, useEffect, useServerInsertedHTML, useSyncExternalStore } from 'react';
|
|
4
|
-
import { getRegisteredCss } from 'typestyles/server';
|
|
4
|
+
import { getRegisteredCss, subscribeRegisteredCss } from 'typestyles/server';
|
|
5
5
|
|
|
6
6
|
/**
|
|
7
7
|
* Subscribe to typestyles CSS changes. Use this in client components
|
|
8
8
|
* that need to stay up-to-date with dynamically registered styles.
|
|
9
|
+
* Re-renders whenever new CSS rules are registered on the client.
|
|
9
10
|
*
|
|
10
11
|
* @example
|
|
11
12
|
* ```tsx
|
|
@@ -21,9 +22,9 @@ import { getRegisteredCss } from 'typestyles/server';
|
|
|
21
22
|
*/
|
|
22
23
|
export function useTypestyles() {
|
|
23
24
|
return useSyncExternalStore(
|
|
24
|
-
|
|
25
|
+
subscribeRegisteredCss,
|
|
26
|
+
() => getRegisteredCss(),
|
|
25
27
|
() => getRegisteredCss(),
|
|
26
|
-
() => '',
|
|
27
28
|
);
|
|
28
29
|
}
|
|
29
30
|
|
package/src/server.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { ReactElement } from 'react';
|
|
2
|
+
import type { GetRouteCssOptions } from '@typestyles/build-runner';
|
|
2
3
|
|
|
3
4
|
export { getRegisteredCss } from 'typestyles/server';
|
|
5
|
+
export { getRouteCss, type GetRouteCssOptions };
|
|
4
6
|
|
|
5
7
|
export declare function collectStylesFromComponent(component: ReactElement): Promise<string>;
|
|
6
8
|
|
package/src/server.ts
CHANGED
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
* These functions can be used in Server Components without adding "use client".
|
|
4
4
|
*/
|
|
5
5
|
import { collectStyles, getRegisteredCss } from 'typestyles/server';
|
|
6
|
+
import { getRouteCss, type GetRouteCssOptions } from '@typestyles/build-runner';
|
|
6
7
|
|
|
7
|
-
export { getRegisteredCss };
|
|
8
|
+
export { getRegisteredCss, getRouteCss, type GetRouteCssOptions };
|
|
8
9
|
|
|
9
10
|
/**
|
|
10
11
|
* Collect styles from a React component and return them as a string.
|