@nx/react-native 21.0.0-beta.1 → 21.0.0-beta.3

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/react-native",
3
- "version": "21.0.0-beta.1",
3
+ "version": "21.0.0-beta.3",
4
4
  "private": false,
5
5
  "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
6
6
  "keywords": [
@@ -35,12 +35,12 @@
35
35
  "picocolors": "^1.1.0",
36
36
  "tsconfig-paths": "^4.1.2",
37
37
  "tslib": "^2.3.0",
38
- "@nx/devkit": "21.0.0-beta.1",
39
- "@nx/jest": "21.0.0-beta.1",
40
- "@nx/js": "21.0.0-beta.1",
41
- "@nx/eslint": "21.0.0-beta.1",
42
- "@nx/react": "21.0.0-beta.1",
43
- "@nx/workspace": "21.0.0-beta.1"
38
+ "@nx/devkit": "21.0.0-beta.3",
39
+ "@nx/jest": "21.0.0-beta.3",
40
+ "@nx/js": "21.0.0-beta.3",
41
+ "@nx/eslint": "21.0.0-beta.3",
42
+ "@nx/react": "21.0.0-beta.3",
43
+ "@nx/workspace": "21.0.0-beta.3"
44
44
  },
45
45
  "executors": "./executors.json",
46
46
  "ng-update": {
@@ -22,6 +22,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
22
22
  async function reactNativeApplicationGenerator(host, schema) {
23
23
  return await reactNativeApplicationGeneratorInternal(host, {
24
24
  addPlugin: false,
25
+ useProjectJson: true,
25
26
  ...schema,
26
27
  });
27
28
  }
@@ -43,6 +44,11 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
43
44
  }
44
45
  await (0, create_application_files_1.createApplicationFiles)(host, options);
45
46
  (0, add_project_1.addProject)(host, options);
47
+ // If we are using the new TS solution
48
+ // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
49
+ if (options.isTsSolutionSetup) {
50
+ await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
51
+ }
46
52
  const lintTask = await (0, add_linting_1.addLinting)(host, {
47
53
  ...options,
48
54
  projectRoot: options.appProjectRoot,
@@ -88,11 +94,6 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
88
94
  }, options.linter === 'eslint'
89
95
  ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
90
96
  : undefined);
