diff --git a/Dockerfile b/Dockerfile index fbc8d5c..0bb9311 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,20 @@ -FROM node:15 as build +FROM node:16 as build # https://github.com/jgm/pandoc/releases RUN curl -LO https://github.com/jgm/pandoc/releases/download/2.14.0.1/pandoc-2.14.0.1-1-amd64.deb RUN dpkg -i pandoc-2.14.0.1-1-amd64.deb WORKDIR /app -COPY package.json /app/ -RUN yarn install -COPY themes /app/themes -COPY source /app/source -COPY _config.yml /app/ +COPY package.json yarn.lock ./ +RUN yarn install --frozen-lockfile + +COPY themes themes +COPY source source +COPY _config.yml ./ RUN yarn build FROM nginx:stable-alpine as runtime COPY nginx.conf /etc/nginx/nginx.conf -COPY --from=build /app/public /var/www/html/ \ No newline at end of file +COPY --from=build /app/public /var/www/html/ diff --git a/_config.yml b/_config.yml index a01c519..07094cf 100644 --- a/_config.yml +++ b/_config.yml @@ -28,6 +28,9 @@ node_sass: precision: 5 sourceComments: false +sass: + outputStyle: expanded + # URL ## If your site is put in a subdirectory, set url as 'http://example.com/child' and root as '/child/' url: https://uechi.io @@ -142,4 +145,3 @@ feed: atom: enable: true output: "feed.xml" - diff --git a/package.json b/package.json index b24b9f0..a498e2f 100644 --- a/package.json +++ b/package.json @@ -9,27 +9,27 @@ "test": "lint-staged" }, "dependencies": { - "hexo": "^6.0.0", - "hexo-excerpt": "^1.2.1", + "hexo": "6.0.0", + "hexo-excerpt": "^1.3.0", "hexo-feed": "^1.1.0", - "hexo-filter-mathjax": "^0.8.0", + "hexo-filter-mathjax": "^0.8.1", "hexo-generator-archive": "^1.0.0", "hexo-generator-category": "^1.0.0", "hexo-generator-index": "^2.0.0", "hexo-generator-tag": "^1.0.0", + "hexo-renderer-dartsass": "^0.1.2", "hexo-renderer-ejs": "^2.0.0", "hexo-renderer-pandoc": "^0.3.1", - "hexo-renderer-sass": "^0.4.0", - "hexo-renderer-stylus": "^2.0.0", + "hexo-renderer-stylus": "^2.1.0", "hexo-server": "^3.0.0", "hexo-theme-landscape": "^0.0.3" }, "devDependencies": { - "textlint": "^11.9.0", + "textlint": "^12.1.1", "textlint-filter-rule-whitelist": "^2.0.0", "textlint-rule-common-misspellings": "^1.0.1", "textlint-rule-no-start-duplicated-conjunction": "^2.0.2", - "textlint-rule-preset-japanese": "^6.0.1" + "textlint-rule-preset-japanese": "^7.0.0" }, "hexo": { "version": "6.0.0"