diff --git a/.changeset/famous-rules-pay.md b/.changeset/famous-rules-pay.md new file mode 100644 index 000000000..e3e7bb2e3 --- /dev/null +++ b/.changeset/famous-rules-pay.md @@ -0,0 +1,5 @@ +--- +'@nordcom/nordstar': patch +--- + +- Combine components in the primary nordstar package. diff --git a/packages/components/accented/package.json b/packages/components/accented/package.json index 22d0e8321..b3a1d3080 100644 --- a/packages/components/accented/package.json +++ b/packages/components/accented/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Highlight text with an accent color.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/button/package.json b/packages/components/button/package.json index 280324616..723b9d43a 100644 --- a/packages/components/button/package.json +++ b/packages/components/button/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Nordstar Button", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/card/package.json b/packages/components/card/package.json index 5beb5fc2d..23e9f743b 100644 --- a/packages/components/card/package.json +++ b/packages/components/card/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Card is a consistent card-like container for blocks of content.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/details/package.json b/packages/components/details/package.json index d927d6c9c..00ed88e20 100644 --- a/packages/components/details/package.json +++ b/packages/components/details/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Hide/Show content using a styled <details> element.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/header/package.json b/packages/components/header/package.json index 14a0bb189..625adc3a4 100644 --- a/packages/components/header/package.json +++ b/packages/components/header/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Generic simple component to render headers for landing pages and similar.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/heading/package.json b/packages/components/heading/package.json index 049570cba..907b6ac2c 100644 --- a/packages/components/heading/package.json +++ b/packages/components/heading/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Component used to display title/heading text.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/input/package.json b/packages/components/input/package.json index 2ec996e75..6619cc5a2 100644 --- a/packages/components/input/package.json +++ b/packages/components/input/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Component for single-line text and number input with formatting support.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/label/package.json b/packages/components/label/package.json index 574ced2c2..957a14156 100644 --- a/packages/components/label/package.json +++ b/packages/components/label/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "A component used to describe other components or groups of components.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/view/package.json b/packages/components/view/package.json index 0e5c122fa..d40c6dfb6 100644 --- a/packages/components/view/package.json +++ b/packages/components/view/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Display a dedicated view; (aka page) somewhere in your app.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/components/vite.config.ts b/packages/components/vite.config.ts index 6baa35cee..ae3fae95b 100644 --- a/packages/components/vite.config.ts +++ b/packages/components/vite.config.ts @@ -15,7 +15,7 @@ export default mergeConfig( root: resolve(__dirname), build: { rollupOptions: { - external: [/^@nordcom\/nordstar-/, 'clsx'] + external: [/^@nordcom\/nordstar-/, 'class-variance-authority', 'clsx', 'tailwind-merge'] } }, plugins: [ diff --git a/packages/core/nordstar/package.json b/packages/core/nordstar/package.json index 7c84567c0..83709b025 100644 --- a/packages/core/nordstar/package.json +++ b/packages/core/nordstar/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "An opinionated component library for building human-centric user interfaces.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", @@ -99,6 +101,7 @@ "@types/react-dom": "18.3.0", "@types/react": "18.3.10", "autoprefixer": "10.4.20", + "postcss-import": "16.1.0", "postcss": "8.4.47", "prettier": "3.3.3", "react-dom": "18.3.1", diff --git a/packages/core/nordstar/postcss.config.cjs b/packages/core/nordstar/postcss.config.cjs index c091f850f..81278defd 100644 --- a/packages/core/nordstar/postcss.config.cjs +++ b/packages/core/nordstar/postcss.config.cjs @@ -4,8 +4,8 @@ const process = require('node:process'); module.exports = { plugins: [ + require('postcss-import')(), require('tailwindcss')(path.resolve(path.join(process.cwd().split('/packages')[0], 'tailwind.config.cjs'))), - , require('autoprefixer') ] }; diff --git a/packages/core/nordstar/vite.config.ts b/packages/core/nordstar/vite.config.ts index fe4653497..b09c85148 100644 --- a/packages/core/nordstar/vite.config.ts +++ b/packages/core/nordstar/vite.config.ts @@ -15,6 +15,7 @@ export default mergeConfig( root: resolve(__dirname), build: { rollupOptions: { + external: ['class-variance-authority', 'clsx', 'tailwind-merge'], output: { name } diff --git a/packages/core/system/package.json b/packages/core/system/package.json index f5d272702..29ad430f8 100644 --- a/packages/core/system/package.json +++ b/packages/core/system/package.json @@ -5,7 +5,9 @@ "version": "0.0.69", "description": "Utilities used by all of the Nordstar Components, shouldn't be used directly outside of the Nordstar library.", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/packages/core/system/vite.config.ts b/packages/core/system/vite.config.ts index f92f8e8bb..cf691c6a7 100644 --- a/packages/core/system/vite.config.ts +++ b/packages/core/system/vite.config.ts @@ -15,6 +15,7 @@ export default mergeConfig( root: resolve(__dirname), build: { rollupOptions: { + external: [/^@nordcom\/nordstar-/, 'class-variance-authority', 'clsx', 'tailwind-merge'], output: { name } diff --git a/packages/storybook/package.json b/packages/storybook/package.json index 64e216aa4..7fa1c9686 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -6,7 +6,9 @@ "sideEffects": true, "private": true, "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "scripts": { "build": "storybook build --disable-telemetry", diff --git a/plop/component/package.json.hbs b/plop/component/package.json.hbs index 1705f3ce5..815dfbd39 100644 --- a/plop/component/package.json.hbs +++ b/plop/component/package.json.hbs @@ -5,7 +5,9 @@ "version": "0.0.0", "description": "{{escapeJsonString description}}", "files": [ - "dist" + "dist", + "CHANGELOG.md", + "README.md" ], "main": "./dist/index.js", "module": "./dist/index.js", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8054daa41..eb9f78cec 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -181,13 +181,13 @@ importers: version: link:../packages/core/nordstar '@vercel/toolbar': specifier: 0.1.22 - version: 0.1.22(next@14.2.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4))(react@18.3.1)(vite@5.4.8(@types/node@22.5.5)(less@4.2.0)(sass@1.79.4)(stylus@0.62.0)(terser@5.33.0)) + version: 0.1.22(next@14.2.13(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4))(react@18.3.1)(vite@5.4.8(@types/node@22.5.5)(less@4.2.0)(sass@1.79.4)(stylus@0.62.0)(terser@5.33.0)) geist: specifier: 1.3.1 - version: 1.3.1(next@14.2.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4)) + version: 1.3.1(next@14.2.13(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4)) next: specifier: 14.2.13 - version: 14.2.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4) + version: 14.2.13(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4) next-mdx-remote: specifier: 5.0.0 version: 5.0.0(@types/react@18.3.10)(react@18.3.1) @@ -727,6 +727,9 @@ importers: postcss: specifier: 8.4.47 version: 8.4.47 + postcss-import: + specifier: 16.1.0 + version: 16.1.0(postcss@8.4.47) prettier: specifier: 3.3.3 version: 3.3.3 @@ -8490,7 +8493,7 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vercel/toolbar@0.1.22(next@14.2.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4))(react@18.3.1)(vite@5.4.8(@types/node@22.5.5)(less@4.2.0)(sass@1.79.4)(stylus@0.62.0)(terser@5.33.0))': + '@vercel/toolbar@0.1.22(next@14.2.13(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4))(react@18.3.1)(vite@5.4.8(@types/node@22.5.5)(less@4.2.0)(sass@1.79.4)(stylus@0.62.0)(terser@5.33.0))': dependencies: '@tinyhttp/app': 1.3.0 chokidar: 3.6.0 @@ -8499,7 +8502,7 @@ snapshots: get-port: 5.1.1 strip-ansi: 6.0.1 optionalDependencies: - next: 14.2.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4) + next: 14.2.13(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4) react: 18.3.1 vite: 5.4.8(@types/node@22.5.5)(less@4.2.0)(sass@1.79.4)(stylus@0.62.0)(terser@5.33.0) @@ -9625,8 +9628,8 @@ snapshots: '@typescript-eslint/parser': 8.0.0(eslint@8.57.1)(typescript@5.6.2) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1))(eslint@8.57.1) - eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1) + eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1) eslint-plugin-jsx-a11y: 6.10.0(eslint@8.57.1) eslint-plugin-react: 7.36.1(eslint@8.57.1) eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1) @@ -9649,33 +9652,33 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1))(eslint@8.57.1): + eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1): dependencies: '@nolyfill/is-core-module': 1.0.39 debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.9.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.9.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.1 is-bun-module: 1.2.1 is-glob: 4.0.3 optionalDependencies: - eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) + eslint-plugin-import: 2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1) transitivePeerDependencies: - '@typescript-eslint/parser' - eslint-import-resolver-node - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.9.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1): + eslint-module-utils@2.9.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: '@typescript-eslint/parser': 8.0.0(eslint@8.57.1)(typescript@5.6.2) eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1))(eslint@8.57.1) + eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1) transitivePeerDependencies: - supports-color @@ -9689,7 +9692,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): + eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1): dependencies: '@rtsao/scc': 1.1.0 array-includes: 3.1.8 @@ -9700,7 +9703,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.9.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1))(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.9.0(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.0.0(eslint@8.57.1)(typescript@5.6.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -10200,9 +10203,9 @@ snapshots: functions-have-names@1.2.3: {} - geist@1.3.1(next@14.2.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4)): + geist@1.3.1(next@14.2.13(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4)): dependencies: - next: 14.2.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4) + next: 14.2.13(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4) gensync@1.0.0-beta.2: {} @@ -11695,7 +11698,7 @@ snapshots: - '@types/react' - supports-color - next@14.2.13(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4): + next@14.2.13(@babel/core@7.25.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.4): dependencies: '@next/env': 14.2.13 '@swc/helpers': 0.5.5 @@ -11705,7 +11708,7 @@ snapshots: postcss: 8.4.31 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) - styled-jsx: 5.1.1(react@18.3.1) + styled-jsx: 5.1.1(@babel/core@7.25.2)(react@18.3.1) optionalDependencies: '@next/swc-darwin-arm64': 14.2.13 '@next/swc-darwin-x64': 14.2.13 @@ -13025,10 +13028,12 @@ snapshots: dependencies: inline-style-parser: 0.2.4 - styled-jsx@5.1.1(react@18.3.1): + styled-jsx@5.1.1(@babel/core@7.25.2)(react@18.3.1): dependencies: client-only: 0.0.1 react: 18.3.1 + optionalDependencies: + '@babel/core': 7.25.2 stylus@0.62.0: dependencies: diff --git a/vite.config.ts b/vite.config.ts index 5073c0945..df5b84a8e 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -65,7 +65,6 @@ export default defineConfig({ sourcemap: true, target: 'esnext', rollupOptions: { - external: [/^@nordcom\/nordstar-/, 'class-variance-authority', 'clsx', 'tailwind-merge'], treeshake: true, output: { intro: (chunk) => {