diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index ed9ea5e0e..a3948350e 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -46,6 +46,8 @@ jobs: - run: npm run deploy - name: Upload artifact uses: actions/upload-pages-artifact@v3 + with: + path: _site/public # Deployment job deploy: diff --git a/package.json b/package.json index a7c06a4e3..972c022b6 100644 --- a/package.json +++ b/package.json @@ -29,14 +29,14 @@ "preview": "marko-run preview", "start": "marko-run", "test": "npm run build:css", - "deploy": "node scripts/jekyll-config && BASE_URL=/skin/ marko-run build -o ./_site && npm run build:storybook && ncp docs/archive _site/archive && touch _site/.nojekyll", - "deploy:only": "node scripts/jekyll-config && marko-run build -o ./_site && npm run build:storybook && ncp docs/archive _site/archive && touch _site/.nojekyll", + "deploy": "node scripts/jekyll-config && BASE_URL=/skin/ marko-run build -o ./_site && npm run build:storybook && ncp docs/archive _site/public/archive && touch _site/public/.nojekyll", + "deploy:only": "node scripts/jekyll-config && marko-run build -o ./_site && npm run build:storybook && ncp docs/archive _site/public/archive && touch _site/public/.nojekyll", "prebuild": "npm run clean", "prepublishOnly": "node scripts gen", "postpublish": "node scripts clean", "build": "npm run build:css && npm run lint:js && npm run copy", "build:css": "npm run lint:sass && rimraf dist && npm run bundle && npm run postcss && node scripts/add-y-comments.js && prettier dist --write && npm run lint:css", - "build:storybook": "npm run copy:assetsToStorybook && storybook build -o ./_site/storybook", + "build:storybook": "npm run copy:assetsToStorybook && storybook build -o ./_site/public/storybook", "clean": "rimraf _cdn _site .cache .tmp .jekyll npm-debug.log.* .DS_Store", "bundle": "sass src/sass:dist --no-source-map", "postcss": "postcss dist/**/*.css -r ",