Skip to content

Commit

Permalink
Merge branch 'main' into cg/addCreateSitesFromTemplateFeature
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasholzer authored Feb 4, 2022
2 parents 786f1e2 + c2f4f1d commit 72425d0
Show file tree
Hide file tree
Showing 16 changed files with 325 additions and 195 deletions.
98 changes: 49 additions & 49 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"test:ci:ava:integration": "c8 -r json ava --concurrency 1 --no-worker-threads tests/integration/**/*.test.js",
"test:affected": "node ./tools/affected-test.js",
"e2e": "node ./tools/e2e/run.mjs",
"docs": "node ./site/scripts/docs.js",
"docs": "node ./site/scripts/docs.mjs",
"watch": "c8 --reporter=lcov ava --watch",
"site:build": "run-s site:build:*",
"site:build:install": "cd site && npm ci --no-audit",
Expand All @@ -77,14 +77,14 @@
"prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!.github/**/*.md\""
},
"dependencies": {
"@netlify/build": "^26.2.2",
"@netlify/build": "^26.2.3",
"@netlify/config": "^17.0.6",
"@netlify/framework-info": "^9.0.0",
"@netlify/local-functions-proxy": "^1.1.1",
"@netlify/plugin-edge-handlers": "^3.0.4",
"@netlify/plugins-list": "^6.3.1",
"@netlify/plugins-list": "^6.6.0",
"@netlify/routing-local-proxy": "^0.34.1",
"@netlify/zip-it-and-ship-it": "^5.5.0",
"@netlify/zip-it-and-ship-it": "^5.5.2",
"@octokit/rest": "^18.0.0",
"@sindresorhus/slugify": "^1.1.0",
"ansi-escapes": "^5.0.0",
Expand Down Expand Up @@ -148,7 +148,7 @@
"multiparty": "^4.2.1",
"netlify": "^10.1.2",
"netlify-headers-parser": "^6.0.1",
"netlify-onegraph-internal": "0.0.16",
"netlify-onegraph-internal": "0.0.18",
"netlify-redirect-parser": "^13.0.1",
"netlify-redirector": "^0.2.1",
"node-fetch": "^2.6.0",
Expand Down Expand Up @@ -203,7 +203,7 @@
"proxyquire": "^2.1.3",
"seedrandom": "^3.0.5",
"serialize-javascript": "^6.0.0",
"sinon": "^12.0.0",
"sinon": "^13.0.0",
"sort-on": "^4.1.0",
"strip-ansi": "^6.0.0",
"supertest": "^6.1.6",
Expand Down
11 changes: 0 additions & 11 deletions site/config.js

This file was deleted.

9 changes: 9 additions & 0 deletions site/config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { join } from 'path'
import { fileURLToPath } from 'url'

export const rootDir = fileURLToPath(new URL('..', import.meta.url))

export const docs = {
srcPath: join(rootDir, 'docs'),
outputPath: join(rootDir, 'site/src'),
}
50 changes: 0 additions & 50 deletions site/fs.js

This file was deleted.

Loading

0 comments on commit 72425d0

Please sign in to comment.