diff --git a/package.json b/package.json index a3f3fd0..cbaa0f6 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "preinstall": "npx only-allow pnpm", "start": "pnpm --filter site start", - "site": "pnpm --filter site start", + "site": "pnpm run build && pnpm --filter site start", "build": "pnpm -F './packages/**' build", "build:site": "pnpm --filter site build", "build:site:preview": "pnpm --filter site build:preview", diff --git a/packages/core/package.json b/packages/core/package.json index 344bacd..5306999 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,11 +3,21 @@ "version": "0.8.7", "description": "McFly core package", "type": "module", - "main": "index.js", + "main": "./dist/cli/index.js", "bin": { - "mcfly": "cli/index.js" + "mcfly": "./dist/cli/index.js" + }, + "exports": { + ".": { + "types": "./dist/cli/index.d.ts", + "default": "./dist/cli/index.js" + }, + "./runtime": "./dist/runtime/index.js", + "./cli": "./dist/cli/index.js", + "./package.json": "./package.json" }, "scripts": { + "build": "tsc", "version": "npm version", "publish": "npm publish", "test": "echo \"Error: no test specified\" && exit 1" diff --git a/packages/core/cli/commands/build.mjs b/packages/core/src/cli/commands/build.mjs similarity index 100% rename from packages/core/cli/commands/build.mjs rename to packages/core/src/cli/commands/build.mjs diff --git a/packages/core/cli/commands/generate.mjs b/packages/core/src/cli/commands/generate.mjs similarity index 100% rename from packages/core/cli/commands/generate.mjs rename to packages/core/src/cli/commands/generate.mjs diff --git a/packages/core/cli/commands/new.mjs b/packages/core/src/cli/commands/new.mjs similarity index 100% rename from packages/core/cli/commands/new.mjs rename to packages/core/src/cli/commands/new.mjs diff --git a/packages/core/cli/commands/prepare.mjs b/packages/core/src/cli/commands/prepare.mjs similarity index 100% rename from packages/core/cli/commands/prepare.mjs rename to packages/core/src/cli/commands/prepare.mjs diff --git a/packages/core/cli/commands/serve.mjs b/packages/core/src/cli/commands/serve.mjs similarity index 100% rename from packages/core/cli/commands/serve.mjs rename to packages/core/src/cli/commands/serve.mjs diff --git a/packages/core/cli/index.js b/packages/core/src/cli/index.js similarity index 100% rename from packages/core/cli/index.js rename to packages/core/src/cli/index.js diff --git a/packages/core/get-nitro-config.js b/packages/core/src/get-nitro-config.js similarity index 100% rename from packages/core/get-nitro-config.js rename to packages/core/src/get-nitro-config.js diff --git a/packages/core/mcfly-nitro-config.js b/packages/core/src/mcfly-nitro-config.js similarity index 100% rename from packages/core/mcfly-nitro-config.js rename to packages/core/src/mcfly-nitro-config.js diff --git a/packages/core/route-middleware.js b/packages/core/src/route-middleware.js similarity index 96% rename from packages/core/route-middleware.js rename to packages/core/src/route-middleware.js index de43f7d..b43e38a 100644 --- a/packages/core/route-middleware.js +++ b/packages/core/src/route-middleware.js @@ -13,7 +13,7 @@ import { evaluateServerScripts, injectHtmlFragments, injectCustomElements, -} from '@mcflyjs/core/runtime/index.js' // important to import from installed node_module because this script is passed to another context +} from '@mcflyjs/core/runtime' // important to import from installed node_module because this script is passed to another context /** * @typedef {import('../config').McFlyConfig} Config diff --git a/packages/core/runtime/default-mcfly-config.mjs b/packages/core/src/runtime/default-mcfly-config.mjs similarity index 100% rename from packages/core/runtime/default-mcfly-config.mjs rename to packages/core/src/runtime/default-mcfly-config.mjs diff --git a/packages/core/runtime/evaluate-scripts.mjs b/packages/core/src/runtime/evaluate-scripts.mjs similarity index 100% rename from packages/core/runtime/evaluate-scripts.mjs rename to packages/core/src/runtime/evaluate-scripts.mjs diff --git a/packages/core/runtime/get-files.mjs b/packages/core/src/runtime/get-files.mjs similarity index 100% rename from packages/core/runtime/get-files.mjs rename to packages/core/src/runtime/get-files.mjs diff --git a/packages/core/runtime/hooks.mjs b/packages/core/src/runtime/hooks.mjs similarity index 100% rename from packages/core/runtime/hooks.mjs rename to packages/core/src/runtime/hooks.mjs diff --git a/packages/core/runtime/index.js b/packages/core/src/runtime/index.js similarity index 100% rename from packages/core/runtime/index.js rename to packages/core/src/runtime/index.js diff --git a/packages/core/runtime/inject-elements.mjs b/packages/core/src/runtime/inject-elements.mjs similarity index 100% rename from packages/core/runtime/inject-elements.mjs rename to packages/core/src/runtime/inject-elements.mjs diff --git a/packages/core/runtime/inject-fragments.mjs b/packages/core/src/runtime/inject-fragments.mjs similarity index 100% rename from packages/core/runtime/inject-fragments.mjs rename to packages/core/src/runtime/inject-fragments.mjs diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json new file mode 100644 index 0000000..8756fd8 --- /dev/null +++ b/packages/core/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.json", + "include": ["src"], + "compilerOptions": { + "allowJs": true, + "emitDeclarationOnly": false, + "declarationDir": "./dist", + "outDir": "./dist", + "rootDir": "./src" + } +}