Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion apps/lockfile-explorer-web/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"extends": "./node_modules/local-web-rig/profiles/app/tsconfig-base.json"
"extends": "./node_modules/local-web-rig/profiles/app/tsconfig-base.json",
"compilerOptions": {
"skipLibCheck": true
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,24 @@
},
"devDependencies": {
"@babel/core": "~7.20.0",
"@storybook/addon-actions": "~6.4.18",
"@storybook/addon-essentials": "~6.4.18",
"@storybook/addon-links": "~6.4.18",
"@storybook/cli": "~6.4.18",
"@storybook/components": "~6.4.18",
"@storybook/core-events": "~6.4.18",
"@storybook/react": "~6.4.18",
"@storybook/theming": "~6.4.18",
"@storybook/cli": "~9.1.6",
"@storybook/react": "~9.1.6",
"@storybook/react-webpack5": "~9.1.6",
"@types/heft-jest": "1.0.1",
"@types/node": "20.17.19",
"@types/react-dom": "17.0.25",
"@types/react": "17.0.74",
"@types/react-dom": "~19.2.3",
"@types/react": "~19.2.7",
"@types/webpack-env": "1.18.8",
"babel-loader": "~8.2.3",
"css-loader": "~5.2.7",
"jest": "~29.3.1",
"react-dom": "~17.0.2",
"react": "~17.0.2",
"react-dom": "~19.2.1",
"react": "~19.2.1",
"style-loader": "~2.0.0",
"terser-webpack-plugin": "~3.0.8",
"typescript": "~5.8.2",
"webpack": "~4.47.0"
"webpack": "~5.103.0",
"storybook": "~9.1.6",
"@testing-library/dom": "~7.21.4"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
const path = require('path');

module.exports = {
stories: ['../lib/**/*.stories.js'],
addons: ['@storybook/addon-links', '@storybook/addon-essentials']
// naively referencing the name of the package causes storybook to fail to resolve it
framework: path.resolve(require.resolve('@storybook/react-webpack5/preset'), '..')
};
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"webpack": {
"taskDependencies": ["typescript"],
"taskPlugin": {
"pluginPackage": "@rushstack/heft-webpack4-plugin"
"pluginPackage": "@rushstack/heft-webpack5-plugin"
}
},
"storybook": {
Expand All @@ -33,8 +33,8 @@
"pluginPackage": "@rushstack/heft-storybook-plugin",
"options": {
"storykitPackageName": "heft-storybook-react-tutorial-storykit",
"cliPackageName": "@storybook/react",
"cliCallingConvention": "storybook6",
"cliPackageName": "storybook",
"cliCallingConvention": "storybook9",
"staticBuildOutputFolder": "dist-storybook"
}
}
Expand Down
20 changes: 12 additions & 8 deletions build-tests-samples/heft-storybook-react-tutorial/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"_phase:test": "heft run --only test -- --clean"
},
"dependencies": {
"react-dom": "~17.0.2",
"react": "~17.0.2",
"react-dom": "~19.2.1",
"react": "~19.2.1",
"tslib": "~2.8.1"
},
"devDependencies": {
Expand All @@ -23,13 +23,14 @@
"@rushstack/heft-lint-plugin": "workspace:*",
"@rushstack/heft-storybook-plugin": "workspace:*",
"@rushstack/heft-typescript-plugin": "workspace:*",
"@rushstack/heft-webpack4-plugin": "workspace:*",
"@rushstack/webpack4-module-minifier-plugin": "workspace:*",
"@storybook/react": "~6.4.18",
"@rushstack/heft-webpack5-plugin": "workspace:*",
"@rushstack/webpack5-module-minifier-plugin": "workspace:*",
"@storybook/react-webpack5": "~9.1.6",
"@storybook/react": "~9.1.6",
"@types/heft-jest": "1.0.1",
"@types/node": "20.17.19",
"@types/react": "17.0.74",
"@types/react-dom": "17.0.25",
"@types/react": "~19.2.7",
"@types/react-dom": "~19.2.3",
"@types/webpack-env": "1.18.8",
"css-loader": "~5.2.7",
"eslint": "~9.37.0",
Expand All @@ -39,6 +40,9 @@
"source-map-loader": "~1.1.3",
"style-loader": "~2.0.0",
"typescript": "~5.8.2",
"webpack": "~4.47.0"
"webpack": "~5.103.0",
"storybook": "~9.1.6",
"@testing-library/dom": "~7.21.4",
"@rushstack/module-minifier": "workspace:*"
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
// See LICENSE in the project root for license information.

import * as React from 'react';
import type { ComponentStory, ComponentMeta } from 'heft-storybook-react-tutorial-storykit';
import type { Meta, StoryObj } from 'heft-storybook-react-tutorial-storykit';

import { ToggleSwitch } from './ToggleSwitch';

Expand All @@ -13,14 +12,15 @@ export default {
leftColor: { control: 'color' },
rightColor: { control: 'color' }
}
} as ComponentMeta<typeof ToggleSwitch>;
} as Meta<typeof ToggleSwitch>;

