From 63a0972995444ba9945876d9e160df5312d4c199 Mon Sep 17 00:00:00 2001 From: blurfx Date: Sun, 6 Aug 2023 22:45:24 +0900 Subject: [PATCH] release: 0.0.1 --- .changeset/itchy-chefs-help.md | 6 --- .changeset/nice-papayas-trade.md | 6 +++ .github/workflows/changeset.yml | 46 ------------------- .github/workflows/lint.yml | 37 +++++++++++++++ package.json | 5 +- packages/core/package.json | 8 +++- packages/highlighter/.lintstagedrc.js | 1 + packages/highlighter/package.json | 8 +++- .../highlighter/src/themes/github-dark.css | 30 ++++++------ .../highlighter/src/themes/github-light.css | 28 ++++++----- 10 files changed, 94 insertions(+), 81 deletions(-) delete mode 100644 .changeset/itchy-chefs-help.md create mode 100644 .changeset/nice-papayas-trade.md delete mode 100644 .github/workflows/changeset.yml create mode 100644 .github/workflows/lint.yml diff --git a/.changeset/itchy-chefs-help.md b/.changeset/itchy-chefs-help.md deleted file mode 100644 index eb8ec48..0000000 --- a/.changeset/itchy-chefs-help.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@calor/highlighter': major -'@calor/core': major ---- - -Support JavaScript, TypeScript and Go diff --git a/.changeset/nice-papayas-trade.md b/.changeset/nice-papayas-trade.md new file mode 100644 index 0000000..3a8d3d9 --- /dev/null +++ b/.changeset/nice-papayas-trade.md @@ -0,0 +1,6 @@ +--- +'@calor/highlighter': patch +'@calor/core': patch +--- + +Support JavaScript, TypeScript and Golang diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml deleted file mode 100644 index 1b1935a..0000000 --- a/.github/workflows/changeset.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Release - -on: - push: - branches: - - main - -permissions: - contents: write - pull-requests: write - -jobs: - release: - name: Release - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@master - with: - fetch-depth: 0 - - - name: Setup node.js - uses: actions/setup-node@master - with: - node-version: 18.x - - - uses: actions/cache@v1 - with: - path: ~/.pnpm-store - key: pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: pnpm- - - - name: Install pnpm - run: npm i -g pnpm - - - name: Install Dependencies - run: pnpm i --frozen-lockfile - - - name: "Create Pull Request or Publish to npm" - uses: changesets/action@v1 - with: - publish: pnpm ci:publish - version: pnpm ci:version - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..35c5363 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,37 @@ +name: Lint + +on: + pull_request: + branches: [ main ] + types: [ opened, reopened, synchronize ] + push: + branches: + - main + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - uses: pnpm/action-setup@v2 + name: Install pnpm + id: pnpm-install + with: + version: 8 + run_install: false + - uses: actions/setup-node@v3 + with: + node-version: 18.x + cache: 'pnpm' + - uses: actions/cache@v1 + with: + path: ~/.pnpm-store + key: pnpm-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: pnpm- + - name: Install Dependencies + run: pnpm i --frozen-lockfile + - name: Lint + run: pnpm lint diff --git a/package.json b/package.json index cfa2b6d..7dfc279 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,9 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "pre-commit": "pnpm run --filter \"@calor/*\" pre-commit", - "ci:version": "changeset version && pnpm install --no-frozen-lockfile", - "ci:publish": "pnpm build && changeset publish && pnpm install", + "lint": "pnpm run --filter \"@calor/*\" build && pnpm run --filter \"@calor/*\" lint", + "ci:version": "changeset version", + "ci:publish": "pnpm run --filter \"@calor/*\" build && changeset publish", "prepare": "husky install" }, "keywords": [], diff --git a/packages/core/package.json b/packages/core/package.json index b72fdc3..602c22c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -14,7 +14,10 @@ "build": "tsup", "test": "vitest", "pre-commit": "lint-staged", - "typecheck": "tsc --noEmit --project ." + "typecheck": "tsc --noEmit --project .", + "dry:eslint": "eslint --ext .ts,.tsx ./src ./tests", + "dry:prettier": "prettier --check ./src ./tests", + "lint": "pnpm run typecheck && pnpm run dry:eslint && pnpm run dry:prettier" }, "devDependencies": { "eslint-config-calor": "workspace:*", @@ -22,5 +25,8 @@ "typescript": "^5.0.2", "vite": "^4.3.2", "vitest": "^0.31.0" + }, + "publishConfig": { + "access": "public" } } diff --git a/packages/highlighter/.lintstagedrc.js b/packages/highlighter/.lintstagedrc.js index c93f103..a8ed073 100644 --- a/packages/highlighter/.lintstagedrc.js +++ b/packages/highlighter/.lintstagedrc.js @@ -1,4 +1,5 @@ export default { 'src/**/*.{ts,tsx}': () => 'pnpm typecheck', 'src/**/*.{js,jsx,ts,tsx}': ['prettier --write', 'eslint --fix'], + 'src/**/*.{css}': ['prettier --write'], }; diff --git a/packages/highlighter/package.json b/packages/highlighter/package.json index 44d354d..26efaf7 100644 --- a/packages/highlighter/package.json +++ b/packages/highlighter/package.json @@ -14,7 +14,10 @@ "scripts": { "build": "tsup", "pre-commit": "lint-staged", - "typecheck": "tsc --noEmit --project ." + "typecheck": "tsc --noEmit --project .", + "dry:eslint": "eslint --ext .ts,.tsx ./src", + "dry:prettier": "prettier --check ./src", + "lint": "pnpm run typecheck && pnpm run dry:eslint && pnpm run dry:prettier" }, "keywords": [], "author": "", @@ -27,5 +30,8 @@ }, "peerDependencies": { "@calor/core": "^0.0.1" + }, + "publishConfig": { + "access": "public" } } diff --git a/packages/highlighter/src/themes/github-dark.css b/packages/highlighter/src/themes/github-dark.css index 5e6f4fa..8f0f434 100644 --- a/packages/highlighter/src/themes/github-dark.css +++ b/packages/highlighter/src/themes/github-dark.css @@ -1,32 +1,36 @@ .calor-wrapper { - background-color: #0d1117; + background-color: #0d1117; } -.calor-plain, .calor-symbol { - color: #e6edf3; +.calor-plain, +.calor-symbol { + color: #e6edf3; } -.calor-keyword, .calor-bool, .calor-operator { - color: #ff7b72; +.calor-keyword, +.calor-bool, +.calor-operator { + color: #ff7b72; } -.calor-number, .calor-function { - color: #79c0ff; +.calor-number, +.calor-function { + color: #79c0ff; } .calor-comment { - color: #8b949e; - font-style: italic; + color: #8b949e; + font-style: italic; } .calor-type { - color: #f89859; + color: #f89859; } .calor-class { - color: #d2a8ff; + color: #d2a8ff; } .calor-string { - color: #a5d6ff; -} \ No newline at end of file + color: #a5d6ff; +} diff --git a/packages/highlighter/src/themes/github-light.css b/packages/highlighter/src/themes/github-light.css index e206a02..ab7e407 100644 --- a/packages/highlighter/src/themes/github-light.css +++ b/packages/highlighter/src/themes/github-light.css @@ -1,32 +1,36 @@ .calor-wrapper { - background-color: #fff; + background-color: #fff; } -.calor-plain, .calor-symbol { - color: #24292e; +.calor-plain, +.calor-symbol { + color: #24292e; } -.calor-keyword, .calor-bool, .calor-operator { - color: #cf222e; +.calor-keyword, +.calor-bool, +.calor-operator { + color: #cf222e; } -.calor-number, .calor-function { - color: #0550ae; +.calor-number, +.calor-function { + color: #0550ae; } .calor-comment { - color: #6e7781; - font-style: italic; + color: #6e7781; + font-style: italic; } .calor-type { - color: #e36209; + color: #e36209; } .calor-class { - color: #8250df; + color: #8250df; } .calor-string { - color: #4d804e; + color: #4d804e; }