Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade to @vanilla-extract/vite-plugin v4 #183

Closed
wants to merge 10 commits into from
Closed
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
21 changes: 21 additions & 0 deletions .github/workflows/build_test_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,27 @@ jobs:
name: playwright
path: "**/.playwright/**"

special-test-on-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/composites/install/
- run: pnpm --filter react-styled-factory test

special-test-on-ubuntu:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/composites/install/
- run: pnpm --filter react-styled-factory test

special-test-on-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: ./.github/workflows/composites/install/
- run: pnpm --filter react-styled-factory test

typecheck:
runs-on: ubuntu-latest
steps:
Expand Down
22 changes: 10 additions & 12 deletions core/yas-build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,17 @@
"private": true,
"license": "MIT",
"devDependencies": {
"@vanilla-extract/esbuild-plugin": "2.3.1",
"@vanilla-extract/vite-plugin": "3.9.2",
"@vanilla-extract/webpack-plugin": "2.3.1",
"@vitejs/plugin-react": "4.0.1",
"@vanilla-extract/vite-plugin": "4.0.4",
"@vanilla-extract/webpack-plugin": "2.3.6",
"@vitejs/plugin-react": "4.2.1",
"@yas/env": "workspace:*",
"css-loader": "^6.8.1",
"css-loader": "6.10.0",
"css-minimizer-webpack-plugin": "^5.0.1",
"esbuild-absolute-file-plugin": "workspace:*",
"file-loader": "^6.2.0",
"rollup-plugin-visualizer": "5.9.0",
"style-loader": "^3.3.3",
"tsup": "7.2.0",
"vite": "4.5.2",
"vite-plugin-checker": "^0.5.6"
"file-loader": "6.2.0",
"rollup-plugin-visualizer": "5.12.0",
"style-loader": "3.3.4",
"tsup": "8.0.2",
"vite": "5.1.1",
"vite-plugin-checker": "0.6.4"
}
}
2 changes: 0 additions & 2 deletions core/yas-build/tsup.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const path = require("path");
const { defineConfig } = require("tsup");
const { defineEnv } = require("./defineEnv");
const { esbuildVanillaExtractPlugin } = require("./vanillaExtractPlugin");

/**
* @param {string} projectRoot
Expand All @@ -15,7 +14,6 @@ function createYasTsupConfig(projectRoot = process.cwd(), options = {}) {
dts: true,
noExternal: internalPackages,
define: defineEnv(projectRoot),
esbuildPlugins: [esbuildVanillaExtractPlugin()],
esbuildOptions(options) {
options.logOverride = {
// We sometimes intentionally define NODE_ENV as undefined to allow the runtime to fall back to a default.
Expand Down
23 changes: 0 additions & 23 deletions core/yas-build/vanillaExtractPlugin.js

This file was deleted.

4 changes: 2 additions & 2 deletions core/yas-build/vite.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ const react = require("@vitejs/plugin-react");
const { visualizer } = require("rollup-plugin-visualizer");
const { defineConfig } = require("vite");
const { default: checker } = require("vite-plugin-checker");
const { vanillaExtractPlugin } = require("@vanilla-extract/vite-plugin");
const { defineEnv } = require("./defineEnv");
const { viteVanillaExtractPlugin } = require("./vanillaExtractPlugin");

function createYasViteConfig(projectRoot, { analyze } = {}) {
return defineConfig({
plugins: [
viteVanillaExtractPlugin(),
vanillaExtractPlugin(),
react(),
checker({ typescript: true }),
determineVisualizerPlugin(analyze),
Expand Down
9 changes: 0 additions & 9 deletions incubations/esbuild-absolute-file-plugin/package.json

This file was deleted.

54 changes: 0 additions & 54 deletions incubations/esbuild-absolute-file-plugin/src/index.js

This file was deleted.

1 change: 0 additions & 1 deletion incubations/react-styled-factory/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
"@yas/scripts": "workspace:*",
"@types/react": "^18.2.37",
"@vanilla-extract/recipes": "0.5.1",
"@vanilla-extract/vite-plugin": "3.9.2",
"concurrently": "^8.2.1",
"react": "^18.2.0"
},
Expand Down
1 change: 0 additions & 1 deletion incubations/vanilla-extract-constrained/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"test:watch": "pnpm run test --ui"
},
"peerDependencies": {
"@vanilla-extract/vite-plugin": "^3.9.2",
"@vanilla-extract/css": "^1.14.0"
},
"devDependencies": {
Expand Down
1 change: 0 additions & 1 deletion incubations/vanilla-extract-recipe-factory/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"@vanilla-extract/css": "^1.14.0"
},
"devDependencies": {
"@vanilla-extract/vite-plugin": "^3.9.2",
"@yas/tsconfig": "workspace:*",
"@yas/test": "workspace:*",
"@yas/scripts": "workspace:*",
Expand Down
5 changes: 1 addition & 4 deletions incubations/vanilla-extract-recipe-factory/vitest.config.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import { defineConfig } from "@yas/test/vitest/node/config";
import { vanillaExtractPlugin } from "@vanilla-extract/vite-plugin";

export default defineConfig(__dirname, {
plugins: [vanillaExtractPlugin()],
});
export default defineConfig(__dirname);
Loading
Loading