diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..c483022c0 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +shamefully-hoist=true \ No newline at end of file diff --git a/.prettierignore b/.prettierignore index f53940ab7..0a95f1d0c 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,4 @@ +pnpm-lock.yaml *.md **/*expected*.* lerna.json diff --git a/package.json b/package.json index 755e4bc59..bc7fd3fa6 100644 --- a/package.json +++ b/package.json @@ -6,24 +6,18 @@ "author": "Owen Buckley ", "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", @@ -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" diff --git a/packages/cli/test/cases/build.plugins.adapter/build.config.plugins-adapter.spec.js b/packages/cli/test/cases/build.plugins.adapter/build.config.plugins-adapter.spec.js index 976067c11..e9d4dd563 100644 --- a/packages/cli/test/cases/build.plugins.adapter/build.config.plugins-adapter.spec.js +++ b/packages/cli/test/cases/build.plugins.adapter/build.config.plugins-adapter.spec.js @@ -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); }); }); @@ -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); }); }); }); diff --git a/packages/cli/test/cases/build.plugins.adapter/package.json b/packages/cli/test/cases/build.plugins.adapter/package.json new file mode 100644 index 000000000..8b99de07b --- /dev/null +++ b/packages/cli/test/cases/build.plugins.adapter/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@aws-sdk/client-cloudfront": "^3.726.0" + } +} diff --git a/packages/init/src/template-base-ts/src/pages/index.html b/packages/init/src/template-base-ts/src/pages/index.html index 87dfd1e3a..b64ef803c 100644 --- a/packages/init/src/template-base-ts/src/pages/index.html +++ b/packages/init/src/template-base-ts/src/pages/index.html @@ -9,8 +9,9 @@