const Template: ComponentStory<typeof ToggleSwitch> = (args) => <ToggleSwitch {...args} />;

// eslint-disable-next-line
export const Primary: any = Template.bind({});
Primary.args = {};
export const Primary: StoryObj<typeof ToggleSwitch> = {
args: {
leftColor: '#880000',
rightColor: '#008000'
}
};

// eslint-disable-next-line
export const Secondary: any = Template.bind({});
Secondary.args = {};
export const Secondary: StoryObj<typeof ToggleSwitch> = {
args: {}
};
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
// See LICENSE in the project root for license information.

import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { createRoot } from 'react-dom/client';

import { ExampleApp } from './ExampleApp';

import './index.css';

const rootDiv: HTMLElement = document.getElementById('root') as HTMLElement;
ReactDOM.render(<ExampleApp />, rootDiv);
createRoot(rootDiv).render(<ExampleApp />);
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@

"module": "esnext",
"moduleResolution": "node",
"target": "es5",
"lib": ["es5", "scripthost", "es2015.collection", "es2015.promise", "es2015.iterable", "dom"]
"target": "es2020",
"lib": ["es2020", "scripthost", "dom"],
"skipLibCheck": true
},
"include": ["src/**/*.ts", "src/**/*.tsx"],
"exclude": ["node_modules", "lib"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

const path = require('path');
const HtmlWebpackPlugin = require('html-webpack-plugin');
const { ModuleMinifierPlugin, WorkerPoolMinifier } = require('@rushstack/webpack4-module-minifier-plugin');
const { ModuleMinifierPlugin } = require('@rushstack/webpack5-module-minifier-plugin');
const { WorkerPoolMinifier } = require('@rushstack/module-minifier');

/**
* If the "--production" command-line parameter is specified when invoking Heft, then the
Expand Down Expand Up @@ -57,7 +58,13 @@ function createWebpackConfig({ production }) {
optimization: {
minimizer: [
new ModuleMinifierPlugin({
minifier: new WorkerPoolMinifier(),
minifier: new WorkerPoolMinifier({
terserOptions: {
ecma: 2020,
mangle: true
},
verbose: true
}),
useSourceMap: true
})
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"changes": [
{
"packageName": "@rushstack/heft-storybook-plugin",
"comment": "support storybook v9",
"type": "minor"
},
{
"packageName": "@rushstack/heft-storybook-plugin",
"comment": "support serve mode with rspack",
"type": "minor"
}
],
"packageName": "@rushstack/heft-storybook-plugin"
}
14 changes: 13 additions & 1 deletion common/config/rush/nonbrowser-approved-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
},
{
"name": "@rushstack/heft-rspack-plugin",
"allowedCategories": [ "tests" ]
"allowedCategories": [ "libraries", "tests" ]
},
{
"name": "@rushstack/heft-sass-load-themed-styles-plugin",
Expand Down Expand Up @@ -1089,6 +1089,18 @@
{
"name": "zod",
"allowedCategories": [ "libraries" ]
},
{
"name": "@storybook/react-webpack5",
"allowedCategories": [ "libraries", "tests" ]
},
{
"name": "@testing-library/dom",
"allowedCategories": [ "tests" ]
},
{
"name": "storybook",
"allowedCategories": [ "tests" ]
}
]
}
6 changes: 5 additions & 1 deletion common/config/subspaces/default/common-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@
"@rushstack/set-webpack-public-path-plugin": [
// This is used by the webpack 4 localization plugin tests
"^4.1.16"
]
],
"@types/react": ["~19.2.7"],
"@types/react-dom": ["~19.2.3"],
"react": ["~19.2.1"],
"react-dom": ["~19.2.1"]
}
}
Loading
Loading