Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(merger): add to exports #922

Merged
merged 7 commits into from
Dec 16, 2024
Merged

feat(merger): add to exports #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7cbe3e
chore(merger): add to exports
ineshbose Nov 27, 2024
7c987d9
chore: try add alias
ineshbose Nov 30, 2024
b345df8
chore: specify playground dependencies
danielroe Dec 16, 2024
40e9f35
chore: use workspace dep for nuxt2 playground too
danielroe Dec 16, 2024
7e0e6c3
chore: specify docs dependency too
danielroe Dec 16, 2024
89c3c8b
chore: trigger ci
danielroe Dec 16, 2024
08e0cdf
chore: up
ineshbose Dec 16, 2024
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: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"dev": "nuxt dev",
"generate": "nuxt generate",
"preview": "nuxt preview",
"postinstall": "nuxt prepare",
"lint": "eslint .",
"typecheck": "nuxt typecheck"
},
Expand All @@ -18,6 +17,7 @@
"@nuxt/ui-pro": "^1.5.0",
"@nuxtjs/fontaine": "^0.4.4",
"@nuxtjs/google-fonts": "^3.2.0",
"@nuxtjs/tailwindcss": "link:..",
"@nuxtjs/plausible": "^1.1.1",
"nuxt-og-image": "^3.0.8"
},
Expand Down
4 changes: 1 addition & 3 deletions nuxt2-playground/nuxt.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import localModule from '../src/module'

export default {
/*
** Nuxt.js modules
*/
buildModules: [
// Doc: https://github.com/nuxt-modules/tailwindcss
localModule,
'@nuxtjs/tailwindcss',
],
}
1 change: 1 addition & 0 deletions nuxt2-playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"generate": "nuxt generate"
},
"dependencies": {
"@nuxtjs/tailwindcss": "link:..",
"nuxt": "2.18.1",
"vue": "2.7.16",
"vue-router": "3.6.5"
Expand Down
5 changes: 4 additions & 1 deletion nuxt2-playground/pnpm-lock.yaml
View file
Open in desktop

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

9 changes: 7 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@
"types": "./dist/config.d.ts",
"require": "./dist/config.cjs",
"import": "./dist/config.mjs"
},
"./merger": {
"types": "./dist/merger.d.ts",
"require": "./dist/merger.cjs",
"import": "./dist/merger.mjs"
}
},
"main": "./dist/module.cjs",
Expand All @@ -27,7 +32,7 @@
"dist"
],
"build": {
"entries": ["./src/config"],
"entries": ["./src/config", "./src/merger"],
"rollup": { "emitCJS": true }
},
"scripts": {
Expand Down Expand Up @@ -81,7 +86,7 @@
"eslint": "^9.15.0",
"happy-dom": "^15.11.6",
"nuxt": "^3.14.1592",
"typescript": "^5.6.3",
"typescript": "5.6.3",
"vitest": "^2.1.5",
"vue-tsc": "^2.1.10"
},
Expand Down
4 changes: 1 addition & 3 deletions playground/nuxt.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { existsSync } from 'node:fs'
import { defineNuxtConfig } from 'nuxt/config'
import { resolve } from 'pathe'
import { consola } from 'consola'
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import typography from '@tailwindcss/typography'
Expand All @@ -15,7 +13,7 @@ export default defineNuxtConfig({

// builder: 'webpack',
modules: [
existsSync(resolve(__dirname, '../dist/module.mjs')) ? '@nuxtjs/tailwindcss' : '../src/module',
'@nuxtjs/tailwindcss',
'@nuxt/content',
],

Expand Down
6 changes: 5 additions & 1 deletion playground/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,9 @@
"dev": "nuxi dev",
"build": "nuxi build",
"generate": "nuxi generate"
},
"dependencies": {
"@nuxtjs/tailwindcss": "link:..",
"nuxt": "latest"
}
}
}
Loading
Loading