From e31e276781227826a7d1a1d3cc70dfb45c617d9d Mon Sep 17 00:00:00 2001 From: "Fred K. Schott" Date: Wed, 21 Jul 2021 17:39:14 -0700 Subject: [PATCH] get build-all passing (#795) --- .../blog-multiple-authors/src/pages/$posts.astro | 11 ----------- examples/with-nanostores/astro.config.mjs | 2 +- package.json | 12 ++++++++---- packages/astro/package.json | 2 +- .../test/fixtures/builtins-polyfillnode/package.json | 1 + packages/astro/test/fixtures/builtins/package.json | 1 + .../test/fixtures/builtins/packages/dep/package.json | 1 + .../custom-elements/my-component-lib/package.json | 3 ++- .../astro/test/fixtures/custom-elements/package.json | 1 + packages/create-astro/package.json | 3 ++- tools/language-server/package.json | 4 ++-- tools/vscode/package.json | 5 +++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples/blog-multiple-authors/src/pages/$posts.astro b/examples/blog-multiple-authors/src/pages/$posts.astro index 13cff23df5..d135beff06 100644 --- a/examples/blog-multiple-authors/src/pages/$posts.astro +++ b/examples/blog-multiple-authors/src/pages/$posts.astro @@ -23,17 +23,6 @@ export function createCollection() { posts: paginate(sortedPosts, {pageSize: 2}), } }, - rss: { - title: 'Don’s Blog', - description: 'An example blog on Astro', - customData: `en-us`, - item: (item) => ({ - title: item.title, - description: item.description, - link: item.url, - pubDate: item.date, - }), - } }; } diff --git a/examples/with-nanostores/astro.config.mjs b/examples/with-nanostores/astro.config.mjs index 05b7f09619..fcabea809f 100644 --- a/examples/with-nanostores/astro.config.mjs +++ b/examples/with-nanostores/astro.config.mjs @@ -9,7 +9,7 @@ export default { }, devOptions: { // port: 3000, // The port to run the dev server on. - tailwindConfig: './tailwind.config.js', // Path to tailwind.config.js if used, e.g. './tailwind.config.js' + // tailwindConfig: './tailwind.config.js', // Path to tailwind.config.js if used, e.g. './tailwind.config.js' }, renderers: ['@astrojs/renderer-preact', '@astrojs/renderer-react', '@astrojs/renderer-svelte', '@astrojs/renderer-vue'], }; diff --git a/package.json b/package.json index e5858f75de..753f9a6b26 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,15 @@ "release": "yarn build && yarn changeset publish", "benchmark": "yarn workspace astro run benchmark", "build": "yarn build:core", - "build:all": "lerna run build", "build:one": "lerna run build --scope", - "build:core": "lerna run build --scope astro --scope @astrojs/parser --scope @astrojs/markdown-support", - "build:vscode": "lerna run build --scope astro-languageserver --scope astro-vscode --scope @astrojs/parser", - "dev:vscode": "lerna run dev --scope astro-languageserver --scope astro-vscode --scope @astrojs/parser --parallel --stream", + "build:all": "lerna run build --scope \"{astro,@astrojs/*}\"", + "build:core": "lerna run build --scope \"{astro,@astrojs/parser,@astrojs/markdown-support}\"", + "build:vscode": "lerna run build --scope \"{@astrojs/language-server,astro-vscode,@astrojs/parser}\"", + "dev": "yarn dev:core --parallel --stream", + "dev:one": "lerna run dev --scope --parallel --stream", + "dev:all": "lerna run dev --scope \"{astro,@astrojs/*}\" --parallel --stream", + "dev:core": "lerna run dev --scope \"{astro,@astrojs/parser,@astrojs/markdown-support}\" --parallel --stream", + "dev:vscode": "lerna run dev --scope \"{@astrojs/language-server,astro-vscode,@astrojs/parser}\" --parallel --stream", "format": "prettier -w .", "lint": "eslint \"packages/**/*.ts\"", "test": "yarn workspace astro run test", diff --git a/packages/astro/package.json b/packages/astro/package.json index fd7ec81fe7..8643189f08 100644 --- a/packages/astro/package.json +++ b/packages/astro/package.json @@ -36,8 +36,8 @@ ], "scripts": { "build": "astro-scripts build \"src/**/*.ts\" && tsc", - "postbuild": "astro-scripts copy \"src/**/*.astro\"", "dev": "astro-scripts dev \"src/**/*.ts\"", + "postbuild": "astro-scripts copy \"src/**/*.astro\"", "benchmark": "node test/benchmark/dev.bench.js && node test/benchmark/build.bench.js", "test": "uvu test -i fixtures -i benchmark -i test-utils.js" }, diff --git a/packages/astro/test/fixtures/builtins-polyfillnode/package.json b/packages/astro/test/fixtures/builtins-polyfillnode/package.json index 1c13826191..ce522c2b65 100644 --- a/packages/astro/test/fixtures/builtins-polyfillnode/package.json +++ b/packages/astro/test/fixtures/builtins-polyfillnode/package.json @@ -1,6 +1,7 @@ { "name": "@astrojs/astro-test-builtins-polyfillnode", "version": "1.2.0", + "private": true, "dependencies": { "file-url": "4.0.0" } diff --git a/packages/astro/test/fixtures/builtins/package.json b/packages/astro/test/fixtures/builtins/package.json index 8923fbd49c..269d5f4395 100644 --- a/packages/astro/test/fixtures/builtins/package.json +++ b/packages/astro/test/fixtures/builtins/package.json @@ -1,6 +1,7 @@ { "name": "@astrojs/astro-test-builtins", "version": "1.2.0", + "private": true, "dependencies": { "@astrojs/astro-test-builtins-dep": "file:./packages/dep" } diff --git a/packages/astro/test/fixtures/builtins/packages/dep/package.json b/packages/astro/test/fixtures/builtins/packages/dep/package.json index 808f1aa4a7..c5ce27f5ea 100644 --- a/packages/astro/test/fixtures/builtins/packages/dep/package.json +++ b/packages/astro/test/fixtures/builtins/packages/dep/package.json @@ -1,6 +1,7 @@ { "name": "@astrojs/astro-test-builtins-dep", "version": "0.0.1", + "private": true, "module": "main.js", "main": "main.js" } \ No newline at end of file diff --git a/packages/astro/test/fixtures/custom-elements/my-component-lib/package.json b/packages/astro/test/fixtures/custom-elements/my-component-lib/package.json index 0b22e99c7d..f3f1fb194f 100644 --- a/packages/astro/test/fixtures/custom-elements/my-component-lib/package.json +++ b/packages/astro/test/fixtures/custom-elements/my-component-lib/package.json @@ -1,6 +1,7 @@ { "name": "@astrojs/test-custom-element-renderer", - "main": "index.js", "version": "0.0.1", + "private": true, + "main": "index.js", "type": "module" } \ No newline at end of file diff --git a/packages/astro/test/fixtures/custom-elements/package.json b/packages/astro/test/fixtures/custom-elements/package.json index 0770564878..f7bfe012a4 100644 --- a/packages/astro/test/fixtures/custom-elements/package.json +++ b/packages/astro/test/fixtures/custom-elements/package.json @@ -1,6 +1,7 @@ { "name": "@astrojs/test-custom-elements", "version": "0.0.1", + "private": true, "dependencies": { "@astrojs/test-custom-element-renderer": "0.0.1" } diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index 8799f8abdc..adb4cdf7f2 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -14,7 +14,8 @@ "create-astro": "./create-astro.mjs" }, "scripts": { - "build": "astro-scripts build \"src/*.ts\"", + "build": "astro-scripts build \"src/**/*.ts\" && tsc", + "dev": "astro-scripts dev \"src/**/*.ts\"", "prepare": "yarn build", "test": "rm -rf test/fixtures && mkdir test/fixtures && node --unhandled-rejections=strict test/create-astro.test.js" }, diff --git a/tools/language-server/package.json b/tools/language-server/package.json index fe05e8d8bb..a52acd8a7c 100644 --- a/tools/language-server/package.json +++ b/tools/language-server/package.json @@ -15,8 +15,8 @@ "types" ], "scripts": { - "build": "astro-scripts build 'src/index.ts'", - "dev": "astro-scripts dev 'src/index.ts'" + "build": "astro-scripts build \"src/**/*.ts\"", + "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { "source-map": "^0.7.3", diff --git a/tools/vscode/package.json b/tools/vscode/package.json index 4b6b1266f4..cb2c6db90f 100644 --- a/tools/vscode/package.json +++ b/tools/vscode/package.json @@ -12,11 +12,12 @@ "author": "Astro", "license": "MIT", "publisher": "astro-build", + "private": true, "scripts": { "vscode:prepublish": "yarn build", "vscode:publish": "node ./scripts/publish.mjs", - "build": "astro-scripts build 'src/index.ts'", - "dev": "astro-scripts dev 'src/index.ts'" + "build": "astro-scripts build \"src/**/*.ts\" && tsc -p tsconfig.json", + "dev": "astro-scripts dev \"src/**/*.ts\"" }, "engines": { "vscode": "^1.52.0"