feat(rspack): add missing features (less/sass/stylus, assets, etc.) (#160)

This commit is contained in:
Jack Hsu 2023-03-02 08:11:46 -05:00 committed by GitHub
parent 0850023f71
commit 133bd2c273
33 changed files with 1417 additions and 181 deletions

View File

@ -1,11 +1,81 @@
# rspack
<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
This library was generated with [Nx](https://nx.dev).
<hr>
## Building
# Nx: Smart, Fast and Extensible Build System
Run `nx build rspack` to build the library.
Nx is a next generation build system with first class monorepo support and powerful integrations.
## Running unit tests
This package is a Rspack plugin for Nx.
Run `nx test rspack` to execute the unit tests via [Jest](https://jestjs.io).
## Getting Started
Use `--preset=@nrwl/rspack` when creating new workspace.
e.g.
```bash
npx create-nx-workspace@latest rspack-demo --preset=@nrwl/rspack
```
Now, you can go into the `rspack-demo` folder and start development.
```bash
cd rspack-demo
npm start
```
You can also run lint, test, and e2e scripts for the project.
```bash
npm run lint
npm run test
npm run e2e
```
## Existing workspaces
You can add Rspack to any existing Nx workspace.
First, install the plugin:
```bash
npm install --save-dev @nrwl/rspack
```
Then, run the `rspack-project` generator:
```bash
npx nx g @nrwl/rspack:rspack-project --skipValidation
```
**Note:** The `--skipValidation` option allows you to overwrite existing build targets.
## Workspace libraries
The `@nrwl/rspack` executor support importing workspace libs into the app.
```bash
npx nx g @nrwl/react:lib mylib
```
Import the new library in your app.
```typescript jsx
// src/app/app.tsx
import { Mylib } from '@rspack-demo/mylib';
// ...
export default function App() {
return <MyLib />;
}
```
Now, run the dev server again to see the new library in action.
```bash
npm start
```
**Note:** You must restart the server if you make any changes to your library.

View File

@ -6,19 +6,26 @@
"rspack-project": {
"factory": "./src/generators/rspack-project/rspack-project",
"schema": "./src/generators/rspack-project/schema.json",
"description": "rspack generator"
"description": "Rspack project generator."
},
"init": {
"factory": "./src/generators/init/init",
"schema": "./src/generators/init/schema.json",
"description": "init generator",
"description": "Rspack init generator.",
"hidden": true
},
"preset": {
"factory": "./src/generators/preset/preset",
"schema": "./src/generators/preset/schema.json",
"description": "preset generator",
"description": "React preset generator.",
"hidden": true
},
"application": {
"factory": "./src/generators/application/application",
"schema": "./src/generators/application/schema.json",
"aliases": ["app"],
"x-type": "application",
"description": "React application generator."
}
}
}

View File

@ -1,6 +1,6 @@
{
"name": "@nrwl/rspack",
"version": "15.7.0-beta.1",
"version": "0.0.1",
"type": "commonjs",
"repository": {
"type": "git",
@ -19,7 +19,11 @@
"generators": "./generators.json",
"executors": "./executors.json",
"dependencies": {
"@nrwl/devkit": "^15.7.2",
"copy-webpack-plugin": "^10.2.4"
"@nrwl/linter": "^15.8.1",
"@nrwl/devkit": "^15.8.1",
"ajv": "^8.12.0",
"sass-loader": "^12.2.0",
"stylus-loader": "^7.1.0",
"less-loader": "11.1.0"
}
}

View File

@ -0,0 +1,110 @@
import {
addDependenciesToPackageJson,
addProjectConfiguration,
ensurePackage,
formatFiles,
generateFiles,
joinPathFragments,
names,
offsetFromRoot as _offsetFromRoot,
Tree,
} from '@nrwl/devkit';
import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
import { version as nxVersion } from 'nx/package.json';
import * as path from 'path';
import {
lessVersion,
reactDomVersion,
reactVersion,
sassVersion,
stylusVersion,
typesReactDomVersion,
typesReactVersion,
} from '../../utils/versions';
import projectGenerator from '../rspack-project/rspack-project';
import { addCypress } from './lib/add-cypress';
import { addJest } from './lib/add-jest';
import { addLinting } from './lib/add-linting';
import { createTsConfig } from './lib/create-ts-config';
import { normalizeOptions } from './lib/normalize-options';
import { ApplicationGeneratorSchema, NormalizedSchema } from './schema';
export default async function (
tree: Tree,
_options: ApplicationGeneratorSchema
) {
await ensurePackage(tree, '@nrwl/react', nxVersion);
// eslint-disable-next-line @typescript-eslint/no-var-requires
const { reactInitGenerator } = require('@nrwl/react');
const tasks = [];
const options = normalizeOptions(tree, _options);
options.style ??= 'css';
addProjectConfiguration(tree, options.name, {
root: options.appProjectRoot,
projectType: 'application',
sourceRoot: `${options.appProjectRoot}/src`,
targets: {},
});
const offsetFromRoot = _offsetFromRoot(options.appProjectRoot);
generateFiles(tree, path.join(__dirname, 'files'), options.appProjectRoot, {
...options,
...names(options.name),
offsetFromRoot,
template: '',
});
createTsConfig(
tree,
options,
joinPathFragments(offsetFromRoot, 'tsconfig.base.json')
);
const projectTask = await projectGenerator(tree, {
project: options.name,
devServer: true,
tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
uiFramework: 'react',
target: 'web',
main: joinPathFragments(options.appProjectRoot, 'src/main.tsx'),
});
tasks.push(projectTask);
const jestTask = await addJest(tree, options);
tasks.push(jestTask);
const cypressTask = await addCypress(tree, options);
tasks.push(cypressTask);
const lintTask = await addLinting(tree, options);
tasks.push(lintTask);
const installTask = addDependenciesToPackageJson(
tree,
{ react: reactVersion, 'react-dom': reactDomVersion },
{
...getStyleDependency(options),
'@nrwl/react': nxVersion,
'@types/react': typesReactVersion,
'@types/react-dom': typesReactDomVersion,
}
);
tasks.push(installTask);
const reactInitTask = await reactInitGenerator(tree, options);
tasks.push(reactInitTask);
await formatFiles(tree);
return runTasksInSerial(...tasks);
}
function getStyleDependency(options: NormalizedSchema): Record<string, string> {
if (options.style === 'scss') return { sass: sassVersion };
if (options.style === 'less') return { less: lessVersion };
if (options.style === 'styl') return { stylus: stylusVersion };
return {};
}

View File

@ -2,10 +2,10 @@ import { render } from '@testing-library/react';
import { App } from './app';
describe('App component', () => {
it('should render a header', () => {
it('should render a welcome message', () => {
const { getByTestId } = render(<App />);
expect(getByTestId('header')).toBeTruthy();
expect(getByTestId('welcome')).toBeTruthy();
});
});

View File

@ -0,0 +1,10 @@
import styles from './app.module.<%= style %>';
import { NxWelcome } from './nx-welcome';
export function App() {
return (
<div className={styles['container']} data-testid="welcome">
<NxWelcome title="<%= name %>" />
</div>
);
}

View File

@ -0,0 +1,820 @@
/*
* * * * * * * * * * * * * * * * * * * * * * * * * * * *
This is a starter component and can be deleted.
* * * * * * * * * * * * * * * * * * * * * * * * * * * *
Delete this file and get started with your project!
* * * * * * * * * * * * * * * * * * * * * * * * * * * *
*/
export function NxWelcome({ title }: { title: string }) {
return (
<>
<style
dangerouslySetInnerHTML={{
__html: `
html {
-webkit-text-size-adjust: 100%;
font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif,
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
'Noto Color Emoji';
line-height: 1.5;
tab-size: 4;
scroll-behavior: smooth;
}
body {
font-family: inherit;
line-height: inherit;
margin: 0;
}
h1,
h2,
p,
pre {
margin: 0;
}
*,
::before,
::after {
box-sizing: border-box;
border-width: 0;
border-style: solid;
border-color: currentColor;
}
h1,
h2 {
font-size: inherit;
font-weight: inherit;
}
a {
color: inherit;
text-decoration: inherit;
}
pre {
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
'Liberation Mono', 'Courier New', monospace;
}
svg {
display: block;
vertical-align: middle;
shape-rendering: auto;
text-rendering: optimizeLegibility;
}
pre {
background-color: rgba(55, 65, 81, 1);
border-radius: 0.25rem;
color: rgba(229, 231, 235, 1);
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
'Liberation Mono', 'Courier New', monospace;
overflow: scroll;
padding: 0.5rem 0.75rem;
}
.shadow {
box-shadow: 0 0 #0000, 0 0 #0000, 0 10px 15px -3px rgba(0, 0, 0, 0.1),
0 4px 6px -2px rgba(0, 0, 0, 0.05);
}
.rounded {
border-radius: 1.5rem;
}
.wrapper {
width: 100%;
}
.container {
margin-left: auto;
margin-right: auto;
max-width: 768px;
padding-bottom: 3rem;
padding-left: 1rem;
padding-right: 1rem;
color: rgba(55, 65, 81, 1);
width: 100%;
}
#welcome {
margin-top: 2.5rem;
}
#welcome h1 {
font-size: 3rem;
font-weight: 500;
letter-spacing: -0.025em;
line-height: 1;
}
#welcome span {
display: block;
font-size: 1.875rem;
font-weight: 300;
line-height: 2.25rem;
margin-bottom: 0.5rem;
}
#hero {
align-items: center;
background-color: hsla(214, 62%, 21%, 1);
border: none;
box-sizing: border-box;
color: rgba(55, 65, 81, 1);
display: grid;
grid-template-columns: 1fr;
margin-top: 3.5rem;
}
#hero .text-container {
color: rgba(255, 255, 255, 1);
padding: 3rem 2rem;
}
#hero .text-container h2 {
font-size: 1.5rem;
line-height: 2rem;
position: relative;
}
#hero .text-container h2 svg {
color: hsla(162, 47%, 50%, 1);
height: 2rem;
left: -0.25rem;
position: absolute;
top: 0;
width: 2rem;
}
#hero .text-container h2 span {
margin-left: 2.5rem;
}
#hero .text-container a {
background-color: rgba(255, 255, 255, 1);
border-radius: 0.75rem;
color: rgba(55, 65, 81, 1);
display: inline-block;
margin-top: 1.5rem;
padding: 1rem 2rem;
text-decoration: inherit;
}
#hero .logo-container {
display: none;
justify-content: center;
padding-left: 2rem;
padding-right: 2rem;
}
#hero .logo-container svg {
color: rgba(255, 255, 255, 1);
width: 66.666667%;
}
#middle-content {
align-items: flex-start;
display: grid;
gap: 4rem;
grid-template-columns: 1fr;
margin-top: 3.5rem;
}
#learning-materials {
padding: 2.5rem 2rem;
}
#learning-materials h2 {
font-weight: 500;
font-size: 1.25rem;
letter-spacing: -0.025em;
line-height: 1.75rem;
padding-left: 1rem;
padding-right: 1rem;
}
.list-item-link {
align-items: center;
border-radius: 0.75rem;
display: flex;
margin-top: 1rem;
padding: 1rem;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
width: 100%;
}
.list-item-link svg:first-child {
margin-right: 1rem;
height: 1.5rem;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
width: 1.5rem;
}
.list-item-link > span {
flex-grow: 1;
font-weight: 400;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
}
.list-item-link > span > span {
color: rgba(107, 114, 128, 1);
display: block;
flex-grow: 1;
font-size: 0.75rem;
font-weight: 300;
line-height: 1rem;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
}
.list-item-link svg:last-child {
height: 1rem;
transition-property: all;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
width: 1rem;
}
.list-item-link:hover {
color: rgba(255, 255, 255, 1);
background-color: hsla(162, 47%, 50%, 1);
}
.list-item-link:hover > span {}
.list-item-link:hover > span > span {
color: rgba(243, 244, 246, 1);
}
.list-item-link:hover svg:last-child {
transform: translateX(0.25rem);
}
#other-links {}
.button-pill {
padding: 1.5rem 2rem;
transition-duration: 300ms;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
align-items: center;
display: flex;
}
.button-pill svg {
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
flex-shrink: 0;
width: 3rem;
}
.button-pill > span {
letter-spacing: -0.025em;
font-weight: 400;
font-size: 1.125rem;
line-height: 1.75rem;
padding-left: 1rem;
padding-right: 1rem;
}
.button-pill span span {
display: block;
font-size: 0.875rem;
font-weight: 300;
line-height: 1.25rem;
}
.button-pill:hover svg,
.button-pill:hover {
color: rgba(255, 255, 255, 1) !important;
}
#nx-console:hover {
background-color: rgba(0, 122, 204, 1);
}
#nx-console svg {
color: rgba(0, 122, 204, 1);
}
#nx-repo:hover {
background-color: rgba(24, 23, 23, 1);
}
#nx-repo svg {
color: rgba(24, 23, 23, 1);
}
#nx-cloud {
margin-bottom: 2rem;
margin-top: 2rem;
padding: 2.5rem 2rem;
}
#nx-cloud > div {
align-items: center;
display: flex;
}
#nx-cloud > div svg {
border-radius: 0.375rem;
flex-shrink: 0;
width: 3rem;
}
#nx-cloud > div h2 {
font-size: 1.125rem;
font-weight: 400;
letter-spacing: -0.025em;
line-height: 1.75rem;
padding-left: 1rem;
padding-right: 1rem;
}
#nx-cloud > div h2 span {
display: block;
font-size: 0.875rem;
font-weight: 300;
line-height: 1.25rem;
}
#nx-cloud p {
font-size: 1rem;
line-height: 1.5rem;
margin-top: 1rem;
}
#nx-cloud pre {
margin-top: 1rem;
}
#nx-cloud a {
color: rgba(107, 114, 128, 1);
display: block;
font-size: 0.875rem;
line-height: 1.25rem;
margin-top: 1.5rem;
text-align: right;
}
#nx-cloud a:hover {
text-decoration: underline;
}
#commands {
padding: 2.5rem 2rem;
margin-top: 3.5rem;
}
#commands h2 {
font-size: 1.25rem;
font-weight: 400;
letter-spacing: -0.025em;
line-height: 1.75rem;
padding-left: 1rem;
padding-right: 1rem;
}
#commands p {
font-size: 1rem;
font-weight: 300;
line-height: 1.5rem;
margin-top: 1rem;
padding-left: 1rem;
padding-right: 1rem;
}
details {
align-items: center;
display: flex;
margin-top: 1rem;
padding-left: 1rem;
padding-right: 1rem;
width: 100%;
}
details pre > span {
color: rgba(181, 181, 181, 1);
display: block;
}
summary {
border-radius: 0.5rem;
display: flex;
font-weight: 400;
padding: 0.5rem;
cursor: pointer;
transition-property: background-color, border-color, color, fill, stroke,
opacity, box-shadow, transform, filter, backdrop-filter,
-webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms;
}
summary:hover {
background-color: rgba(243, 244, 246, 1);
}
summary svg {
height: 1.5rem;
margin-right: 1rem;
width: 1.5rem;
}
#love {
color: rgba(107, 114, 128, 1);
font-size: 0.875rem;
line-height: 1.25rem;
margin-top: 3.5rem;
opacity: 0.6;
text-align: center;
}
#love svg {
color: rgba(252, 165, 165, 1);
width: 1.25rem;
height: 1.25rem;
display: inline;
margin-top: -0.25rem;
}
@media screen and (min-width: 768px) {
#hero {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
#hero .logo-container {
display: flex;
}
#middle-content {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
}
`,
}}
/>
<div className="wrapper">
<div className="container">
<div id="welcome">
<h1>
<span> Hello there, </span>
Welcome {title} 👋
</h1>
</div>
<div id="hero" className="rounded">
<div className="text-container">
<h2>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 12l2 2 4-4M7.835 4.697a3.42 3.42 0 001.946-.806 3.42 3.42 0 014.438 0 3.42 3.42 0 001.946.806 3.42 3.42 0 013.138 3.138 3.42 3.42 0 00.806 1.946 3.42 3.42 0 010 4.438 3.42 3.42 0 00-.806 1.946 3.42 3.42 0 01-3.138 3.138 3.42 3.42 0 00-1.946.806 3.42 3.42 0 01-4.438 0 3.42 3.42 0 00-1.946-.806 3.42 3.42 0 01-3.138-3.138 3.42 3.42 0 00-.806-1.946 3.42 3.42 0 010-4.438 3.42 3.42 0 00.806-1.946 3.42 3.42 0 013.138-3.138z"
/>
</svg>
<span>You&apos;re up and running</span>
</h2>
<a href="#commands"> What&apos;s next? </a>
</div>
<div className="logo-container">
<svg
fill="currentColor"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M11.987 14.138l-3.132 4.923-5.193-8.427-.012 8.822H0V4.544h3.691l5.247 8.833.005-3.998 3.044 4.759zm.601-5.761c.024-.048 0-3.784.008-3.833h-3.65c.002.059-.005 3.776-.003 3.833h3.645zm5.634 4.134a2.061 2.061 0 0 0-1.969 1.336 1.963 1.963 0 0 1 2.343-.739c.396.161.917.422 1.33.283a2.1 2.1 0 0 0-1.704-.88zm3.39 1.061c-.375-.13-.8-.277-1.109-.681-.06-.08-.116-.17-.176-.265a2.143 2.143 0 0 0-.533-.642c-.294-.216-.68-.322-1.18-.322a2.482 2.482 0 0 0-2.294 1.536 2.325 2.325 0 0 1 4.002.388.75.75 0 0 0 .836.334c.493-.105.46.36 1.203.518v-.133c-.003-.446-.246-.55-.75-.733zm2.024 1.266a.723.723 0 0 0 .347-.638c-.01-2.957-2.41-5.487-5.37-5.487a5.364 5.364 0 0 0-4.487 2.418c-.01-.026-1.522-2.39-1.538-2.418H8.943l3.463 5.423-3.379 5.32h3.54l1.54-2.366 1.568 2.366h3.541l-3.21-5.052a.7.7 0 0 1-.084-.32 2.69 2.69 0 0 1 2.69-2.691h.001c1.488 0 1.736.89 2.057 1.308.634.826 1.9.464 1.9 1.541a.707.707 0 0 0 1.066.596zm.35.133c-.173.372-.56.338-.755.639-.176.271.114.412.114.412s.337.156.538-.311c.104-.231.14-.488.103-.74z" />
</svg>
</div>
</div>
<div id="middle-content">
<div id="learning-materials" className="rounded shadow">
<h2>Learning materials</h2>
<a
href="https://nx.dev/getting-started/intro?utm_source=nx-project"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M12 6.253v13m0-13C10.832 5.477 9.246 5 7.5 5S4.168 5.477 3 6.253v13C4.168 18.477 5.754 18 7.5 18s3.332.477 4.5 1.253m0-13C13.168 5.477 14.754 5 16.5 5c1.747 0 3.332.477 4.5 1.253v13C19.832 18.477 18.247 18 16.5 18c-1.746 0-3.332.477-4.5 1.253"
/>
</svg>
<span>
Documentation
<span> Everything is in there </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
<a
href="https://blog.nrwl.io/?utm_source=nx-project"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M19 20H5a2 2 0 01-2-2V6a2 2 0 012-2h10a2 2 0 012 2v1m2 13a2 2 0 01-2-2V7m2 13a2 2 0 002-2V9a2 2 0 00-2-2h-2m-4-3H9M7 16h6M7 8h6v4H7V8z"
/>
</svg>
<span>
Blog
<span> Changelog, features & events </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
<a
href="https://www.youtube.com/@NxDevtools/videos?utm_source=nx-project&sub_confirmation=1"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
role="img"
viewBox="0 0 24 24"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg"
>
<title>YouTube</title>
<path d="M23.498 6.186a3.016 3.016 0 0 0-2.122-2.136C19.505 3.545 12 3.545 12 3.545s-7.505 0-9.377.505A3.017 3.017 0 0 0 .502 6.186C0 8.07 0 12 0 12s0 3.93.502 5.814a3.016 3.016 0 0 0 2.122 2.136c1.871.505 9.376.505 9.376.505s7.505 0 9.377-.505a3.015 3.015 0 0 0 2.122-2.136C24 15.93 24 12 24 12s0-3.93-.502-5.814zM9.545 15.568V8.432L15.818 12l-6.273 3.568z" />
</svg>
<span>
YouTube channel
<span> Nx Show, talks & tutorials </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
<a
href="https://nx.dev/react-tutorial/1-code-generation?utm_source=nx-project"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M15 15l-2 5L9 9l11 4-5 2zm0 0l5 5M7.188 2.239l.777 2.897M5.136 7.965l-2.898-.777M13.95 4.05l-2.122 2.122m-5.657 5.656l-2.12 2.122"
/>
</svg>
<span>
Interactive tutorials
<span> Create an app, step-by-step </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
<a
href="https://nxplaybook.com/?utm_source=nx-project"
target="_blank"
rel="noreferrer"
className="list-item-link"
>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M12 14l9-5-9-5-9 5 9 5z" />
<path d="M12 14l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14z" />
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M12 14l9-5-9-5-9 5 9 5zm0 0l6.16-3.422a12.083 12.083 0 01.665 6.479A11.952 11.952 0 0012 20.055a11.952 11.952 0 00-6.824-2.998 12.078 12.078 0 01.665-6.479L12 14zm-4 6v-7.5l4-2.222"
/>
</svg>
<span>
Video courses
<span> Nx custom courses </span>
</span>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M9 5l7 7-7 7"
/>
</svg>
</a>
</div>
<div id="other-links">
<a
id="nx-console"
className="button-pill rounded shadow"
href="https://marketplace.visualstudio.com/items?itemName=nrwl.angular-console&utm_source=nx-project"
target="_blank"
rel="noreferrer"
>
<svg
fill="currentColor"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<title>Visual Studio Code</title>
<path d="M23.15 2.587L18.21.21a1.494 1.494 0 0 0-1.705.29l-9.46 8.63-4.12-3.128a.999.999 0 0 0-1.276.057L.327 7.261A1 1 0 0 0 .326 8.74L3.899 12 .326 15.26a1 1 0 0 0 .001 1.479L1.65 17.94a.999.999 0 0 0 1.276.057l4.12-3.128 9.46 8.63a1.492 1.492 0 0 0 1.704.29l4.942-2.377A1.5 1.5 0 0 0 24 20.06V3.939a1.5 1.5 0 0 0-.85-1.352zm-5.146 14.861L10.826 12l7.178-5.448v10.896z" />
</svg>
<span>
Install Nx Console
<span>Plugin for VSCode</span>
</span>
</a>
<div id="nx-cloud" className="rounded shadow">
<div>
<svg
viewBox="0 0 120 120"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M120 15V30C103.44 30 90 43.44 90 60C90 76.56 76.56 90 60 90C43.44 90 30 103.44 30 120H15C6.72 120 0 113.28 0 105V15C0 6.72 6.72 0 15 0H105C113.28 0 120 6.72 120 15Z"
fill="#0E2039"
/>
<path
d="M120 30V105C120 113.28 113.28 120 105 120H30C30 103.44 43.44 90 60 90C76.56 90 90 76.56 90 60C90 43.44 103.44 30 120 30Z"
fill="white"
/>
</svg>
<h2>
NxCloud
<span>Enable faster CI & better DX</span>
</h2>
</div>
<p>
You can activate distributed tasks executions and caching by
running:
</p>
<pre>nx connect-to-nx-cloud</pre>
<a
href="https://nx.app/?utm_source=nx-project"
target="_blank"
rel="noreferrer"
>
{' '}
What is Nx Cloud?{' '}
</a>
</div>
<a
id="nx-repo"
className="button-pill rounded shadow"
href="https://github.com/nrwl/nx?utm_source=nx-project"
target="_blank"
rel="noreferrer"
>
<svg
fill="currentColor"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12" />
</svg>
<span>
Nx is open source
<span> Love Nx? Give us a star! </span>
</span>
</a>
</div>
</div>
<div id="commands" className="rounded shadow">
<h2>Next steps</h2>
<p>Here are some things you can do with Nx:</p>
<details>
<summary>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
/>
</svg>
Add UI library
</summary>
<pre>
<span># Generate UI lib</span>
nx g @nrwl/react:lib ui
<span># Add a component</span>
nx g @nrwl/react:component button --project ui
</pre>
</details>
<details>
<summary>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
/>
</svg>
View interactive project graph
</summary>
<pre>nx graph</pre>
</details>
<details>
<summary>
<svg
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
/>
</svg>
Run affected commands
</summary>
<pre>
<span># see what&apos;s been affected by changes</span>
nx affected:graph
<span># run tests for current changes</span>
nx affected:test
<span># run e2e tests for current changes</span>
nx affected:e2e
</pre>
</details>
</div>
<p id="love">
Carefully crafted with
<svg
fill="currentColor"
stroke="none"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M4.318 6.318a4.5 4.5 0 000 6.364L12 20.364l7.682-7.682a4.5 4.5 0 00-6.364-6.364L12 7.636l-1.318-1.318a4.5 4.5 0 00-6.364 0z"
/>
</svg>
</p>
</div>
</div>
</>
);
}
export default NxWelcome;

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -1,8 +1,8 @@
import { ensurePackage, Tree } from '@nrwl/devkit';
import { version as nxVersion } from 'nx/package.json';
import { PresetGeneratorSchema } from '../schema';
import { NormalizedSchema } from '../schema';
export async function addCypress(host: Tree, options: PresetGeneratorSchema) {
export async function addCypress(host: Tree, options: NormalizedSchema) {
if (options.e2eTestRunner !== 'cypress') {
return () => {
//nothing

View File

@ -7,9 +7,9 @@ import {
} from '@nrwl/devkit';
import { version as nxVersion } from 'nx/package.json';
import { updateJestConfigContent } from '../../../utils/jest-utils';
import { PresetGeneratorSchema } from '../schema';
import { NormalizedSchema } from '../schema';
export async function addJest(host: Tree, options: PresetGeneratorSchema) {
export async function addJest(host: Tree, options: NormalizedSchema) {
if (options.unitTestRunner !== 'jest') {
return () => {
// nothing
@ -34,7 +34,7 @@ export async function addJest(host: Tree, options: PresetGeneratorSchema) {
return task;
}
function updateSpecConfig(host: Tree, options: PresetGeneratorSchema) {
function updateSpecConfig(host: Tree, options: NormalizedSchema) {
if (options.unitTestRunner !== 'jest') {
return;
}

View File

@ -0,0 +1,69 @@
import {
addDependenciesToPackageJson,
GeneratorCallback,
joinPathFragments,
Tree,
updateJson,
} from '@nrwl/devkit';
import { Linter, lintProjectGenerator } from '@nrwl/linter';
import { mapLintPattern } from '@nrwl/linter/src/generators/lint-project/lint-project';
import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
import type * as eslint from 'eslint';
import {
eslintPluginImportVersion,
eslintPluginJsxA11yVersion,
eslintPluginReactHooksVersion,
eslintPluginReactVersion,
} from '../../../utils/versions';
import { NormalizedSchema } from '../schema';
export async function addLinting(host: Tree, options: NormalizedSchema) {
const tasks: GeneratorCallback[] = [];
const lintTask = await lintProjectGenerator(host, {
linter: Linter.EsLint,
project: options.name,
tsConfigPaths: [
joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
],
unitTestRunner: options.unitTestRunner,
eslintFilePatterns: [
mapLintPattern(
options.appProjectRoot,
'{ts,tsx,js,jsx}',
options.rootProject
),
],
skipFormat: true,
rootProject: options.rootProject,
});
tasks.push(lintTask);
updateJson(
host,
joinPathFragments(options.appProjectRoot, '.eslintrc.json'),
extendReactEslintJson
);
const installTask = await addDependenciesToPackageJson(
host,
{},
{
'eslint-plugin-import': eslintPluginImportVersion,
'eslint-plugin-jsx-a11y': eslintPluginJsxA11yVersion,
'eslint-plugin-react': eslintPluginReactVersion,
'eslint-plugin-react-hooks': eslintPluginReactHooksVersion,
}
);
tasks.push(installTask);
return runTasksInSerial(...tasks);
}
function extendReactEslintJson(json: eslint.Linter.Config) {
const { extends: pluginExtends, ...config } = json;
return {
extends: ['plugin:@nrwl/nx/react', ...(pluginExtends || [])],
...config,
};
}

View File

@ -0,0 +1,47 @@
import { Tree, writeJson } from '@nrwl/devkit';
import { NormalizedSchema } from '../schema';
export function createTsConfig(
tree: Tree,
options: NormalizedSchema,
relativePathToRootTsConfig: string
) {
// Nx 15.8 moved util to @nrwl/js, but it is in @nrwl/workspace in 15.7
let shared: any;
try {
shared = require('@nrwl/js/src/utils/typescript/create-ts-config');
} catch {
shared = require('@nrwl/workspace/src/utils/create-ts-config');
}
const json = {
compilerOptions: {
jsx: 'react-jsx',
allowJs: false,
esModuleInterop: false,
allowSyntheticDefaultImports: true,
strict: true,
},
files: [],
include: [],
references: [
{
path: './tsconfig.app.json',
},
],
} as any;
// inline tsconfig.base.json into the project
if (options.rootProject) {
json.compileOnSave = false;
json.compilerOptions = {
...shared.tsConfigBaseOptions,
...json.compilerOptions,
};
json.exclude = ['node_modules', 'tmp'];
} else {
json.extends = relativePathToRootTsConfig;
}
writeJson(tree, `${options.appProjectRoot}/tsconfig.json`, json);
}

View File

@ -5,22 +5,22 @@ import {
normalizePath,
Tree,
} from '@nrwl/devkit';
import { NormalizedSchema, PresetGeneratorSchema } from '../schema';
import { ApplicationGeneratorSchema, NormalizedSchema } from '../schema';
export function normalizeDirectory(options: PresetGeneratorSchema) {
export function normalizeDirectory(options: ApplicationGeneratorSchema) {
const { projectDirectory } = extractLayoutDirectory(options.directory);
return projectDirectory
? `${names(projectDirectory).fileName}/${names(options.name).fileName}`
: names(options.name).fileName;
}
export function normalizeProjectName(options: PresetGeneratorSchema) {
export function normalizeProjectName(options: ApplicationGeneratorSchema) {
return normalizeDirectory(options).replace(new RegExp('/', 'g'), '-');
}
export function normalizeOptions(
host: Tree,
options: PresetGeneratorSchema
options: ApplicationGeneratorSchema
): NormalizedSchema {
// --monorepo takes precedence over --rootProject
// This won't be needed once we add --bundler=rspack to the @nrwl/react:app preset

15
src/generators/application/schema.d.ts vendored Normal file
View File

@ -0,0 +1,15 @@
export interface ApplicationGeneratorSchema {
name: string;
style: 'css' | 'scss' | 'less' | 'styl';
unitTestRunner?: 'none' | 'jest';
e2eTestRunner?: 'none' | 'cypress';
directory?: string;
tags?: string[];
rootProject?: boolean;
monorepo?: boolean;
}
export interface NormalizedSchema extends ApplicationGeneratorSchema {
appProjectRoot: string;
e2eProjectName: string;
}

View File

@ -0,0 +1,92 @@
{
"$schema": "http://json-schema.org/schema",
"cli": "nx",
"$id": "Application",
"title": "Application generator for React + rspack",
"type": "object",
"examples": [
{
"command": "nx g app myapp --directory=myorg",
"description": "Generate `apps/myorg/myapp` and `apps/myorg/myapp-e2e`"
}
],
"properties": {
"name": {
"description": "The name of the application.",
"type": "string",
"$default": {
"$source": "argv",
"index": 0
},
"x-prompt": "What name would you like to use for the application?",
"pattern": "^[a-zA-Z].*$",
"x-priority": "important"
},
"style": {
"description": "The file extension to be used for style files.",
"type": "string",
"default": "css",
"alias": "s",
"x-prompt": {
"message": "Which stylesheet format would you like to use?",
"type": "list",
"items": [
{
"value": "css",
"label": "CSS"
},
{
"value": "scss",
"label": "SASS(.scss) [ http://sass-lang.com ]"
},
{
"value": "styl",
"label": "Stylus(.styl) [ http://stylus-lang.com ]"
},
{
"value": "less",
"label": "LESS [ http://lesscss.org ]"
},
{
"value": "none",
"label": "None"
}
]
}
},
"unitTestRunner": {
"type": "string",
"description": "The unit test runner to use.",
"enum": ["none", "jest"],
"default": "jest"
},
"e2eTestRunner": {
"type": "string",
"description": "The e2e test runner to use.",
"enum": ["none", "cypress"],
"default": "cypress"
},
"directory": {
"type": "string",
"description": "The directory to nest the app under."
},
"tags": {
"type": "array",
"description": "The tags to assign to the project.",
"items": {
"type": "string"
},
"default": []
},
"monorepo": {
"type": "boolean",
"description": "Creates an integrated monorepo.",
"aliases": ["integrated"]
},
"rootProject": {
"type": "boolean",
"x-priority": "internal"
}
},
"required": ["name"]
}

View File

@ -16,12 +16,17 @@ export async function rspackInitGenerator(
schema: InitGeneratorSchema
) {
const devDependencies = {
// eslint-disable-next-line @typescript-eslint/no-var-requires
'@nrwl/rspack': require('../../../package.json').version,
'@rspack/core': rspackCoreVersion,
'@rspack/plugin-minify': rspackPluginMinifyVersion,
};
// eslint-disable-next-line @typescript-eslint/no-var-requires
const version = require('../../../package.json').version;
if (version !== '0.0.1') {
// Ignored for local dev / e2e tests.
devDependencies['@nrwl/rspack'] = version;
}
if (schema.style === 'less') {
devDependencies['@rspack/less-loader'] = rspackLessLoaderVersion;
}

View File

@ -1,10 +0,0 @@
import styles from './app.module.<%= style %>';
export function App() {
return (
<div className={styles['container']}>
<h1 data-testid="header">Welcome <%= name %></h1>
<p>NODE_ENV: {process.env['NODE_ENV']}</p>
</div>
);
}

View File

@ -1,17 +0,0 @@
{
"compilerOptions": {
"jsx": "react-jsx",
"allowJs": false,
"esModuleInterop": false,
"allowSyntheticDefaultImports": true,
"strict": true
},
"files": [],
"include": [],
"references": [
{
"path": "./tsconfig.app.json"
}
],
"extends": "<%= offsetFromRoot %>tsconfig.base.json"
}

View File

@ -1,86 +1,36 @@
import {
addDependenciesToPackageJson,
addProjectConfiguration,
ensurePackage,
formatFiles,
generateFiles,
joinPathFragments,
names,
offsetFromRoot,
Tree,
} from '@nrwl/devkit';
import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
import { version as nxVersion } from 'nx/package.json';
import * as path from 'path';
import { Tree, updateJson } from '@nrwl/devkit';
import {
reactDomVersion,
reactVersion,
typesReactDomVersion,
typesReactVersion,
} from '../../utils/versions';
import projectGenerator from '../rspack-project/rspack-project';
import { addCypress } from './lib/add-cypress';
import { addJest } from './lib/add-jest';
import { normalizeOptions } from './lib/normalize-options';
import applicationGenerator from '../application/application';
import { PresetGeneratorSchema } from './schema';
export default async function (tree: Tree, _options: PresetGeneratorSchema) {
await ensurePackage(tree, '@nrwl/react', nxVersion);
// eslint-disable-next-line @typescript-eslint/no-var-requires
const { reactInitGenerator } = require('@nrwl/react');
const tasks = [];
const options = normalizeOptions(tree, _options);
options.style ??= 'css';
addProjectConfiguration(tree, options.name, {
root: options.appProjectRoot,
projectType: 'application',
sourceRoot: `${options.appProjectRoot}/src`,
targets: {},
});
generateFiles(tree, path.join(__dirname, 'files'), options.appProjectRoot, {
export default async function (tree: Tree, options: PresetGeneratorSchema) {
const appTask = applicationGenerator(tree, {
...options,
...names(options.name),
offsetFromRoot: offsetFromRoot(options.appProjectRoot),
template: '',
// Since `--style` is not passed down to custom preset, we're using individual flags for now.
style: options.sass
? 'scss'
: options.less
? 'less'
: options.stylus
? 'styl'
: 'css',
});
const projectTask = await projectGenerator(tree, {
project: options.name,
style: options.style,
devServer: true,
tsConfig: joinPathFragments(options.appProjectRoot, 'tsconfig.app.json'),
uiFramework: 'react',
target: 'web',
main: joinPathFragments(options.appProjectRoot, 'src/main.tsx'),
updateJson(tree, 'package.json', (json) => {
json.scripts ??= {};
json.scripts.build ??= 'npx nx build';
json.scripts.start ??= 'npx nx serve';
json.scripts.lint ??= 'npx nx lint';
json.scripts.test ??= 'npx nx test';
json.scripts.e2e ??= 'npx nx e2e e2e';
return json;
});
tasks.push(projectTask);
const jestTask = await addJest(tree, options);
tasks.push(jestTask);
const cypressTask = await addCypress(tree, options);
tasks.push(cypressTask);
const installTask = addDependenciesToPackageJson(
tree,
{ react: reactVersion, 'react-dom': reactDomVersion },
{
'@nrwl/react': nxVersion,
'@types/react': typesReactVersion,
'@types/react-dom': typesReactDomVersion,
if (options.rootProject) {
// Remove these folders so projects will be generated at the root.
tree.delete('apps');
tree.delete('libs');
}
);
tasks.push(installTask);
const reactInitTask = await reactInitGenerator(tree, options);
tasks.push(reactInitTask);
await formatFiles(tree);
return runTasksInSerial(...tasks);
return appTask;
}

View File

@ -1,6 +1,8 @@
export interface PresetGeneratorSchema {
name: string;
style: 'css' | 'scss' | 'less';
less?: boolean;
sass?: boolean;
stylus?: boolean;
unitTestRunner?: 'none' | 'jest';
e2eTestRunner?: 'none' | 'cypress';
directory?: string;

View File

@ -14,11 +14,17 @@
},
"x-priority": "important"
},
"style": {
"type": "string",
"description": "The style solution to use.",
"enum": ["none", "css", "sass", "less"],
"default": "css"
"less": {
"type": "boolean",
"description": "Use less for styling."
},
"sass": {
"type": "boolean",
"description": "Use sass for styling."
},
"stylus": {
"type": "boolean",
"description": "Use stylus for styling."
},
"unitTestRunner": {
"type": "string",

View File

@ -142,7 +142,7 @@ function createConfig(options: RspackProjectGeneratorSchema) {
return `
const { composePlugins, withNx, withReact } = require('@nrwl/rspack');
module.exports = composePlugins(withNx(), withReact({ style: '${options.style}' }), (config) => {
module.exports = composePlugins(withNx(), withReact(), (config) => {
return config;
});
`;
@ -150,7 +150,7 @@ function createConfig(options: RspackProjectGeneratorSchema) {
return `
const { composePlugins, withNx, withWeb } = require('@nrwl/rspack');
module.exports = composePlugins(withNx(), withWeb({ style: '${options.style}' }), (config) => {
module.exports = composePlugins(withNx(), withWeb(), (config) => {
return config;
});
`;

View File

@ -1,23 +0,0 @@
import * as CopyWebpackPlugin from 'copy-webpack-plugin';
export function createCopyPlugin(assets: any[]) {
return new CopyWebpackPlugin({
patterns: assets.map((asset) => {
return {
context: asset.input,
// Now we remove starting slash to make Webpack place it from the output root.
to: asset.output,
from: asset.glob,
globOptions: {
ignore: [
'.gitkeep',
'**/.DS_Store',
'**/Thumbs.db',
...(asset.ignore ?? []),
],
dot: true,
},
};
}),
});
}

View File

@ -0,0 +1,19 @@
export function getCopyPatterns(assets: any[]) {
return assets.map((asset) => {
return {
context: asset.input,
// Now we remove starting slash to make Webpack place it from the output root.
to: asset.output,
from: asset.glob,
globOptions: {
ignore: [
'.gitkeep',
'**/.DS_Store',
'**/Thumbs.db',
...(asset.ignore ?? []),
],
dot: true,
},
};
});
}

View File

@ -8,3 +8,12 @@ export const reactVersion = '~18.2.0';
export const reactDomVersion = '~18.2.0';
export const typesReactVersion = '~18.0.28';
export const typesReactDomVersion = '~18.0.10';
export const lessVersion = '4.1.3';
export const sassVersion = '^1.42.1';
export const stylusVersion = '^0.55.0';
export const eslintPluginImportVersion = '2.27.5';
export const eslintPluginJsxA11yVersion = '6.7.1';
export const eslintPluginReactVersion = '7.32.2';
export const eslintPluginReactHooksVersion = '4.6.0';

View File

@ -1,6 +1,6 @@
import { Configuration } from '@rspack/core';
import * as path from 'path';
import { createCopyPlugin } from './create-copy-plugin';
import { getCopyPatterns } from './get-copy-patterns';
import { SharedConfigContext } from './model';
import { normalizeAssets } from './normalize-assets';
@ -73,6 +73,11 @@ export function withNx(_opts = {}) {
debug: false,
},
builtins: {
copy: {
patterns: getCopyPatterns(
normalizeAssets(options.assets, context.root, sourceRoot)
),
},
html: [
{
template: options.indexHtml
@ -93,15 +98,6 @@ export function withNx(_opts = {}) {
},
};
if (Array.isArray(options.assets) && options.assets.length > 0) {
// TODO(jack): uncomment this once copy-webpack-plugin is working
//updated.plugins.push(
// createCopyPlugin(
// normalizeAssets(options.assets, context.root, sourceRoot)
// )
//);
}
if (options.optimization) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
const minifyPlugin = require('@rspack/plugin-minify');

View File

@ -4,7 +4,9 @@ import * as path from 'path';
import { SharedConfigContext } from './model';
export interface WithWebOptions {
style?: 'css' | 'scss' | 'less';
stylePreprocessorOptions?: {
includePaths?: string[];
};
}
export function withWeb(opts: WithWebOptions = {}) {
@ -19,6 +21,22 @@ export function withWeb(opts: WithWebOptions = {}) {
context.projectGraph.nodes[context.projectName].data.root
);
const includePaths: string[] = [];
if (opts?.stylePreprocessorOptions?.includePaths?.length > 0) {
opts.stylePreprocessorOptions.includePaths.forEach(
(includePath: string) =>
includePaths.push(path.resolve(context.root, includePath))
);
}
let lessPathOptions: { paths?: string[] } = {};
if (includePaths.length > 0) {
lessPathOptions = {
paths: includePaths,
};
}
return {
...config,
module: {
@ -27,18 +45,55 @@ export function withWeb(opts: WithWebOptions = {}) {
...(config.module.rules || []),
{
test: /\.css$/,
type: 'css/module' as any,
type: 'css/module',
},
// TODO(jack): uncomment once supported.
// {
// test: /\.s[ac]ss$/,
// use: [{ builtinLoader: 'builtin:sass-loader' }],
// type: 'css',
// },
opts.style === 'less' && {
{
test: /\.scss$|\.sass$/,
type: 'css/module',
use: [
{
loader: require.resolve('sass-loader'),
options: {
sourceMap: !!options.sourceMap,
sassOptions: {
fiber: false,
// bootstrap-sass requires a minimum precision of 8
precision: 8,
includePaths,
},
},
},
],
},
{
test: /.less$/,
use: [{ loader: require('@rspack/less-loader') }],
type: 'css',
type: 'css/module',
use: [
{
loader: require.resolve('less-loader'),
options: {
sourceMap: !!options.sourceMap,
lessOptions: {
javascriptEnabled: true,
...lessPathOptions,
},
},
},
],
},
{
test: /\.styl$/,
use: [
{
loader: require.resolve('stylus-loader'),
options: {
sourceMap: !!options.sourceMap,
stylusOptions: {
include: includePaths,
},
},
},
],
},
].filter((a): a is ModuleRule => !!a),
},