chore: move node related files for static folder

lepture · Jun 3, 2023 · 04b0a5a · 04b0a5a
1 parent dfc41c7
commit 04b0a5a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -28,7 +28,10 @@ jobs:
         node-version: 18
 
     - run: npm ci
+      working-directory: static
+
     - run: npm run build
+      working-directory: static
 
     - uses: actions/setup-python@v4
       with:

diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -18,8 +18,12 @@ jobs:
     - uses: actions/setup-node@v3
       with:
         node-version: 18
+
     - run: npm ci
+      working-directory: static
+
     - run: npm run build
+      working-directory: static
 
     - uses: actions/setup-python@v4
       with:

diff --git a/Makefile b/Makefile
@@ -5,4 +5,4 @@ build-icons:
 	node scripts/genicons.js
 
 build-static:
-	npm run build
+	cd static && npm run build
diff --git a/package-lock.json → static/package-lock.json b/package-lock.json → static/package-lock.json
diff --git a/package.json → static/package.json b/package.json → static/package.json
@@ -2,8 +2,8 @@
   "name": "shibuya",
   "private": true,
   "scripts": {
-    "build:js": "esbuild static/index.js --bundle --outfile=src/shibuya/theme/shibuya/static/shibuya.js",
-    "build:css": "npx tailwindcss -i ./static/index.css -o src/shibuya/theme/shibuya/static/shibuya.css",
+    "build:js": "esbuild index.js --bundle --outfile=../src/shibuya/theme/shibuya/static/shibuya.js",
+    "build:css": "npx tailwindcss -i index.css -o ../src/shibuya/theme/shibuya/static/shibuya.css",
     "build": "npm run build:js -- --minify && npm run build:css -- --minify",
     "dev:js": "npm run build:js -- --watch",
     "dev:css": "npm run build:css -- --watch"

diff --git a/tailwind.config.js → static/tailwind.config.js b/tailwind.config.js → static/tailwind.config.js
@@ -1,7 +1,7 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   darkMode: ['class'],
-  content: ["./src/shibuya/theme/**/*.html"],
+  content: ["../src/shibuya/theme/**/*.html"],
   theme: {
     extend: {}
   },