Skip to content

Commit f5359e8

Browse files
authored
Merge pull request #6 from VAR-META-Tech/0.0.9
0.0.9
2 parents ce226bc + f26b628 commit f5359e8

39 files changed

Lines changed: 1171 additions & 372 deletions

.github/workflows/code-check.yml

Lines changed: 28 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -5,112 +5,58 @@ on:
55
branches: ['*']
66

77
jobs:
8-
lint:
8+
code-check:
99
runs-on: ubuntu-latest
10-
name: pnpm lint
10+
name: Code check
1111
steps:
12+
# Checkout the repository
1213
- uses: actions/checkout@v3
1314
with:
1415
fetch-depth: 0
1516

17+
# Set up Node.js environment
1618
- name: Install Node.js
1719
uses: actions/setup-node@v3
1820
with:
19-
node-version: 16
21+
node-version: 18 # Specify the Node.js version
2022

21-
- uses: pnpm/action-setup@v2.2.4
22-
name: Install pnpm
23-
id: pnpm-install
23+
# Install pnpm
24+
- name: Install pnpm
25+
uses: pnpm/action-setup@v3
2426
with:
25-
version: 8.6.1
27+
version: 9.0.4
2628
run_install: false
2729

30+
# Get pnpm store directory
2831
- name: Get pnpm store directory
2932
id: pnpm-cache
30-
run: |
31-
echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
32-
- uses: actions/cache@v3
33-
name: Setup pnpm cache
34-
with:
35-
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
36-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
37-
restore-keys: |
38-
${{ runner.os }}-pnpm-store-
39-
- name: Install dependencies
40-
run: pnpm install
41-
42-
- run: pnpm lint
43-
44-
format:
45-
runs-on: ubuntu-latest
46-
name: pnpm format:check
47-
steps:
48-
- uses: actions/checkout@v3
49-
with:
50-
fetch-depth: 0
51-
52-
- name: Install Node.js
53-
uses: actions/setup-node@v3
54-
with:
55-
node-version: 16
33+
run: echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
5634

57-
- uses: pnpm/action-setup@v2.2.4
58-
name: Install pnpm
59-
id: pnpm-install
60-
with:
61-
version: 8.6.1
62-
run_install: false
63-
64-
- name: Get pnpm store directory
65-
id: pnpm-cache
66-
run: |
67-
echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
68-
69-
- uses: actions/cache@v3
70-
name: Setup pnpm cache
35+
# Cache pnpm store
36+
- name: Setup pnpm cache
37+
uses: actions/cache@v3
7138
with:
7239
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
7340
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
7441
restore-keys: |
7542
${{ runner.os }}-pnpm-store-
7643
44+
# Install dependencies
7745
- name: Install dependencies
78-
run: pnpm install
46+
run: pnpm install --no-frozen-lockfile
7947

80-
- run: pnpm format:check
48+
# Run linter
49+
- name: Run linter
50+
run: pnpm lint
8151

82-
tsc:
83-
runs-on: ubuntu-latest
84-
name: pnpm check-types
85-
steps:
86-
- uses: actions/checkout@v3
87-
with:
88-
fetch-depth: 0
52+
# Check code formatting
53+
- name: Check code formatting
54+
run: pnpm format:check
8955

90-
- name: Install Node.js
91-
uses: actions/setup-node@v3
92-
with:
93-
node-version: 16
94-
95-
- uses: pnpm/action-setup@v2.2.4
96-
name: Install pnpm
97-
id: pnpm-install
98-
with:
99-
version: 8.6.1
100-
run_install: false
101-
102-
- name: Get pnpm store directory
103-
id: pnpm-cache
104-
run: |
105-
echo "pnpm_cache_dir=$(pnpm store path)" >> $GITHUB_OUTPUT
106-
- uses: actions/cache@v3
107-
name: Setup pnpm cache
108-
with:
109-
path: ${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
110-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
111-
restore-keys: |
112-
${{ runner.os }}-pnpm-store-
113-
- name: Install dependencies
114-
run: pnpm install
56+
# Check types
57+
- name: Check types
58+
run: pnpm check-types
11559

116-
- run: pnpm check-types
60+
# Test apps
61+
- name: Test apps
62+
run: pnpm test

.github/workflows/test.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

apps/remix-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"type": "module",
66
"scripts": {
77
"build": "remix vite:build",
8-
"dev": "remix vite:dev",
8+
"dev:remix": "remix vite:dev",
99
"start": "remix-serve ./build/server/index.js",
1010
"typecheck": "tsc"
1111
},

apps/web/next.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* eslint-disable turbo/no-undeclared-env-vars */
22
/** @type {import('next').NextConfig} */
33
const nextConfig = {
4-
// experimental: {
5-
// optimizePackageImports: ['@var-meta/icons', '@var-meta/ui'],
6-
// },
4+
experimental: {
5+
optimizePackageImports: ['@var-meta/icons', '@var-meta/ui'],
6+
},
77
};
88

99
module.exports = nextConfig;

0 commit comments

Comments
 (0)