Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
shamefully-hoist=true
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pnpm-lock.yaml
*.md
**/*expected*.*
lerna.json
Expand Down
18 changes: 6 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,18 @@
"author": "Owen Buckley <owen@thegreenhouse.io>",
"license": "MIT",
"type": "module",
"workspaces": {
"packages": [
"packages/*",
"www"
]
},
"scripts": {
"lerna": "lerna",
"clean": "rimraf --glob ./packages/**/.greenwood/** ./packages/**/public/** ./coverage",
"clean:deps": "rimraf **/node_modules/**",
"build": "yarn workspace www build",
"serve": "yarn workspace www serve",
"dev": "yarn workspace www dev",
"build": "pnpm --filter www build",
"serve": "pnpm --filter www serve",
"dev": "pnpm --filter www dev",
"test": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 c8 mocha --exclude \"./packages/**/test/cases/loaders-*/**\" \"./packages/**/**/*.spec.js\"",
"test:loaders": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 node --import $(pwd)/test/test-register.js ./node_modules/mocha/bin/mocha \"./packages/**/**/*.spec.js\"",
"test:loaders:win": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 node --import file:\\\\%cd%\\test\\test-register.js ./node_modules/mocha/bin/mocha --exclude \"./packages/init/test/cases/**\" \"./packages/**/**/*.spec.js\"",
"test:tdd": "yarn test --watch",
"lint": "yarn run lint:ls && yarn run lint:js && yarn run lint:types",
"test:tdd": "pnpm run test --watch",
"lint": "pnpm run lint:ls && pnpm run lint:js && pnpm run lint:types",
"lint:js": "eslint",
"lint:ls": "ls-lint",
"lint:types": "tsc --project ./tsconfig.json",
Expand Down Expand Up @@ -58,7 +52,7 @@
"jsdom": "^16.5.0",
"lerna": "^8.2.4",
"lint-staged": "^15.4.3",
"mocha": "^9.1.3",
"mocha": "^11.7.4",
"prettier": "^3.4.2",
"rimraf": "^5.0.10",
"typescript": "^5.8.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ describe("Build Greenwood With: ", function () {
chunks = await glob.promise(path.join(outputPath, "adapter-output/webhook.*.js"));
});

it("should contain one javascript file in the output directory", async function () {
expect(chunks.length).to.equal(15);
it("should contain the expected javascript files in the output directory", async function () {
expect(chunks.length).to.equal(17);
});
});

Expand All @@ -227,7 +227,7 @@ describe("Build Greenwood With: ", function () {
});

it("should contain one javascript file in the output directory", async function () {
expect(chunks.length).to.equal(16);
expect(chunks.length).to.equal(18);
});
});
});
Expand Down
5 changes: 5 additions & 0 deletions packages/cli/test/cases/build.plugins.adapter/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"dependencies": {
"@aws-sdk/client-cloudfront": "^3.726.0"
}
}
5 changes: 3 additions & 2 deletions packages/init/src/template-base-ts/src/pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@

<style>
:root {
--font-primary: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
--font-primary:
system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
}

body {
Expand Down
5 changes: 3 additions & 2 deletions packages/init/src/template-base/src/pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@

<style>
:root {
--font-primary: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
--font-primary:
system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
}

body {
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-adapter-aws/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-adapter-netlify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"netlify-cli": "^15.10.0",
"zip-a-folder": "^2.0.0"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0",
"@greenwood/cli": "workspace:^",
"extract-zip": "^2.0.1"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-adapter-vercel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-babel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^0"
},
"dependencies": {
"@babel/core": "^7.10.4",
Expand All @@ -48,6 +48,6 @@
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-private-methods": "^7.10.4",
"@babel/runtime": "^7.10.4",
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-css-modules/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"acorn": "^8.14.0",
Expand All @@ -44,6 +44,6 @@
"node-html-parser": "^7.0.1"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-google-analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"@apollo/client": "^4.0.7",
Expand All @@ -52,6 +52,6 @@
"rxjs": "^7.8.2"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-graphql/src/schema/graph.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ const getCollection = async (root, { name, orderBy }, context) => {
const sortCollection = (collection, orderBy) => {
const compare = (a, b) => {
if (orderBy === "title_asc" || orderBy === "title_desc") {
(a = a?.title), (b = b?.title);
((a = a?.title), (b = b?.title));
}
if (orderBy === "order_asc" || orderBy === "order_desc") {
(a = a?.data.order), (b = b?.data?.order);
((a = a?.data.order), (b = b?.data?.order));
}
if (orderBy === "title_asc" || orderBy === "order_asc") {
if (a < b) {
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-import-commonjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"@rollup/plugin-commonjs": "^28.0.0",
"@rollup/stream": "^3.0.1",
"cjs-module-lexer": "^1.0.0"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0",
"@greenwood/cli": "workspace:^",
"lodash": "^4.17.20"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-import-jsx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"wc-compiler": "~0.17.1"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-import-raw/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-include-html/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-markdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"markdown-toc": "^1.2.0",
Expand All @@ -48,7 +48,7 @@
"unified": "^11.0.5"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0",
"@greenwood/cli": "workspace:^",
"@mapbox/rehype-prism": "^0.5.0",
"rehype-autolink-headings": "^4.0.0",
"rehype-slug": "^3.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/plugin-polyfills/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"@webcomponents/webcomponentsjs": "^2.6.0"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-postcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"postcss": "^8.4.49",
"postcss-import": "^16.1.0",
"postcss-preset-env": "^7.0.1"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0",
"@greenwood/cli": "workspace:^",
"@spectrum-css/typography": "^6.2.0"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-renderer-lit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0",
"@greenwood/cli": "workspace:^",
"lit": "^3.1.0"
},
"dependencies": {
"@lit-labs/ssr": "^3.2.0",
"@lit-labs/ssr-client": "^1.1.6"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0",
"@greenwood/cli": "workspace:^",
"lit": "^3.1.0"
}
}
4 changes: 2 additions & 2 deletions packages/plugin-renderer-puppeteer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"access": "public"
},
"peerDependencies": {
"@greenwood/cli": "^0.33.0"
"@greenwood/cli": "workspace:^"
},
"dependencies": {
"@webcomponents/webcomponentsjs": "^2.6.0",
"puppeteer": "^24.0.0"
},
"devDependencies": {
"@greenwood/cli": "^0.34.0-alpha.0"
"@greenwood/cli": "workspace:^"
}
}
Loading
Loading