91
- // If we are using the new TS solution
92
- // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
93
- if (options.useTsSolution) {
94
- (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
95
- }
96
97
  (0, sort_fields_1.sortPackageJsonFields)(host, options.appProjectRoot);
97
98
  if (!options.skipFormat) {
98
99
  await (0, devkit_1.formatFiles)(host);
@@ -14,6 +14,7 @@ async function addE2e(host, options) {
14
14
  styledModule: null,
15
15
  hasStyles: false,
16
16
  unitTestRunner: 'none',
17
+ names: (0, devkit_1.names)(options.name),
17
18
  });
18
19
  case 'playwright':
19
20
  return (0, add_e2e_1.addE2e)(host, {
@@ -23,6 +24,7 @@ async function addE2e(host, options) {
23
24
  styledModule: null,
24
25
  hasStyles: false,
25
26
  unitTestRunner: 'none',
27
+ names: (0, devkit_1.names)(options.name),
26
28
  });
27
29
  case 'detox':
28
30
  const { detoxApplicationGenerator } = (0, devkit_1.ensurePackage)('@nx/detox', versions_1.nxVersion);
@@ -2,7 +2,6 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addProject = addProject;
4
4
  const devkit_1 = require("@nx/devkit");
5
- const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
6
5
  function addProject(host, options) {
7
6
  const nxJson = (0, devkit_1.readNxJson)(host);
8
7
  const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -15,22 +14,32 @@ function addProject(host, options) {
15
14
  targets: hasPlugin ? {} : getTargets(options),
16
15
  tags: options.parsedTags,
17
16
  };
18
- if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
19
- (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
20
- name: options.projectName,
21
- version: '0.0.1',
22
- private: true,
23
- nx: {
24
- targets: hasPlugin ? {} : getTargets(options),
25
- tags: options.parsedTags?.length ? options.parsedTags : undefined,
26
- },
27
- });
17
+ const packageJson = {
18
+ name: options.importPath,
19
+ version: '0.0.1',
20
+ private: true,
21
+ };
22
+ if (!options.useProjectJson) {
23
+ if (options.projectName !== options.importPath) {
24
+ packageJson.nx = { name: options.projectName };
25
+ }
26
+ if (!hasPlugin) {
27
+ packageJson.nx ??= {};
28
+ packageJson.nx.targets = getTargets(options);
29
+ }
30
+ if (options.parsedTags?.length) {
31
+ packageJson.nx ??= {};
32
+ packageJson.nx.tags = options.parsedTags;
33
+ }
28
34
  }
29
35
  else {
30
36
  (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
31
37
  ...project,
32
38
  });
33
39
  }
40
+ if (!options.useProjectJson || options.isTsSolutionSetup) {
41
+ (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
42
+ }
34
43
  }
35
44
  function getTargets(options) {
36
45
  const architect = {};
@@ -1,6 +1,6 @@
1
1
  import { Tree } from '@nx/devkit';
2
2
  import { Schema } from '../schema';
3
- export interface NormalizedSchema extends Schema {
3
+ export interface NormalizedSchema extends Omit<Schema, 'useTsSolution'> {
4
4
  className: string;
5
5
  fileName: string;
6
6
  projectName: string;
@@ -13,6 +13,7 @@ export interface NormalizedSchema extends Schema {
13
13
  rootProject: boolean;
14
14
  e2eProjectName: string;
15
15
  e2eProjectRoot: string;
16
+ importPath: string;
16
17
  isTsSolutionSetup: boolean;
17
18
  }
18
19
  export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;
@@ -4,10 +4,9 @@ exports.normalizeOptions = normalizeOptions;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
6
6
  const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
7
- const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
8
7
  async function normalizeOptions(host, options) {
9
- await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'application');
10
- const { projectName: appProjectName, names: projectNames, projectRoot: appProjectRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
8
+ await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
9
+ const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
11
10
  name: options.name,
12
11
  projectType: 'application',
13
12
  directory: options.directory,
@@ -16,17 +15,18 @@ async function normalizeOptions(host, options) {
16
15
  const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
17
16
  nxJson.useInferencePlugins !== false;
18
17
  options.addPlugin ??= addPluginDefault;
19
- const { className, fileName } = (0, devkit_1.names)(options.name);
18
+ const { className, fileName } = (0, devkit_1.names)(projectNames.projectSimpleName);
20
19
  const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
21
20
  const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');
22
21
  const rootProject = appProjectRoot === '.';
22
+ const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
23
+ const appProjectName = !isTsSolutionSetup || options.name ? projectName : importPath;
23
24
  const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;
24
25
  const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
25
26
  const parsedTags = options.tags
26
27
  ? options.tags.split(',').map((s) => s.trim())
27
28
  : [];
28
29
  const entryFile = options.js ? 'src/main.js' : 'src/main.tsx';
29
- const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
30
30
  return {
31
31
  ...options,
32
32
  name: projectNames.projectSimpleName,
@@ -34,10 +34,9 @@ async function normalizeOptions(host, options) {
34
34
  fileName,
35
35
  lowerCaseName: className.toLowerCase(),
36
36
  displayName: options.displayName || className,
37
- projectName: isTsSolutionSetup
38
- ? (0, get_import_path_1.getImportPath)(host, appProjectName)
39
- : appProjectName,
37
+ projectName: appProjectName,
40
38
  appProjectRoot,
39
+ importPath,
41
40
  iosProjectRoot,
42
41
  androidProjectRoot,
43
42
  parsedTags,
@@ -46,5 +45,6 @@ async function normalizeOptions(host, options) {
46
45
  e2eProjectName,
47
46
  e2eProjectRoot,
48
47
  isTsSolutionSetup,
48
+ useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
49
49
  };
50
50
  }
@@ -21,4 +21,5 @@ export interface Schema {
21
21
  nxCloudToken?: string;
22
22
  useTsSolution?: boolean;
23
23
  formatter?: 'prettier' | 'none';
24
+ useProjectJson?: boolean;
24
25
  }
@@ -95,6 +95,10 @@
95
95
  "x-prompt": "Which bundler do you want to use to build the application?",
96
96
  "default": "vite",
97
97
  "x-priority": "important"
98
+ },
99
+ "useProjectJson": {
100
+ "type": "boolean",
101
+ "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
98
102
  }
99
103
  },
100
104
  "required": ["directory"]
@@ -11,7 +11,9 @@ async function reactNativeComponentGenerator(host, schema) {
11
11
  const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
12
12
  createComponentFiles(host, options);
13
13
  addExportsToBarrel(host, options);
14
- await (0, devkit_1.formatFiles)(host);
14
+ if (!options.skipFormat) {
15
+ await (0, devkit_1.formatFiles)(host);
16
+ }
15
17
  }
16
18
  function createComponentFiles(host, options) {
17
19
  (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, 'files', options.fileExtensionType), options.directory, {
@@ -31,7 +33,9 @@ function addExportsToBarrel(host, options) {
31
33
  const proj = workspace.get(options.projectName);
32
34
  const isApp = (0, ts_solution_setup_1.getProjectType)(host, proj.root, proj.projectType) === 'application';
33
35
  if (options.export && !isApp) {
34
- const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
36
+ const indexFilePath = (0, devkit_1.joinPathFragments)(...(options.projectSourceRoot
37
+ ? [options.projectSourceRoot]
38
+ : [options.projectRoot, 'src']), options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
35
39
  if (!host.exists(indexFilePath)) {
36
40
  return;
37
41
  }
@@ -10,5 +10,6 @@ export interface NormalizedSchema extends Omit<Schema, 'js'> {
10
10
  fileExtension: string;
11
11
  fileExtensionType: FileExtensionType;
12
12
  projectName: string;
13
+ projectRoot: string;
13
14
  }
14
15
  export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;
@@ -31,5 +31,6 @@ async function normalizeOptions(host, options) {
31
31
  fileExtensionType,
32
32
  projectSourceRoot,
33
33
  projectName,
34
+ projectRoot: root,
34
35
  };
35
36
  }
@@ -7,6 +7,7 @@ export interface Schema {
7
7
  skipTests?: boolean;
8
8
  export?: boolean;
9
9
  classComponent?: boolean;
10
+ skipFormat?: boolean;
10
11
 
11
12
  /**
12
13
  * @deprecated Provide the full file path including the file extension in the `path` option. This option will be removed in Nx v21.
@@ -59,6 +59,12 @@
59
59
  "alias": "C",
60
60
  "description": "Use class components instead of functional component.",
61
61
  "default": false
62
+ },
63
+ "skipFormat": {
64
+ "description": "Skip formatting files.",
65
+ "type": "boolean",
66
+ "default": false,
67
+ "x-priority": "internal"
62
68
  }
63
69
  },
64
70
  "required": ["path"]
@@ -4,6 +4,7 @@ export interface NormalizedSchema extends Schema {
4
4
  name: string;
5
5
  fileName: string;
6
6
  projectRoot: string;
7
+ importPath: string;
7
8
  routePath: string;
8
9
  parsedTags: string[];
9
10
  appMain?: string;
@@ -4,9 +4,8 @@ exports.normalizeOptions = normalizeOptions;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
6
6
  const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
7
- const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
8
7
  async function normalizeOptions(host, options) {
9
- await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
8
+ await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
10
9
  const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
11
10
  name: options.name,
12
11
  projectType: 'library',
@@ -25,13 +24,12 @@ async function normalizeOptions(host, options) {
25
24
  ...options,
26
25
  fileName: projectName,
27
26
  routePath: `/${projectNames.projectSimpleName}`,
28
- name: isUsingTsSolutionConfig
29
- ? (0, get_import_path_1.getImportPath)(host, projectName)
30
- : projectName,
27
+ name: isUsingTsSolutionConfig && !options.name ? importPath : projectName,
31
28
  projectRoot,
32
29
  parsedTags,
33
30
  importPath,
34
31
  isUsingTsSolutionConfig,
32
+ useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
35
33
  };
36
34
  return normalized;
37
35
  }
@@ -7,15 +7,20 @@ const js_1 = require("@nx/js");
7
7
  const init_1 = require("../init/init");
8
8
  const add_linting_1 = require("../../utils/add-linting");
9
9
  const add_jest_1 = require("../../utils/add-jest");
10
- const versions_1 = require("../../utils/versions");
10
+ const component_1 = require("../component/component");
11
11
  const normalize_options_1 = require("./lib/normalize-options");
12
12
  const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
13
13
  const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
14
14
  const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
15
15
  const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
16
+ const add_rollup_build_target_1 = require("@nx/react/src/generators/library/lib/add-rollup-build-target");
17
+ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
18
+ const path_1 = require("path");
19
+ const versions_1 = require("../../utils/versions");
16
20
  async function reactNativeLibraryGenerator(host, schema) {
17
21
  return await reactNativeLibraryGeneratorInternal(host, {
18
22
  addPlugin: false,
23
+ useProjectJson: true,
19
24
  ...schema,
20
25
  });
21
26
  }
@@ -36,6 +41,9 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
36
41
  tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
37
42
  }
38
43
  createFiles(host, options);
44
+ if (options.isUsingTsSolutionConfig) {
45
+ await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
46
+ }
39
47
  const addProjectTask = await addProject(host, options);
40
48
  if (addProjectTask) {
41
49
  tasks.push(addProjectTask);
@@ -50,9 +58,16 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
50
58
  tasks.push(lintTask);
51
59
  const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin, 'tsconfig.lib.json');
52
60
  tasks.push(jestTask);
53
- if (options.publishable || options.buildable) {
54
- updateLibPackageNpmScope(host, options);
55
- }
61
+ const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
62
+ const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
63
+ const componentTask = await (0, component_1.default)(host, {
64
+ path: relativeCwd ? (0, path_1.relative)(relativeCwd, path) : path,
65
+ skipTests: options.unitTestRunner === 'none',
66
+ export: true,
67
+ skipFormat: true,
68
+ js: options.js,
69
+ });
70
+ tasks.push(() => componentTask);
56
71
  if (!options.skipTsConfig && !options.isUsingTsSolutionConfig) {
57
72
  (0, js_1.addTsConfigPath)(host, options.importPath, [
58
73
  (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
@@ -65,9 +80,6 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
65
80
  }, options.linter === 'eslint'
66
81
  ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
67
82
  : undefined);
68
- if (options.isUsingTsSolutionConfig) {
69
- (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
70
- }
71
83
  (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
72
84
  if (!options.skipFormat) {
73
85
  await (0, devkit_1.formatFiles)(host);
@@ -89,61 +101,62 @@ async function addProject(host, options) {
89
101
  tags: options.parsedTags,
90
102
  targets: {},
91
103
  };
92
- const packageJsonPath = (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json');
93
- if (options.isUsingTsSolutionConfig) {
94
- (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
95
- name: options.name,
96
- version: '0.0.1',
104
+ let packageJson = {
105
+ name: options.importPath,
106
+ version: '0.0.1',
107
+ };
108
+ if (!options.useProjectJson) {
109
+ packageJson = {
110
+ ...packageJson,
97
111
  ...determineEntryFields(options),
98
- nx: {
99
- tags: options.parsedTags?.length ? options.parsedTags : undefined,
112
+ files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
113
+ peerDependencies: {
114
+ react: versions_1.reactVersion,
115
+ 'react-native': versions_1.reactNativeVersion,
100
116
  },
101
- });
117
+ };
118
+ if (options.name !== options.importPath) {
119
+ packageJson.nx = { name: options.name };
120
+ }
121
+ if (options.parsedTags?.length) {
122
+ packageJson.nx ??= {};
123
+ packageJson.nx.tags = options.parsedTags;
124
+ }
102
125
  }
103
126
  else {
104
127
  (0, devkit_1.addProjectConfiguration)(host, options.name, project);
105
128
  }
106
- if (!options.publishable && !options.buildable) {
107
- return () => { };
129
+ if (!options.useProjectJson ||
130
+ options.isUsingTsSolutionConfig ||
131
+ options.publishable ||
132
+ options.buildable) {
133
+ (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
108
134
  }
109
- const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
110
- const rollupConfigTask = await configurationGenerator(host, {
111
- ...options,
112
- project: options.name,
113
- skipFormat: true,
114
- });
115
- (0, devkit_1.updateJson)(host, packageJsonPath, (json) => {
116
- if (json.type === 'module') {
117
- // The @nx/rollup:configuration generator can set the type to 'module' which would
118
- // potentially break this library.
119
- delete json.type;
120
- }
121
- return json;
122
- });
123
- const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
124
- project.targets.build = {
125
- executor: '@nx/rollup:rollup',
126
- outputs: ['{options.outputPath}'],
127
- options: {
128
- outputPath: options.isUsingTsSolutionConfig
129
- ? `${options.projectRoot}/dist`
130
- : `dist/${options.projectRoot}`,
131
- tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
132
- project: `${options.projectRoot}/package.json`,
133
- entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
134
- external,
135
- rollupConfig: `@nx/react/plugins/bundle-rollup`,
136
- assets: [
137
- {
138
- glob: `${options.projectRoot}/README.md`,
139
- input: '.',
140
- output: '.',
141
- },
142
- ],
143
- },
144
- };
145
- (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
146
- return rollupConfigTask;
135
+ if (options.publishable || options.buildable) {
136
+ const external = new Set([
137
+ 'react/jsx-runtime',
138
+ 'react-native',
139
+ 'react',
140
+ 'react-dom',
141
+ ]);
142
+ const rollupTask = await (0, add_rollup_build_target_1.addRollupBuildTarget)(host, {
143
+ ...options,
144
+ format: ['cjs', 'esm'],
145
+ style: 'none',
146
+ js: options.js,
147
+ skipFormat: true,
148
+ }, external);
149
+ (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
150
+ json.peerDependencies = {
151
+ ...json.peerDependencies,
152
+ react: versions_1.reactVersion,
153
+ 'react-native': versions_1.reactNativeVersion,
154
+ };
155
+ return json;
156
+ });
157
+ return rollupTask;
158
+ }
159
+ return () => { };
147
160
  }
148
161
  function updateTsConfig(tree, options) {
149
162
  if (options.isUsingTsSolutionConfig) {
@@ -169,32 +182,17 @@ function createFiles(host, options) {
169
182
  offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot),
170
183
  rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(host, options.projectRoot),
171
184
  });
172
- if (!options.publishable && !options.buildable) {
173
- host.delete(`${options.projectRoot}/package.json`);
174
- }
175
185
  if (options.js) {
176
186
  (0, devkit_1.toJS)(host);
177
187
  }
178
188
  updateTsConfig(host, options);
179
189
  }
180
- function updateLibPackageNpmScope(host, options) {
181
- return (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {
182
- json.name = options.importPath;
183
- json.peerDependencies = {
184
- react: versions_1.reactVersion,
185
- 'react-native': versions_1.reactNativeVersion,
186
- };
187
- return json;
188
- });
189
- }
190
- function maybeJs(options, path) {
191
- return options.js && (path.endsWith('.ts') || path.endsWith('.tsx'))
192
- ? path.replace(/\.tsx?$/, '.js')
193
- : path;
194
- }
195
190
  function determineEntryFields(options) {
196
- if (options.buildable) {
197
- return {};
191
+ if (options.buildable ||
192
+ options.publishable ||
193
+ !options.isUsingTsSolutionConfig) {
194
+ // For buildable libraries, the entries are configured by the bundler (i.e. Rollup).
195
+ return undefined;
198
196
  }
199
197
  return {
200
198
  main: options.js ? './src/index.js' : './src/index.ts',
@@ -19,4 +19,5 @@ export interface Schema {
19
19
  setParserOptionsProject?: boolean;
20
20
  skipPackageJson?: boolean; //default is false
21
21
  addPlugin?: boolean;
22
+ useProjectJson?: boolean;
22
23
  }
@@ -93,6 +93,10 @@
93
93
  "type": "boolean",
94
94
  "default": false,
95
95
  "x-priority": "internal"
96
+ },
97
+ "useProjectJson": {
98
+ "type": "boolean",
99
+ "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
96
100
  }
97
101
  },
98
102
  "required": ["directory"]
@@ -1,4 +0,0 @@
1
- {
2
- "name": "<%= name %>",
3
- "version": "0.0.1"
4
- }
@@ -1 +0,0 @@
1
- export declare function formatFile(content: any, ...values: any[]): string;
@@ -1,15 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.formatFile = formatFile;
4
- const devkit_1 = require("@nx/devkit");
5
- const prettier_1 = require("prettier");
6
- function formatFile(content, ...values) {
7
- return (0, prettier_1.format)((0, devkit_1.stripIndents)(content, values)
8
- .split('\n')
9
- .map((line) => line.trim())
10
- .join('')
11
- .trim(), {
12
- singleQuote: true,
13
- parser: 'typescript',
14
- });
15
- }