@nx-extend/shadcn-ui 4.1.1 → 4.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/README.md +2 -2
  3. package/package.json +1 -1
  4. package/src/executors/add/add.impl.js +5 -6
  5. package/src/executors/add/add.impl.js.map +1 -1
  6. package/src/executors/add/add.impl.ts +8 -7
  7. package/src/generators/init/init.impl.js +10 -5
  8. package/src/generators/init/init.impl.js.map +1 -1
  9. package/src/generators/init/init.impl.ts +10 -5
package/CHANGELOG.md CHANGED
@@ -1,4 +1,19 @@
1
1
 
2
+ # [4.2.0](https://github.com/tripss/nx-extend/compare/shadcn-ui@4.1.2...shadcn-ui@4.2.0) (2024-11-15)
3
+
4
+
5
+ ### Features
6
+
7
+ * add TS_NODE_PROJECT env for specify tsconfig file name ([9215391](https://github.com/tripss/nx-extend/commit/92153912b69aa820a7d2e167e01f05f9b51a7657))
8
+ * renew shadcn ui add process ([d60558b](https://github.com/tripss/nx-extend/commit/d60558bc192c4a7695848c3c5abf602564915e3d))
9
+ * renew shadcn ui init process ([ecee32c](https://github.com/tripss/nx-extend/commit/ecee32c23114914157fa01662b2c5da134be28df))
10
+
11
+
12
+
13
+ ## [4.1.2](https://github.com/tripss/nx-extend/compare/shadcn-ui@4.1.1...shadcn-ui@4.1.2) (2024-11-06)
14
+
15
+
16
+
2
17
  ## [4.1.1](https://github.com/tripss/nx-extend/compare/shadcn-ui@4.1.0...shadcn-ui@4.1.1) (2024-10-24)
3
18
 
4
19
 
package/README.md CHANGED
@@ -38,13 +38,13 @@ export const links: LinksFunction = () => [
38
38
  ### Add
39
39
 
40
40
  ```sh
41
- nx add <ui lib name> button
41
+ nx add-component <ui lib name> button
42
42
  ```
43
43
 
44
44
  ### All all components
45
45
 
46
46
  ```sh
47
- nx add <ui lib name>
47
+ nx add-component <ui lib name>
48
48
  ```
49
49
 
50
50
  ## Updating the theme
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx-extend/shadcn-ui",
3
- "version": "4.1.1",
3
+ "version": "4.2.0",
4
4
  "keywords": [
5
5
  "nx",
6
6
  "shadcn-ui"
package/src/executors/add/add.impl.js CHANGED
@@ -6,14 +6,13 @@ const core_1 = require("@nx-extend/core");
6
6
  function addExecutor(options, context) {
7
7
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
8
8
  var _a;
9
- const { root } = context.projectsConfigurations.projects[context.projectName];
10
9
  return (0, core_1.execPackageManagerCommand)((0, core_1.buildCommand)([
11
- 'shadcn-ui@0.8.0 add',
10
+ 'shadcn@latest add',
12
11
  ((_a = options.component) !== null && _a !== void 0 ? _a : '').length === 0 ? '--all' : options.component,
13
- options.overwrite && '--overwrite',
14
- '--path=src',
15
- `--cwd=${root}`
16
- ]), {});
12
+ options.overwrite && '--overwrite'
13
+ ]), {
14
+ env: Object.assign(Object.assign({}, process.env), { TS_NODE_PROJECT: 'tsconfig.base.json' })
15
+ });
17
16
  });
18
17
  }
19
18
  exports.default = addExecutor;
package/src/executors/add/add.impl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add.impl.js","sourceRoot":"","sources":["../../../../../../packages/shadcn-ui/src/executors/add/add.impl.ts"],"names":[],"mappings":";;AAQA,kCAgBC;;AAvBD,0CAAyE;AAOzE,SAAsB,WAAW,CAC/B,OAAuB,EACvB,OAAwB;;;QAExB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAE7E,OAAO,IAAA,gCAAyB,EAC9B,IAAA,mBAAY,EAAC;YACX,qBAAqB;YACrB,CAAC,MAAA,OAAO,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS;YACpE,OAAO,CAAC,SAAS,IAAI,aAAa;YAClC,YAAY;YACZ,SAAS,IAAI,EAAE;SAChB,CAAC,EACF,EAAE,CACH,CAAA;IACH,CAAC;CAAA;AAED,kBAAe,WAAW,CAAA"}
1
+ {"version":3,"file":"add.impl.js","sourceRoot":"","sources":["../../../../../../packages/shadcn-ui/src/executors/add/add.impl.ts"],"names":[],"mappings":";;AAQA,kCAiBC;;AAxBD,0CAAyE;AAOzE,SAAsB,WAAW,CAC/B,OAAuB,EACvB,OAAwB;;;QAExB,OAAO,IAAA,gCAAyB,EAC9B,IAAA,mBAAY,EAAC;YACX,mBAAmB;YACnB,CAAC,MAAA,OAAO,CAAC,SAAS,mCAAI,EAAE,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS;YACpE,OAAO,CAAC,SAAS,IAAI,aAAa;SACnC,CAAC,EACF;YACE,GAAG,kCACE,OAAO,CAAC,GAAG,KACd,eAAe,EAAE,oBAAoB,GACtC;SACF,CACF,CAAA;IACH,CAAC;CAAA;AAED,kBAAe,WAAW,CAAA"}
package/src/executors/add/add.impl.ts CHANGED
@@ -10,17 +10,18 @@ export async function addExecutor(
10
10
  options: ExecutorSchema,
11
11
  context: ExecutorContext
12
12
  ): Promise<{ success: boolean }> {
13
- const { root } = context.projectsConfigurations.projects[context.projectName]
14
-
15
13
  return execPackageManagerCommand(
16
14
  buildCommand([
17
- 'shadcn-ui@0.8.0 add',
15
+ 'shadcn@latest add',
18
16
  (options.component ?? '').length === 0 ? '--all' : options.component,
19
- options.overwrite && '--overwrite',
20
- '--path=src',
21
- `--cwd=${root}`
17
+ options.overwrite && '--overwrite'
22
18
  ]),
23
- {}
19
+ {
20
+ env: {
21
+ ...process.env,
22
+ TS_NODE_PROJECT: 'tsconfig.base.json'
23
+ }
24
+ }
24
25
  )
25
26
  }
26
27
 
package/src/generators/init/init.impl.js CHANGED
@@ -37,7 +37,8 @@ function default_1(tree, options) {
37
37
  skipFormat: true,
38
38
  style: 'css',
39
39
  linter: eslint_1.Linter.EsLint,
40
- directory: uiLibOptions.projectRoot
40
+ directory: uiLibOptions.projectRoot,
41
+ skipTsConfig: true
41
42
  });
42
43
  const utilsLibOptions = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
43
44
  name: options.utilsName,
@@ -49,8 +50,11 @@ function default_1(tree, options) {
49
50
  skipFormat: true,
50
51
  style: 'css',
51
52
  linter: eslint_1.Linter.EsLint,
52
- directory: utilsLibOptions.projectRoot
53
+ directory: utilsLibOptions.projectRoot,
54
+ skipTsConfig: true
53
55
  });
56
+ (0, js_1.addTsConfigPath)(tree, `${uiLibOptions.importPath}`, [`${uiLibOptions.projectRoot}/src`]);
57
+ (0, js_1.addTsConfigPath)(tree, `${utilsLibOptions.importPath}`, [`${utilsLibOptions.projectRoot}/src`]);
54
58
  (0, js_1.addTsConfigPath)(tree, `${uiLibOptions.importPath}/*`, [`${uiLibOptions.projectRoot}/src/*`]);
55
59
  (0, js_1.addTsConfigPath)(tree, `${utilsLibOptions.importPath}/*`, [`${utilsLibOptions.projectRoot}/src/*`]);
56
60
  cleanupLib(tree, uiLibOptions.projectRoot);
@@ -61,14 +65,15 @@ function default_1(tree, options) {
61
65
  'style': 'default',
62
66
  'rsc': false,
63
67
  'tailwind': {
64
- 'config': (0, path_1.join)(utilsLibOptions.projectRoot, 'tailwind.config.js'),
65
- 'css': (0, path_1.join)(utilsLibOptions.projectRoot, 'global.css'),
68
+ 'config': (0, path_1.join)(utilsLibOptions.projectRoot, 'src/tailwind.config.ts'),
69
+ 'css': (0, path_1.join)(utilsLibOptions.projectRoot, 'src/global.css'),
66
70
  'baseColor': 'neutral',
67
71
  'cssVariables': true
68
72
  },
69
73
  'aliases': {
70
74
  'components': uiLibOptions.importPath,
71
- 'utils': utilsLibOptions.importPath
75
+ 'utils': utilsLibOptions.importPath,
76
+ "hooks": `${uiLibOptions.importPath}/hooks`
72
77
  }
73
78
  });
