Skip to content
This repository was archived by the owner on Dec 22, 2024. It is now read-only.

Migrate to vite 4 #117

Merged
merged 9 commits into from
Dec 29, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.145.1/containers/typescript-node/.devcontainer/base.Dockerfile

ARG VARIANT="16-bullseye"
ARG VARIANT="18-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}

# [Optional] Uncomment this section to install additional OS packages.
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "react-vite-storybook-typescript-starter",
"build": {
"dockerfile": "Dockerfile",
"args": { "VARIANT": "16" }
"args": { "VARIANT": "18-bullseye" }
},

// Add the IDs of extensions you want installed when the container is created.
Expand All @@ -22,7 +22,7 @@
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "npm install"
"postCreateCommand": "npm install --legacy-peer-deps"

// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
// "remoteUser": "node"
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ module.exports = {
'import/no-extraneous-dependencies': 'off',
'react/require-default-props': 'off',
'react/jsx-fragments': ['error', 'element'],
'react/no-unknown-property': ['error', { ignore: ['css'] }],
},
};
6 changes: 3 additions & 3 deletions .github/workflows/cd-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v3
with:
fetch-depth: '0'
fetch-depth: '1'

- name: Configure node for npmjs.org as registry
uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: '18.x'
registry-url: 'https://registry.npmjs.org'

- name: Install dependencies
run: npm ci
run: npm ci --legacy-peer-deps

- name: Build
run: npm run build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cd-storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- name: Use nodejs
uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: '18.x'

- name: Install dependencies
run: npm ci
run: npm ci --legacy-peer-deps

- name: Build storybook
run: npm run build:storybook
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/check-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v3

- name: Use nodejs
uses: actions/setup-node@v3
with:
node-version: '18.x'

- name: Install dependencies
run: npm ci --legacy-peer-deps

- uses: andresz1/size-limit-action@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
skip_step: install
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node: ['14.x', '16.x']
node: ['18.x']
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
Expand All @@ -22,7 +22,7 @@ jobs:
cache: npm

- name: Install dependencies
run: npm ci
run: npm ci --legacy-peer-deps

- name: Check format
run: npm run check:format
Expand Down
27 changes: 14 additions & 13 deletions .storybook/main.js
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,43 +1,44 @@
const react = require("@vitejs/plugin-react");

module.exports = {
stories: ["../stories/Start.stories.mdx", "../stories/**/*.stories.mdx", "../stories/**/*.stories.@(js|jsx|ts|tsx)"],
staticDirs: [{ from: '../docs', to: '/docs'}],
staticDirs: [{
from: '../docs',
to: '/docs'
}],
addons: [{
name: '@storybook/addon-docs',
options: {
configureJSX: true,
transcludeMarkdown: true
}
}, "@storybook/addon-links", "@storybook/addon-essentials", "@storybook/addon-storysource"],
core: {
"builder": "@storybook/builder-vite"
},

async viteFinal(config, {
configType
}) {
config.plugins = config.plugins.filter(plugin => !(Array.isArray(plugin) && plugin[0]?.name.includes("vite:react")));

if (config.optimizeDeps) {
config.optimizeDeps.include = [...(config.optimizeDeps.include || []), '@emotion/react/jsx-dev-runtime'];
}

config.plugins.push(react({
exclude: [/\.stories\.(t|j)sx?$/, /node_modules/],
jsxImportSource: "@emotion/react",
babel: {
plugins: ["@emotion/babel-plugin"]
}
}));

if (configType === "PRODUCTION") {
return { ...config,
return {
...config,
base: './'
};
}

return config;
},
framework: {
name: "@storybook/react-vite",
options: {}
},
docs: {
docsPage: "automatic"
}

};
};
Loading