Skip to content
Merged
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
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
strict-peer-dependencies=false
auto-install-peers=true
6 changes: 3 additions & 3 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"!{projectRoot}/.eslintrc.json",
"!{projectRoot}/eslint.config.mjs",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
"!{projectRoot}/src/test-setup.[jt]s",
"!{projectRoot}/test-setup.[jt]s"
"!{projectRoot}/tsconfig.spec.json",
"!{projectRoot}/src/test-setup.[jt]s"
],
"sharedGlobals": ["{workspaceRoot}/.github/workflows/ci.yml"]
},
Expand All @@ -22,7 +22,7 @@
},
"build": {
"targetName": "build",
"configName": "tsconfig.json",
"configName": "tsconfig.lib.json",
"buildDepsName": "build-deps",
"watchDepsName": "watch-deps"
}
Expand Down
2 changes: 2 additions & 0 deletions packages/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"exports": {
"./package.json": "./package.json",
".": {
"development": "./src/index.ts",
"types": "./dist/index.d.ts",
"import": "./dist/index.js",
"default": "./dist/index.js"
}
},
Expand Down
13 changes: 9 additions & 4 deletions packages/js/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"extends": "../../tsconfig.base.json",
"files": [],
"include": [
"src/**/*.ts",
"tests/**/*.ts"
],
"include": [],
"references": [
{
"path": "./tsconfig.lib.json"
},
{
"path": "./tsconfig.spec.json"
}
]
}
28 changes: 28 additions & 0 deletions packages/js/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"baseUrl": ".",
"rootDir": "src",
"outDir": "dist",
"tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo",
"emitDeclarationOnly": false,
"forceConsistentCasingInFileNames": true,
"types": ["node"]
},
"include": ["src/**/*.ts"],
"references": [],
"exclude": [
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
"src/**/*.spec.tsx",
"src/**/*.test.js",
"src/**/*.spec.js",
"src/**/*.test.jsx",
"src/**/*.spec.jsx"
]
}
34 changes: 34 additions & 0 deletions packages/js/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/vitest",
"types": [
"vitest/globals",
"vitest/importMeta",
"vite/client",
"node",
"vitest"
],
"forceConsistentCasingInFileNames": true
},
"include": [
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
"src/**/*.spec.tsx",
"src/**/*.test.js",
"src/**/*.spec.js",
"src/**/*.test.jsx",
"src/**/*.spec.jsx",
"src/**/*.d.ts"
],
"references": [
{
"path": "./tsconfig.lib.json"
}
]
}
2 changes: 1 addition & 1 deletion packages/js/tsconfig.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"root":["./src/index.ts","./src/utils/helper.ts","./tests/index.test.ts","./tests/utils/helper.test.ts"],"version":"5.7.3"}
{"fileNames":[],"fileInfos":[],"root":[],"options":{"composite":true,"declarationMap":true,"emitDeclarationOnly":true,"importHelpers":true,"module":200,"noEmitOnError":true,"noFallthroughCasesInSwitch":true,"noImplicitOverride":true,"noImplicitReturns":true,"noUnusedLocals":true,"skipLibCheck":true,"strict":true,"target":9},"version":"5.7.3"}
26 changes: 1 addition & 25 deletions packages/js/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,9 @@
import { defineConfig } from 'vite'
import dts from 'vite-plugin-dts'
import * as path from 'path'

