diff --git a/README.md b/README.md index 4686d43f..60afeb82 100644 --- a/README.md +++ b/README.md @@ -68,5 +68,5 @@ cd webring yarn # start a local build server and the gulp pipeline -yarn start +yarn dev ``` diff --git a/netlify.toml b/netlify.toml index 1be4e14d..182b9e12 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,7 +1,10 @@ [build] - command = "npm run build" + command = "yarn build" publish = "dist" - Functions = "functions" + functions = ".netlify/functions" + +[functions] + node_bundler = "esbuild" [[headers]] for = "/*" diff --git a/package.json b/package.json index 642460f4..d6db00be 100644 --- a/package.json +++ b/package.json @@ -9,18 +9,20 @@ "url": "http://github.com/maxboeck/webring" }, "scripts": { - "start": "ELEVENTY_ENV=development eleventy --serve", - "build": "ELEVENTY_ENV=production eleventy && npm run build:lambda", - "serve:lambda": "netlify-lambda serve _lambda", - "build:lambda": "netlify-lambda build _lambda" + "start": "eleventy --serve", + "build": "eleventy && netlify functions:build --functions .netlify/functions --src _lambda", + "dev": "netlify dev" }, "dependencies": { - "@11ty/eleventy": "^0.11.0", - "@11ty/eleventy-plugin-syntaxhighlight": "^3.0.1", - "clean-css": "^4.2.3", + "@11ty/eleventy": "^3.0.0", + "@11ty/eleventy-plugin-syntaxhighlight": "^5.0.0", + "clean-css": "^5.3.3", "cssesc": "^3.0.0", "html-minifier": "^4.0.0", - "netlify-lambda": "^1.6.3", - "node-sass": "^4.14.1" + "sass": "^1.83.4" + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e", + "devDependencies": { + "netlify-cli": "^18.0.1" } } diff --git a/src/assets/styles/styles.11ty.js b/src/assets/styles/styles.11ty.js index d0eece97..7ea5e082 100644 --- a/src/assets/styles/styles.11ty.js +++ b/src/assets/styles/styles.11ty.js @@ -1,6 +1,6 @@ const fs = require('fs') const path = require('path') -const sass = require('node-sass') +const sass = require('sass') const CleanCSS = require('clean-css') const cssesc = require('cssesc') diff --git a/src/data/meta.json b/src/data/meta.json index cbe025fe..f8a9d3d7 100644 --- a/src/data/meta.json +++ b/src/data/meta.json @@ -2,7 +2,7 @@ "title": "Nerds of the 90s", "description": "This is just a demo of a webring. It could be about anything - Metal Bands, Knitting, Craft Beer, Accessibility... For this one, let's just say it's about the good old 90s.", "image": "freakazoid.jpg", - "url": "https://webringdemo.netlify.com", + "url": "https://webringdemo.netlify.app", "repo": "https://github.com/maxboeck/webring", "admins": [ {