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

feat: update build for core package #25

Merged
merged 4 commits into from Jun 2, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/large-foxes-juggle.md
@@ -0,0 +1,5 @@
---
"@svbstrate/core": patch
---

Use esbuild to build library, and use Vite for Vitest only
5 changes: 5 additions & 0 deletions .changeset/soft-readers-care.md
@@ -0,0 +1,5 @@
---
"@svbstrate/css": patch
---

Initial release
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Expand Up @@ -18,10 +18,10 @@ jobs:
- uses: actions/checkout@v1
- uses: pnpm/action-setup@v2
with:
version: 7
version: 8
- uses: actions/setup-node@v3
with:
node-version: 15
node-version: 16
cache: "pnpm"

# pnpm stuff
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -16,10 +16,10 @@ jobs:
- uses: actions/checkout@v1
- uses: pnpm/action-setup@v2
with:
version: 7
version: 8
- uses: actions/setup-node@v3
with:
node-version: 15
node-version: 16
cache: "pnpm"

# pnpm stuff
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -19,6 +19,7 @@
"@commitlint/config-conventional": "^15.0.0",
"@vitest/coverage-c8": "^0.28.3",
"commitlint": "^15.0.0",
"esbuild": "^0.17.16",
"husky": "^7.0.4",
"is-ci": "^3.0.1",
"prettier": "^2.8.3",
Expand Down
5 changes: 3 additions & 2 deletions packages/core/package.json
Expand Up @@ -2,10 +2,11 @@
"name": "@svbstrate/core",
"version": "0.0.14",
"description": "",
"main": "dist/index.js",
"main": "dist/index.cjs.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
"scripts": {
"build": "vite build && pnpm typegen",
"build": "node scripts/build && pnpm typegen",
"test": "vitest run --coverage",
"test:watch": "vitest --coverage",
"typecheck": "tsc --noEmit",
Expand Down
21 changes: 21 additions & 0 deletions packages/core/scripts/build.js
@@ -0,0 +1,21 @@
const path = require("path");

const options = {
sourcemap: true,
logLevel: "info",
bundle: true,
};

require("esbuild").buildSync({
entryPoints: ["lib/index.ts"],
format: "cjs",
outfile: path.join(__dirname, "../dist/index.cjs.js"),
...options,
});

require("esbuild").buildSync({
entryPoints: ["lib/index.ts"],
format: "esm",
outfile: path.join(__dirname, "../dist/index.esm.js"),
...options,
});
16 changes: 0 additions & 16 deletions packages/core/vite.config.ts
@@ -1,22 +1,6 @@
import { defineConfig } from "vitest/config";
import { resolve } from "path";

export default defineConfig({
define: {
ENV: JSON.stringify("development"),
},
build: {
target: "esnext",
minify: "esbuild",
lib: {
entry: [
resolve(__dirname, "lib/index.ts"),
resolve(__dirname, "lib/presets.ts"),
resolve(__dirname, "lib/utils.ts"),
],
formats: ["cjs"],
},
},
test: {
coverage: {
reporter: ["text", "lcov"],
Expand Down
5 changes: 5 additions & 0 deletions packages/css/.npmignore
@@ -0,0 +1,5 @@
lib
scripts
coverage
dist/__tests__
tsconfig.json
7 changes: 7 additions & 0 deletions packages/css/README.md
@@ -0,0 +1,7 @@
# @svbstate/css

Generate CSS with Svbstrate.

### License

MIT License © [Front of House](https://github.com/front-of-house)
20 changes: 20 additions & 0 deletions packages/css/lib/__tests__/index.test.ts
@@ -0,0 +1,20 @@
import { test, expect } from "vitest";

import { create } from "../";

test("works", () => {
const sv = create({
breakpoints: ["400px", "800px"],
});
const cn = sv.css({
color: "red",
padding: [0, 1, 2],
});
const sheet = sv.flush();

expect(sheet).toContain("color:red");
expect(sheet).toContain("padding:0px");
expect(sheet).toContain("padding:1px");
expect(sheet).toContain("padding:2px");
expect(cn).toBeTruthy();
});
61 changes: 61 additions & 0 deletions packages/css/lib/index.ts
@@ -0,0 +1,61 @@
import { create as nano } from "nano-css";
import { addon as cache } from "nano-css/addon/cache";
// @ts-expect-error
import { addon as nesting } from "nano-css/addon/nesting";
import { addon as keyframes } from "nano-css/addon/keyframes";
import { addon as rule } from "nano-css/addon/rule";
import { addon as globalAddon } from "nano-css/addon/global";
import { addon as hydrate } from "nano-css/addon/hydrate";
import * as svbstrate from "@svbstrate/core";

function createCss() {
const n = nano();

cache(n);
nesting(n);
keyframes(n);
rule(n);
globalAddon(n);
hydrate(n);

return n;
}

export function create(theme?: Partial<svbstrate.ThemeConfig>) {
const t = theme ? svbstrate.createTheme(theme) : svbstrate.createTheme();
let css = createCss();

return {
explode(styles: svbstrate.SvbstrateStyleObject) {
return svbstrate.explode(styles, t);
},
style(styles: svbstrate.SvbstrateStyleObject) {
return svbstrate.style(styles, t);
},
pick<T>(props: Parameters<typeof svbstrate.pick<T>>[0]) {
return svbstrate.pick(props, t);
},
css(styles: svbstrate.SvbstrateStyleObject) {
const s = svbstrate.style(styles, t);
return Object.keys(s).length && css.rule ? css.rule(s) : "";
},
createGlobal(styles: svbstrate.SvbstrateStyleObject) {
const css = createCss();
css.global && css.global(svbstrate.style(styles, t));
return css.raw;
},
injectGlobal(styles: svbstrate.SvbstrateStyleObject) {
css.global && css.global(svbstrate.style(styles, t));
},
keyframes: css.keyframes,
flush() {
const raw = css.raw;
css = createCss();
console.log({ raw });
return raw;
},
get theme() {
return t;
},
};
}
29 changes: 29 additions & 0 deletions packages/css/package.json
@@ -0,0 +1,29 @@
{
"name": "@svbstrate/css",
"version": "0.0.0",
"description": "",
"main": "dist/index.cjs.js",
"module": "dist/index.esm.js",
"types": "dist/index.d.ts",
"scripts": {
"build": "node scripts/build && pnpm typegen",
"test": "vitest run --coverage",
"test:watch": "vitest --coverage",
"typecheck": "tsc --noEmit",
"typegen": "tsc --emitDeclarationOnly"
},
"repository": {
"type": "git",
"url": "git+ssh://[email protected]/front-of-house/monorepo.git"
},
"author": "estrattonbailey",
"license": "MIT",
"bugs": {
"url": "https://github.com/front-of-house/monorepo/issues"
},
"homepage": "https://github.com/front-of-house/monorepo#readme",
"dependencies": {
"@svbstrate/core": "workspace:^0.0.14",
"nano-css": "^5.3.5"
}
}
21 changes: 21 additions & 0 deletions packages/css/scripts/build.js
@@ -0,0 +1,21 @@
const path = require("path");

const options = {
sourcemap: true,
logLevel: "info",
bundle: true,
};

require("esbuild").buildSync({
entryPoints: ["lib/index.ts"],
format: "cjs",
outfile: path.join(__dirname, "../dist/index.cjs.js"),
...options,
});

require("esbuild").buildSync({
entryPoints: ["lib/index.ts"],
format: "esm",
outfile: path.join(__dirname, "../dist/index.esm.js"),
...options,
});
8 changes: 8 additions & 0 deletions packages/css/tsconfig.json
@@ -0,0 +1,8 @@
{
"extends": "../../tsconfig.json",
"include": ["lib"],
"compilerOptions": {
"declarationDir": "dist",
"lib": ["dom", "ES2021"]
}
}
9 changes: 9 additions & 0 deletions packages/css/vite.config.ts
@@ -0,0 +1,9 @@
import { defineConfig } from "vitest/config";

export default defineConfig({
test: {
coverage: {
reporter: ["text", "lcov"],
},
},
});