export default defineConfig(() => ({
root: __dirname,
cacheDir: '../../node_modules/.vite/packages/js',
plugins: [
dts({
entryRoot: 'src',
tsconfigPath: path.join(__dirname, 'tsconfig.json'),
}),
],
build: {
outDir: './dist',
emptyOutDir: true,
reportCompressedSize: true,
commonjsOptions: {
transformMixedEsModules: true,
},
lib: {
// Could also be a dictionary or array of multiple entry points.
entry: 'src/index.ts',
name: '@query-api/js',
fileName: 'index',
// Change this to the formats you want to support.
// Don't forget to update your package.json as well.
formats: ['es' as const],
},
},
plugins: [],
// Uncomment this if you are using workers.
// worker: {
// plugins: [ nxViteTsPaths() ],
Expand Down
1 change: 1 addition & 0 deletions packages/nuxt/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.nuxt
node_modules
4 changes: 4 additions & 0 deletions packages/nuxt/build.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { defineBuildConfig } from 'unbuild'

// Build Config for the Nuxt Module Builder: https://github.com/nuxt/module-builder
export default defineBuildConfig({})
22 changes: 12 additions & 10 deletions packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@
"publishConfig": {
"access": "public"
},
"files": [
"dist"
],
"main": "./dist/module.mjs",
"types": "./dist/types.d.mts",
"module": "./dist/module.mjs",
"types": "./dist/module.d.ts",
"exports": {
"./package.json": "./package.json",
".": {
"types": "./dist/types.d.mts",
"import": "./dist/module.mjs"
"development": "./src/module.ts",
"types": "./dist/module.d.ts",
"import": "./dist/module.mjs",
"default": "./dist/module.mjs"
}
},
"scripts": {
"prepare": "nuxt-module-build prepare",
"prepack": "nuxt-module-build prepare",
"typecheck": "vue-tsc --project tsconfig.json",
"build": "pnpm run typecheck && pnpm run build:transpile",
"build:nuxt-module": "nuxt-module-build build --outDir dist",
Expand All @@ -44,12 +44,14 @@
"nuxt": ">=3.0.0 || 4.x"
},
"dependencies": {
"@query-api/vue": "*",
"@query-api/js": "*"
"@query-api/vue": "workspace:*",
"@query-api/js": "workspace:*"
},
"devDependencies": {
"@nuxt/module-builder": "^0.8.4",
"nuxt": "^3.13.2",
"@nuxt/kit": "^3.13.2"
"@nuxt/kit": "^3.13.2",
"unbuild": "^3.5.0",
"defu": "6.1.4"
}
}
2 changes: 1 addition & 1 deletion packages/nuxt/src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { defaultOptions, type CraftCmsOptions } from '@query-api/vue'

export default defineNuxtModule<Required<CraftCmsOptions>>({
meta: {
name: 'nuxt-craftcms',
name: '@query-api/nuxt',
configKey: 'craftcms',
compatibility: {
nuxt: '>=3.0.0',
Expand Down
18 changes: 16 additions & 2 deletions packages/nuxt/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
{
"extends": "./.nuxt/tsconfig.json",
"extends": "../../tsconfig.base.json",
"files": [],
"references": []
"include": [],
"references": [
{
"path": "../js"
},
{
"path": "../vue"
},
{
"path": "./tsconfig.lib.json"
},
{
"path": "./tsconfig.spec.json"
}
]
}
45 changes: 45 additions & 0 deletions packages/nuxt/tsconfig.lib.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "dist",
"types": ["vite/client"],
"rootDir": "src",
"jsx": "preserve",
"jsxImportSource": "vue",
"module": "esnext",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"tsBuildInfoFile": "dist/tsconfig.lib.tsbuildinfo"
},
"exclude": [
"out-tsc",
"dist",
"src/**/__tests__/*",
"src/**/*.spec.vue",
"src/**/*.test.vue",
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
"src/**/*.spec.tsx",
"src/**/*.test.js",
"src/**/*.spec.js",
"src/**/*.test.jsx",
"src/**/*.spec.jsx",
"eslint.config.js",
"eslint.config.cjs",
"eslint.config.mjs"
],
"include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"],
"references": [
{
"path": "../js/tsconfig.lib.json"
},
{
"path": "../vue/tsconfig.lib.json"
}
]
}
38 changes: 38 additions & 0 deletions packages/nuxt/tsconfig.spec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/vitest",
"types": [
"vitest/globals",
"vitest/importMeta",
"vite/client",
"node",
"vitest"
],
"jsx": "preserve",
"jsxImportSource": "vue",
"module": "esnext",
"moduleResolution": "bundler",
"resolveJsonModule": true
},
"include": [
"vite.config.ts",
"vite.config.mts",
"vitest.config.ts",
"vitest.config.mts",
"src/**/*.test.ts",
"src/**/*.spec.ts",
"src/**/*.test.tsx",
"src/**/*.spec.tsx",
"src/**/*.test.js",
"src/**/*.spec.js",
"src/**/*.test.jsx",
"src/**/*.spec.jsx",
"src/**/*.d.ts"
],
"references": [
{
"path": "./tsconfig.lib.json"
}
]
}
1 change: 1 addition & 0 deletions packages/nuxt/tsconfig.tsbuildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"fileNames":[],"fileInfos":[],"root":[],"options":{"composite":true,"declarationMap":true,"emitDeclarationOnly":true,"importHelpers":true,"module":200,"noEmitOnError":true,"noFallthroughCasesInSwitch":true,"noImplicitOverride":true,"noImplicitReturns":true,"noUnusedLocals":true,"skipLibCheck":true,"strict":true,"target":9},"version":"5.7.3"}
9 changes: 3 additions & 6 deletions packages/nuxt/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/// <reference types='vitest' />
import * as path from 'node:path'
import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import dts from 'vite-plugin-dts'
import * as path from 'node:path'

export default defineConfig(() => ({
root: __dirname,
Expand All @@ -11,12 +11,9 @@ export default defineConfig(() => ({
vue(),
dts({
entryRoot: 'src',
tsconfigPath: path.join(__dirname, 'tsconfig.json'),
tsconfigPath: path.join(__dirname, 'tsconfig.lib.json'),
}),
],
optimizeDeps: {
exclude: ['@query-api/vue', '@query-api/js'],
},
// Uncomment this if you are using workers.
// worker: {
// plugins: [ nxViteTsPaths() ],
Expand All @@ -34,7 +31,7 @@ export default defineConfig(() => ({
// Could also be a dictionary or array of multiple entry points.
entry: 'src/module.ts',
name: '@query-api/nuxt',
fileName: 'index',
fileName: 'module',
// Change this to the formats you want to support.
// Don't forget to update your package.json as well.
formats: ['es' as const],
Expand Down
2 changes: 2 additions & 0 deletions packages/react/src/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './lib/react'
//# sourceMappingURL=index.d.ts.map
1 change: 1 addition & 0 deletions packages/react/src/index.d.ts.map

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

3 changes: 3 additions & 0 deletions packages/react/src/lib/react.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export declare function Index(): import('react').JSX.Element
export default Index
//# sourceMappingURL=react.d.ts.map
1 change: 1 addition & 0 deletions packages/react/src/lib/react.d.ts.map

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

2 changes: 2 additions & 0 deletions packages/react/tests/index.test.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export {}
//# sourceMappingURL=index.test.d.ts.map
1 change: 1 addition & 0 deletions packages/react/tests/index.test.d.ts.map

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

1 change: 1 addition & 0 deletions packages/react/tsconfig.tsbuildinfo

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion packages/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,17 @@
"exports": {
"./package.json": "./package.json",
".": {
"development": "./src/index.ts",
"types": "./dist/index.d.ts",
"import": "./dist/index.js",
"default": "./dist/index.js"
}
},
"scripts": {
"typecheck": "vue-tsc --project tsconfig.json"
},
"dependencies": {
"@query-api/js": "*"
"@query-api/js": "workspace:*"
},
"peerDependencies": {
"vue": ">=3.0.0"
Expand Down
Loading
Loading