74
79
  (0, devkit_1.updateProjectConfiguration)(tree, uiLibOptions.projectName, Object.assign(Object.assign({}, (0, devkit_1.readProjectConfiguration)(tree, uiLibOptions.projectName)), { targets: {
package/src/generators/init/init.impl.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.impl.js","sourceRoot":"","sources":["../../../../../../packages/shadcn-ui/src/generators/init/init.impl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.impl.js","sourceRoot":"","sources":["../../../../../../packages/shadcn-ui/src/generators/init/init.impl.ts"],"names":[],"mappings":"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"}
package/src/generators/init/init.impl.ts CHANGED
@@ -50,7 +50,8 @@ export default async function (tree: Tree, options: ShadecnUiSchema) {
50
50
  skipFormat: true,
51
51
  style: 'css',
52
52
  linter: Linter.EsLint,
53
- directory: uiLibOptions.projectRoot
53
+ directory: uiLibOptions.projectRoot,
54
+ skipTsConfig: true
54
55
  })
55
56
 
56
57
  const utilsLibOptions = await determineProjectNameAndRootOptions(tree, {
@@ -64,9 +65,12 @@ export default async function (tree: Tree, options: ShadecnUiSchema) {
64
65
  skipFormat: true,
65
66
  style: 'css',
66
67
  linter: Linter.EsLint,
67
- directory: utilsLibOptions.projectRoot
68
+ directory: utilsLibOptions.projectRoot,
69
+ skipTsConfig: true
68
70
  })
69
71
 
72
+ addTsConfigPath(tree, `${uiLibOptions.importPath}`, [`${uiLibOptions.projectRoot}/src`])
73
+ addTsConfigPath(tree, `${utilsLibOptions.importPath}`, [`${utilsLibOptions.projectRoot}/src`])
70
74
  addTsConfigPath(tree, `${uiLibOptions.importPath}/*`, [`${uiLibOptions.projectRoot}/src/*`])
71
75
  addTsConfigPath(tree, `${utilsLibOptions.importPath}/*`, [`${utilsLibOptions.projectRoot}/src/*`])
72
76
  cleanupLib(tree, uiLibOptions.projectRoot)
@@ -79,14 +83,15 @@ export default async function (tree: Tree, options: ShadecnUiSchema) {
79
83
  'style': 'default',
80
84
  'rsc': false,
81
85
  'tailwind': {
82
- 'config': join(utilsLibOptions.projectRoot, 'tailwind.config.js'),
83
- 'css': join(utilsLibOptions.projectRoot, 'global.css'),
86
+ 'config': join(utilsLibOptions.projectRoot, 'src/tailwind.config.ts'),
87
+ 'css': join(utilsLibOptions.projectRoot, 'src/global.css'),
84
88
  'baseColor': 'neutral',
85
89
  'cssVariables': true
86
90
  },
87
91
  'aliases': {
88
92
  'components': uiLibOptions.importPath,
89
- 'utils': utilsLibOptions.importPath
93
+ 'utils': utilsLibOptions.importPath,
94
+ "hooks": `${uiLibOptions.importPath}/hooks`
90
95
  }
91
96
  })
92
97