@nrwl/workspace 13.9.4 → 13.10.0-beta.3
Sign up to get free protection for your applications and to get access to all the features.
- package/generators.json +0 -14
- package/index.d.ts +3 -5
- package/index.js +5 -9
- package/index.js.map +1 -1
- package/migrations.json +12 -6
- package/package.json +5 -8
- package/src/executors/counter/counter.impl.js +7 -7
- package/src/executors/counter/counter.impl.js.map +1 -1
- package/src/executors/run-commands/run-commands.impl.js +4 -4
- package/src/executors/run-script/run-script.impl.js +1 -1
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +2 -2
- package/src/generators/library/library.js +2 -2
- package/src/generators/move/lib/update-cypress-json.d.ts +1 -2
- package/src/generators/move/lib/update-cypress-json.js.map +1 -1
- package/src/generators/move/lib/update-project-root-files.js +3 -3
- package/src/generators/move/lib/update-project-root-files.js.map +1 -1
- package/src/generators/move/lib/update-storybook-config.js +3 -3
- package/src/generators/move/lib/update-storybook-config.js.map +1 -1
- package/src/generators/move/move.js +1 -1
- package/src/generators/new/new.js +3 -3
- package/src/generators/npm-package/npm-package.js +1 -1
- package/src/generators/preset/preset.js +2 -2
- package/src/generators/remove/lib/check-dependencies.js +4 -4
- package/src/generators/remove/lib/check-dependencies.js.map +1 -1
- package/src/generators/remove/remove.js +1 -1
- package/src/generators/run-commands/run-commands.js +1 -1
- package/src/generators/utils/decorate-angular-cli.js__tmpl__ +1 -1
- package/src/generators/workspace/files/nx.json__tmpl__ +1 -1
- package/src/generators/workspace/workspace.js +1 -1
- package/src/generators/workspace-generator/workspace-generator.js +1 -1
- package/src/migrations/update-12-5-0/add-target-dependencies.js +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +1 -1
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js +1 -1
- package/src/migrations/update-13-10-0/update-decorate-cli.d.ts +3 -0
- package/src/migrations/update-13-10-0/update-decorate-cli.js +14 -0
- package/src/migrations/update-13-10-0/update-decorate-cli.js.map +1 -0
- package/src/migrations/update-13-10-0/update-tasks-runner.d.ts +3 -0
- package/src/migrations/update-13-10-0/update-tasks-runner.js +16 -0
- package/src/migrations/update-13-10-0/update-tasks-runner.js.map +1 -0
- package/src/migrations/update-13-2-0/set-parallel-default.js +1 -1
- package/src/migrations/update-13-3-0/update-tsc-executor-location.js +1 -1
- package/src/tasks-runner/life-cycle.d.ts +1 -43
- package/src/tasks-runner/life-cycle.js +2 -68
- package/src/tasks-runner/life-cycle.js.map +1 -1
- package/src/tasks-runner/tasks-runner-v2.d.ts +1 -18
- package/src/tasks-runner/tasks-runner-v2.js +4 -39
- package/src/tasks-runner/tasks-runner-v2.js.map +1 -1
- package/src/tasks-runner/utils.d.ts +1 -25
- package/src/tasks-runner/utils.js +2 -214
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.d.ts +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js +10 -11
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
- package/src/utilities/assets.d.ts +0 -8
- package/src/utilities/assets.js +1 -23
- package/src/utilities/assets.js.map +1 -1
- package/src/utilities/buildable-libs-utils.d.ts +1 -0
- package/src/utilities/buildable-libs-utils.js +27 -20
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/fileutils.d.ts +0 -3
- package/src/utilities/fileutils.js +1 -8
- package/src/utilities/fileutils.js.map +1 -1
- package/src/utilities/generate-globs.js +2 -2
- package/src/utilities/generate-globs.js.map +1 -1
- package/src/utilities/output.d.ts +1 -61
- package/src/utilities/output.js +2 -167
- package/src/utilities/output.js.map +1 -1
- package/src/utilities/plugins/community-plugins.js +1 -1
- package/src/utilities/plugins/plugin-capabilities.js +2 -2
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/prettier.js +1 -1
- package/src/utilities/run-tasks-in-serial.js +1 -1
- package/src/utilities/typescript/compilation.d.ts +1 -1
- package/src/utilities/typescript/compilation.js +1 -1
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utilities/typescript.d.ts +3 -2
- package/src/utilities/typescript.js +5 -5
- package/src/utilities/typescript.js.map +1 -1
- package/src/utils/ast-utils.d.ts +1 -2
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/lint.js +1 -1
- package/src/utils/lint.js.map +1 -1
- package/src/utils/project-type.d.ts +1 -1
- package/src/utils/rules/format-files.js +7 -7
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/rules/rename-package-imports.js +1 -1
- package/src/utils/runtime-lint-utils.d.ts +2 -3
- package/src/utils/runtime-lint-utils.js +2 -2
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/testing-utils.js +4 -4
- package/src/utils/testing-utils.js.map +1 -1
- package/src/utils/testing.js +2 -2
- package/src/utils/version-utils.js +1 -1
- package/src/utils/version-utils.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +3 -3
- package/src/utils/workspace.js +6 -6
- package/tasks-runners/default.d.ts +1 -1
- package/tasks-runners/default.js +1 -1
- package/src/command-line/affected.d.ts +0 -3
- package/src/command-line/affected.js +0 -117
- package/src/command-line/affected.js.map +0 -1
- package/src/command-line/connect-to-nx-cloud.d.ts +0 -2
- package/src/command-line/connect-to-nx-cloud.js +0 -78
- package/src/command-line/connect-to-nx-cloud.js.map +0 -1
- package/src/command-line/daemon.d.ts +0 -2
- package/src/command-line/daemon.js +0 -23
- package/src/command-line/daemon.js.map +0 -1
- package/src/command-line/dep-graph.d.ts +0 -24
- package/src/command-line/dep-graph.js +0 -370
- package/src/command-line/dep-graph.js.map +0 -1
- package/src/command-line/examples.d.ts +0 -5
- package/src/command-line/examples.js +0 -283
- package/src/command-line/examples.js.map +0 -1
- package/src/command-line/format.d.ts +0 -7
- package/src/command-line/format.js +0 -206
- package/src/command-line/format.js.map +0 -1
- package/src/command-line/lint.d.ts +0 -1
- package/src/command-line/lint.js +0 -32
- package/src/command-line/lint.js.map +0 -1
- package/src/command-line/list.d.ts +0 -13
- package/src/command-line/list.js +0 -41
- package/src/command-line/list.js.map +0 -1
- package/src/command-line/nx-commands.d.ts +0 -9
- package/src/command-line/nx-commands.js +0 -426
- package/src/command-line/nx-commands.js.map +0 -1
- package/src/command-line/print-affected.d.ts +0 -6
- package/src/command-line/print-affected.js +0 -82
- package/src/command-line/print-affected.js.map +0 -1
- package/src/command-line/report.d.ts +0 -24
- package/src/command-line/report.js +0 -135
- package/src/command-line/report.js.map +0 -1
- package/src/command-line/reset.d.ts +0 -1
- package/src/command-line/reset.js +0 -20
- package/src/command-line/reset.js.map +0 -1
- package/src/command-line/run-many.d.ts +0 -3
- package/src/command-line/run-many.js +0 -61
- package/src/command-line/run-many.js.map +0 -1
- package/src/command-line/run-one.d.ts +0 -6
- package/src/command-line/run-one.js +0 -31
- package/src/command-line/run-one.js.map +0 -1
- package/src/command-line/shared.d.ts +0 -5
- package/src/command-line/shared.js +0 -75
- package/src/command-line/shared.js.map +0 -1
- package/src/command-line/supported-nx-commands.d.ts +0 -1
- package/src/command-line/supported-nx-commands.js +0 -35
- package/src/command-line/supported-nx-commands.js.map +0 -1
- package/src/command-line/utils.d.ts +0 -40
- package/src/command-line/utils.js +0 -157
- package/src/command-line/utils.js.map +0 -1
- package/src/command-line/workspace-generators.d.ts +0 -1
- package/src/command-line/workspace-generators.js +0 -145
- package/src/command-line/workspace-generators.js.map +0 -1
- package/src/command-line/workspace-integrity-checks.d.ts +0 -11
- package/src/command-line/workspace-integrity-checks.js +0 -60
- package/src/command-line/workspace-integrity-checks.js.map +0 -1
- package/src/core/affected-project-graph/affected-project-graph-models.d.ts +0 -10
- package/src/core/affected-project-graph/affected-project-graph-models.js +0 -3
- package/src/core/affected-project-graph/affected-project-graph-models.js.map +0 -1
- package/src/core/affected-project-graph/affected-project-graph.d.ts +0 -3
- package/src/core/affected-project-graph/affected-project-graph.js +0 -88
- package/src/core/affected-project-graph/affected-project-graph.js.map +0 -1
- package/src/core/affected-project-graph/index.d.ts +0 -2
- package/src/core/affected-project-graph/index.js +0 -6
- package/src/core/affected-project-graph/index.js.map +0 -1
- package/src/core/affected-project-graph/locators/implicit-json-changes.d.ts +0 -4
- package/src/core/affected-project-graph/locators/implicit-json-changes.js +0 -54
- package/src/core/affected-project-graph/locators/implicit-json-changes.js.map +0 -1
- package/src/core/affected-project-graph/locators/npm-packages.d.ts +0 -4
- package/src/core/affected-project-graph/locators/npm-packages.js +0 -35
- package/src/core/affected-project-graph/locators/npm-packages.js.map +0 -1
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.d.ts +0 -4
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js +0 -64
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js.map +0 -1
- package/src/core/affected-project-graph/locators/workspace-json-changes.d.ts +0 -4
- package/src/core/affected-project-graph/locators/workspace-json-changes.js +0 -48
- package/src/core/affected-project-graph/locators/workspace-json-changes.js.map +0 -1
- package/src/core/affected-project-graph/locators/workspace-projects.d.ts +0 -3
- package/src/core/affected-project-graph/locators/workspace-projects.js +0 -40
- package/src/core/affected-project-graph/locators/workspace-projects.js.map +0 -1
- package/src/core/assert-workspace-validity.d.ts +0 -2
- package/src/core/assert-workspace-validity.js +0 -67
- package/src/core/assert-workspace-validity.js.map +0 -1
- package/src/core/dep-graph/3rdpartylicenses.txt +0 -732
- package/src/core/dep-graph/index.html +0 -16
- package/src/core/dep-graph/main.esm.js +0 -2
- package/src/core/dep-graph/main.esm.js.LICENSE.txt +0 -39
- package/src/core/dep-graph/polyfills.esm.js +0 -1
- package/src/core/dep-graph/runtime.esm.js +0 -1
- package/src/core/dep-graph/styles.css +0 -3
- package/src/core/file-map-utils.d.ts +0 -10
- package/src/core/file-map-utils.js +0 -80
- package/src/core/file-map-utils.js.map +0 -1
- package/src/core/file-utils.d.ts +0 -32
- package/src/core/file-utils.js +0 -160
- package/src/core/file-utils.js.map +0 -1
- package/src/core/hasher/file-hasher-base.d.ts +0 -12
- package/src/core/hasher/file-hasher-base.js +0 -68
- package/src/core/hasher/file-hasher-base.js.map +0 -1
- package/src/core/hasher/file-hasher.d.ts +0 -2
- package/src/core/hasher/file-hasher.js +0 -22
- package/src/core/hasher/file-hasher.js.map +0 -1
- package/src/core/hasher/git-based-file-hasher.d.ts +0 -10
- package/src/core/hasher/git-based-file-hasher.js +0 -50
- package/src/core/hasher/git-based-file-hasher.js.map +0 -1
- package/src/core/hasher/git-hasher.d.ts +0 -7
- package/src/core/hasher/git-hasher.js +0 -134
- package/src/core/hasher/git-hasher.js.map +0 -1
- package/src/core/hasher/hasher.d.ts +0 -58
- package/src/core/hasher/hasher.js +0 -363
- package/src/core/hasher/hasher.js.map +0 -1
- package/src/core/hasher/hashing-impl.d.ts +0 -5
- package/src/core/hasher/hashing-impl.js +0 -23
- package/src/core/hasher/hashing-impl.js.map +0 -1
- package/src/core/hasher/node-based-file-hasher.d.ts +0 -7
- package/src/core/hasher/node-based-file-hasher.js +0 -78
- package/src/core/hasher/node-based-file-hasher.js.map +0 -1
- package/src/core/normalize-nx-json.d.ts +0 -8
- package/src/core/normalize-nx-json.js +0 -38
- package/src/core/normalize-nx-json.js.map +0 -1
- package/src/core/nx-deps/nx-deps-cache.d.ts +0 -39
- package/src/core/nx-deps/nx-deps-cache.js +0 -164
- package/src/core/nx-deps/nx-deps-cache.js.map +0 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +0 -5
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +0 -19
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +0 -1
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts +0 -3
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +0 -73
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +0 -1
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.d.ts +0 -3
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js +0 -27
- package/src/core/project-graph/build-dependencies/explicit-project-dependencies.js.map +0 -1
- package/src/core/project-graph/build-dependencies/implicit-project-dependencies.d.ts +0 -2
- package/src/core/project-graph/build-dependencies/implicit-project-dependencies.js +0 -20
- package/src/core/project-graph/build-dependencies/implicit-project-dependencies.js.map +0 -1
- package/src/core/project-graph/build-dependencies/index.d.ts +0 -3
- package/src/core/project-graph/build-dependencies/index.js +0 -7
- package/src/core/project-graph/build-dependencies/index.js.map +0 -1
- package/src/core/project-graph/build-dependencies/typescript-import-locator.d.ts +0 -11
- package/src/core/project-graph/build-dependencies/typescript-import-locator.js +0 -114
- package/src/core/project-graph/build-dependencies/typescript-import-locator.js.map +0 -1
- package/src/core/project-graph/build-nodes/index.d.ts +0 -2
- package/src/core/project-graph/build-nodes/index.js +0 -6
- package/src/core/project-graph/build-nodes/index.js.map +0 -1
- package/src/core/project-graph/build-nodes/npm-packages.d.ts +0 -2
- package/src/core/project-graph/build-nodes/npm-packages.js +0 -22
- package/src/core/project-graph/build-nodes/npm-packages.js.map +0 -1
- package/src/core/project-graph/build-nodes/workspace-projects.d.ts +0 -2
- package/src/core/project-graph/build-nodes/workspace-projects.js +0 -49
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +0 -1
- package/src/core/project-graph/build-project-graph.d.ts +0 -7
- package/src/core/project-graph/build-project-graph.js +0 -231
- package/src/core/project-graph/build-project-graph.js.map +0 -1
- package/src/core/project-graph/daemon/cache.d.ts +0 -6
- package/src/core/project-graph/daemon/cache.js +0 -56
- package/src/core/project-graph/daemon/cache.js.map +0 -1
- package/src/core/project-graph/daemon/client/client.d.ts +0 -26
- package/src/core/project-graph/daemon/client/client.js +0 -200
- package/src/core/project-graph/daemon/client/client.js.map +0 -1
- package/src/core/project-graph/daemon/client/exec-is-server-available.d.ts +0 -1
- package/src/core/project-graph/daemon/client/exec-is-server-available.js +0 -13
- package/src/core/project-graph/daemon/client/exec-is-server-available.js.map +0 -1
- package/src/core/project-graph/daemon/client/generate-help-output.d.ts +0 -1
- package/src/core/project-graph/daemon/client/generate-help-output.js +0 -31
- package/src/core/project-graph/daemon/client/generate-help-output.js.map +0 -1
- package/src/core/project-graph/daemon/server/logger.d.ts +0 -18
- package/src/core/project-graph/daemon/server/logger.js +0 -38
- package/src/core/project-graph/daemon/server/logger.js.map +0 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts +0 -8
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +0 -191
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +0 -1
- package/src/core/project-graph/daemon/server/server.d.ts +0 -4
- package/src/core/project-graph/daemon/server/server.js +0 -236
- package/src/core/project-graph/daemon/server/server.js.map +0 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.d.ts +0 -12
- package/src/core/project-graph/daemon/server/shutdown-utils.js +0 -32
- package/src/core/project-graph/daemon/server/shutdown-utils.js.map +0 -1
- package/src/core/project-graph/daemon/server/start.d.ts +0 -1
- package/src/core/project-graph/daemon/server/start.js +0 -19
- package/src/core/project-graph/daemon/server/start.js.map +0 -1
- package/src/core/project-graph/daemon/server/stop.d.ts +0 -1
- package/src/core/project-graph/daemon/server/stop.js +0 -19
- package/src/core/project-graph/daemon/server/stop.js.map +0 -1
- package/src/core/project-graph/daemon/server/watcher.d.ts +0 -12
- package/src/core/project-graph/daemon/server/watcher.js +0 -158
- package/src/core/project-graph/daemon/server/watcher.js.map +0 -1
- package/src/core/project-graph/daemon/socket-utils.d.ts +0 -15
- package/src/core/project-graph/daemon/socket-utils.js +0 -38
- package/src/core/project-graph/daemon/socket-utils.js.map +0 -1
- package/src/core/project-graph/daemon/tmp-dir.d.ts +0 -6
- package/src/core/project-graph/daemon/tmp-dir.js +0 -37
- package/src/core/project-graph/daemon/tmp-dir.js.map +0 -1
- package/src/core/project-graph/index.d.ts +0 -3
- package/src/core/project-graph/index.js +0 -10
- package/src/core/project-graph/index.js.map +0 -1
- package/src/core/project-graph/operators.d.ts +0 -14
- package/src/core/project-graph/operators.js +0 -119
- package/src/core/project-graph/operators.js.map +0 -1
- package/src/core/project-graph/project-graph-models.d.ts +0 -8
- package/src/core/project-graph/project-graph-models.js +0 -12
- package/src/core/project-graph/project-graph-models.js.map +0 -1
- package/src/core/project-graph/project-graph-worker.d.ts +0 -1
- package/src/core/project-graph/project-graph-worker.js +0 -19
- package/src/core/project-graph/project-graph-worker.js.map +0 -1
- package/src/core/project-graph/project-graph.d.ts +0 -16
- package/src/core/project-graph/project-graph.js +0 -167
- package/src/core/project-graph/project-graph.js.map +0 -1
- package/src/core/shared-interfaces.d.ts +0 -11
- package/src/core/shared-interfaces.js +0 -3
- package/src/core/shared-interfaces.js.map +0 -1
- package/src/core/target-project-locator.d.ts +0 -36
- package/src/core/target-project-locator.js +0 -164
- package/src/core/target-project-locator.js.map +0 -1
- package/src/generators/init/files/prettier/__dot__prettierignore +0 -1
- package/src/generators/init/files/root/karma.conf.js__tmpl__ +0 -43
- package/src/generators/init/files/root/tools/schematics/__dot__gitkeep +0 -0
- package/src/generators/init/files/root/tools/tsconfig.tools.json__tmpl__ +0 -12
- package/src/generators/init/init.d.ts +0 -5
- package/src/generators/init/init.js +0 -650
- package/src/generators/init/init.js.map +0 -1
- package/src/generators/init/schema.d.ts +0 -7
- package/src/generators/init/schema.json +0 -35
- package/src/init/init.d.ts +0 -1
- package/src/init/init.js +0 -13
- package/src/init/init.js.map +0 -1
- package/src/tasks-runner/batch/batch-messages.d.ts +0 -24
- package/src/tasks-runner/batch/batch-messages.js +0 -9
- package/src/tasks-runner/batch/batch-messages.js.map +0 -1
- package/src/tasks-runner/batch/run-batch.d.ts +0 -1
- package/src/tasks-runner/batch/run-batch.js +0 -57
- package/src/tasks-runner/batch/run-batch.js.map +0 -1
- package/src/tasks-runner/cache.d.ts +0 -40
- package/src/tasks-runner/cache.js +0 -284
- package/src/tasks-runner/cache.js.map +0 -1
- package/src/tasks-runner/default-reporter.d.ts +0 -11
- package/src/tasks-runner/default-reporter.js +0 -79
- package/src/tasks-runner/default-reporter.js.map +0 -1
- package/src/tasks-runner/default-tasks-runner.d.ts +0 -19
- package/src/tasks-runner/default-tasks-runner.js +0 -48
- package/src/tasks-runner/default-tasks-runner.js.map +0 -1
- package/src/tasks-runner/empty-reporter.d.ts +0 -10
- package/src/tasks-runner/empty-reporter.js +0 -13
- package/src/tasks-runner/empty-reporter.js.map +0 -1
- package/src/tasks-runner/forked-process-task-runner.d.ts +0 -36
- package/src/tasks-runner/forked-process-task-runner.js +0 -257
- package/src/tasks-runner/forked-process-task-runner.js.map +0 -1
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.d.ts +0 -25
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js +0 -349
- package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js.map +0 -1
- package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.d.ts +0 -25
- package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js +0 -231
- package/src/tasks-runner/life-cycles/dynamic-run-one-terminal-output-life-cycle.js.map +0 -1
- package/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.d.ts +0 -6
- package/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.js +0 -19
- package/src/tasks-runner/life-cycles/empty-terminal-output-life-cycle.js.map +0 -1
- package/src/tasks-runner/life-cycles/pretty-time.d.ts +0 -4
- package/src/tasks-runner/life-cycles/pretty-time.js +0 -75
- package/src/tasks-runner/life-cycles/pretty-time.js.map +0 -1
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.d.ts +0 -33
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js +0 -110
- package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js.map +0 -1
- package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.d.ts +0 -31
- package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js +0 -97
- package/src/tasks-runner/life-cycles/static-run-one-terminal-output-life-cycle.js.map +0 -1
- package/src/tasks-runner/life-cycles/task-profiling-life-cycle.d.ts +0 -19
- package/src/tasks-runner/life-cycles/task-profiling-life-cycle.js +0 -67
- package/src/tasks-runner/life-cycles/task-profiling-life-cycle.js.map +0 -1
- package/src/tasks-runner/life-cycles/task-timings-life-cycle.d.ts +0 -13
- package/src/tasks-runner/life-cycles/task-timings-life-cycle.js +0 -33
- package/src/tasks-runner/life-cycles/task-timings-life-cycle.js.map +0 -1
- package/src/tasks-runner/remove-old-cache-records.d.ts +0 -1
- package/src/tasks-runner/remove-old-cache-records.js +0 -62
- package/src/tasks-runner/remove-old-cache-records.js.map +0 -1
- package/src/tasks-runner/reporter.d.ts +0 -14
- package/src/tasks-runner/reporter.js +0 -11
- package/src/tasks-runner/reporter.js.map +0 -1
- package/src/tasks-runner/run-command.d.ts +0 -19
- package/src/tasks-runner/run-command.js +0 -353
- package/src/tasks-runner/run-command.js.map +0 -1
- package/src/tasks-runner/run-one-reporter.d.ts +0 -12
- package/src/tasks-runner/run-one-reporter.js +0 -68
- package/src/tasks-runner/run-one-reporter.js.map +0 -1
- package/src/tasks-runner/task-graph-creator.d.ts +0 -11
- package/src/tasks-runner/task-graph-creator.js +0 -71
- package/src/tasks-runner/task-graph-creator.js.map +0 -1
- package/src/tasks-runner/task-orchestrator.d.ts +0 -37
- package/src/tasks-runner/task-orchestrator.js +0 -299
- package/src/tasks-runner/task-orchestrator.js.map +0 -1
- package/src/tasks-runner/tasks-runner.d.ts +0 -44
- package/src/tasks-runner/tasks-runner.js +0 -15
- package/src/tasks-runner/tasks-runner.js.map +0 -1
- package/src/tasks-runner/tasks-schedule.d.ts +0 -32
- package/src/tasks-runner/tasks-schedule.js +0 -130
- package/src/tasks-runner/tasks-schedule.js.map +0 -1
- package/src/utilities/array.d.ts +0 -17
- package/src/utilities/array.js +0 -26
- package/src/utilities/array.js.map +0 -1
- package/src/utilities/cache-directory.d.ts +0 -1
- package/src/utilities/cache-directory.js +0 -34
- package/src/utilities/cache-directory.js.map +0 -1
- package/src/utilities/is_ci.d.ts +0 -1
- package/src/utilities/is_ci.js +0 -21
- package/src/utilities/is_ci.js.map +0 -1
- package/src/utilities/json-diff.d.ts +0 -17
- package/src/utilities/json-diff.js +0 -112
- package/src/utilities/json-diff.js.map +0 -1
- package/src/utilities/perf-logging.d.ts +0 -1
- package/src/utilities/perf-logging.js +0 -12
- package/src/utilities/perf-logging.js.map +0 -1
- package/src/utilities/project-graph-utils.d.ts +0 -11
- package/src/utilities/project-graph-utils.js +0 -95
- package/src/utilities/project-graph-utils.js.map +0 -1
- package/src/utilities/strip-source-code.d.ts +0 -2
- package/src/utilities/strip-source-code.js +0 -85
- package/src/utilities/strip-source-code.js.map +0 -1
@@ -1,650 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.initSchematic = exports.initGenerator = void 0;
|
4
|
-
const tslib_1 = require("tslib");
|
5
|
-
const devkit_1 = require("@nrwl/devkit");
|
6
|
-
const fs_1 = require("fs");
|
7
|
-
const path_1 = require("path");
|
8
|
-
const prettier_1 = require("../../utilities/prettier");
|
9
|
-
const default_base_1 = require("../../utilities/default-base");
|
10
|
-
const versions_1 = require("../../utils/versions");
|
11
|
-
const workspace_1 = require("../workspace/workspace");
|
12
|
-
const typescript_1 = require("../../utilities/typescript");
|
13
|
-
function updatePackageJson(tree) {
|
14
|
-
(0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
|
15
|
-
var _a, _b;
|
16
|
-
packageJson.scripts = packageJson.scripts || {};
|
17
|
-
packageJson.scripts = Object.assign(Object.assign({}, packageJson.scripts), { nx: 'nx', 'affected:apps': 'nx affected:apps', 'affected:libs': 'nx affected:libs', 'affected:build': 'nx affected:build', 'affected:e2e': 'nx affected:e2e', 'affected:test': 'nx affected:test', 'affected:lint': 'nx affected:lint', 'affected:graph': 'nx affected:graph', affected: 'nx affected', format: 'nx format:write', 'format:write': 'nx format:write', 'format:check': 'nx format:check', update: 'ng update @nrwl/workspace', 'update:check': 'ng update', lint: 'nx workspace-lint && ng lint', graph: 'nx graph', 'workspace-schematic': 'nx workspace-schematic', help: 'nx help' });
|
18
|
-
packageJson.devDependencies = (_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : {};
|
19
|
-
packageJson.dependencies = (_b = packageJson.dependencies) !== null && _b !== void 0 ? _b : {};
|
20
|
-
if (!packageJson.dependencies['@nrwl/angular']) {
|
21
|
-
packageJson.dependencies['@nrwl/angular'] = versions_1.nxVersion;
|
22
|
-
}
|
23
|
-
delete packageJson.dependencies['@nrwl/workspace'];
|
24
|
-
if (!packageJson.devDependencies['@nrwl/workspace']) {
|
25
|
-
packageJson.devDependencies['@nrwl/workspace'] = versions_1.nxVersion;
|
26
|
-
}
|
27
|
-
if (!packageJson.devDependencies['@angular/cli']) {
|
28
|
-
packageJson.devDependencies['@angular/cli'] = versions_1.angularCliVersion;
|
29
|
-
}
|
30
|
-
if (!packageJson.devDependencies['prettier']) {
|
31
|
-
packageJson.devDependencies['prettier'] = versions_1.prettierVersion;
|
32
|
-
}
|
33
|
-
return packageJson;
|
34
|
-
});
|
35
|
-
}
|
36
|
-
function convertPath(name, originalPath) {
|
37
|
-
return `apps/${name}/${originalPath}`;
|
38
|
-
}
|
39
|
-
function updateAngularCLIJson(host, options) {
|
40
|
-
var _a;
|
41
|
-
const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(host);
|
42
|
-
const appName = workspaceConfig.defaultProject;
|
43
|
-
const e2eName = `${appName}-e2e`;
|
44
|
-
const e2eRoot = (0, devkit_1.joinPathFragments)('apps', e2eName);
|
45
|
-
delete workspaceConfig.newProjectRoot;
|
46
|
-
const defaultProject = (0, devkit_1.readProjectConfiguration)(host, appName);
|
47
|
-
const oldSourceRoot = defaultProject.sourceRoot;
|
48
|
-
const newRoot = (0, devkit_1.joinPathFragments)('apps', appName);
|
49
|
-
defaultProject.root = newRoot;
|
50
|
-
defaultProject.sourceRoot = (0, devkit_1.joinPathFragments)(newRoot, 'src');
|
51
|
-
function convertBuildOptions(buildOptions) {
|
52
|
-
buildOptions.outputPath =
|
53
|
-
buildOptions.outputPath &&
|
54
|
-
(0, devkit_1.joinPathFragments)((0, devkit_1.normalizePath)('dist'), 'apps', appName);
|
55
|
-
buildOptions.index =
|
56
|
-
buildOptions.index && convertAsset(buildOptions.index);
|
57
|
-
buildOptions.main =
|
58
|
-
buildOptions.main && convertAsset(buildOptions.main);
|
59
|
-
buildOptions.polyfills =
|
60
|
-
buildOptions.polyfills && convertAsset(buildOptions.polyfills);
|
61
|
-
buildOptions.tsConfig =
|
62
|
-
buildOptions.tsConfig && (0, devkit_1.joinPathFragments)(newRoot, 'tsconfig.app.json');
|
63
|
-
buildOptions.assets =
|
64
|
-
buildOptions.assets && buildOptions.assets.map(convertAsset);
|
65
|
-
buildOptions.styles =
|
66
|
-
buildOptions.styles && buildOptions.styles.map(convertAsset);
|
67
|
-
buildOptions.scripts =
|
68
|
-
buildOptions.scripts && buildOptions.scripts.map(convertAsset);
|
69
|
-
buildOptions.fileReplacements =
|
70
|
-
buildOptions.fileReplacements &&
|
71
|
-
buildOptions.fileReplacements.map((replacement) => ({
|
72
|
-
replace: convertAsset(replacement.replace),
|
73
|
-
with: convertAsset(replacement.with),
|
74
|
-
}));
|
75
|
-
}
|
76
|
-
convertBuildOptions(defaultProject.targets.build.options);
|
77
|
-
Object.values(defaultProject.targets.build.configurations).forEach((config) => convertBuildOptions(config));
|
78
|
-
if (defaultProject.targets.test) {
|
79
|
-
const testOptions = defaultProject.targets.test.options;
|
80
|
-
testOptions.main = testOptions.main && convertAsset(testOptions.main);
|
81
|
-
testOptions.polyfills =
|
82
|
-
testOptions.polyfills && convertAsset(testOptions.polyfills);
|
83
|
-
testOptions.tsConfig = (0, devkit_1.joinPathFragments)(newRoot, 'tsconfig.spec.json');
|
84
|
-
testOptions.karmaConfig = (0, devkit_1.joinPathFragments)(newRoot, 'karma.conf.js');
|
85
|
-
testOptions.assets =
|
86
|
-
testOptions.assets && testOptions.assets.map(convertAsset);
|
87
|
-
testOptions.styles =
|
88
|
-
testOptions.styles && testOptions.styles.map(convertAsset);
|
89
|
-
testOptions.scripts =
|
90
|
-
testOptions.scripts && testOptions.scripts.map(convertAsset);
|
91
|
-
}
|
92
|
-
const lintTarget = defaultProject.targets.lint;
|
93
|
-
if (lintTarget) {
|
94
|
-
lintTarget.options.tsConfig = [
|
95
|
-
(0, devkit_1.joinPathFragments)(newRoot, 'tsconfig.app.json'),
|
96
|
-
(0, devkit_1.joinPathFragments)(newRoot, 'tsconfig.spec.json'),
|
97
|
-
];
|
98
|
-
}
|
99
|
-
function convertServerOptions(serverOptions) {
|
100
|
-
serverOptions.outputPath =
|
101
|
-
serverOptions.outputPath &&
|
102
|
-
(0, devkit_1.joinPathFragments)((0, devkit_1.normalizePath)('dist'), 'apps', `${options.name}-server`);
|
103
|
-
serverOptions.main = serverOptions.main && convertAsset(serverOptions.main);
|
104
|
-
serverOptions.tsConfig =
|
105
|
-
serverOptions.tsConfig &&
|
106
|
-
(0, devkit_1.joinPathFragments)((0, devkit_1.normalizePath)('apps'), appName, 'tsconfig.server.json');
|
107
|
-
serverOptions.fileReplacements =
|
108
|
-
serverOptions.fileReplacements &&
|
109
|
-
serverOptions.fileReplacements.map((replacement) => ({
|
110
|
-
replace: convertAsset(replacement.replace),
|
111
|
-
with: convertAsset(replacement.with),
|
112
|
-
}));
|
113
|
-
}
|
114
|
-
if (defaultProject.targets.server) {
|
115
|
-
const serverOptions = defaultProject.targets.server.options;
|
116
|
-
convertServerOptions(serverOptions);
|
117
|
-
Object.values(defaultProject.targets.server.configurations).forEach((config) => convertServerOptions(config));
|
118
|
-
}
|
119
|
-
if (defaultProject.targets.e2e) {
|
120
|
-
const lintTargetOptions = lintTarget ? lintTarget.options : {};
|
121
|
-
if (isProtractorE2eProject(defaultProject)) {
|
122
|
-
(0, devkit_1.addProjectConfiguration)(host, e2eName, {
|
123
|
-
root: e2eRoot,
|
124
|
-
projectType: 'application',
|
125
|
-
targets: {
|
126
|
-
e2e: Object.assign(Object.assign({}, defaultProject.targets.e2e), { options: Object.assign(Object.assign({}, defaultProject.targets.e2e.options), { protractorConfig: (0, devkit_1.joinPathFragments)(e2eRoot, 'protractor.conf.js') }) }),
|
127
|
-
lint: {
|
128
|
-
executor: '@angular-devkit/build-angular:tslint',
|
129
|
-
options: Object.assign(Object.assign({}, lintTargetOptions), { tsConfig: (0, devkit_1.joinPathFragments)(e2eRoot, 'tsconfig.json') }),
|
130
|
-
},
|
131
|
-
},
|
132
|
-
implicitDependencies: [appName],
|
133
|
-
tags: [],
|
134
|
-
});
|
135
|
-
}
|
136
|
-
else if (isCypressE2eProject(defaultProject)) {
|
137
|
-
const cypressConfig = (0, devkit_1.joinPathFragments)(e2eRoot, (0, path_1.basename)((_a = getCypressConfigFile(defaultProject)) !== null && _a !== void 0 ? _a : 'cypress.json'));
|
138
|
-
const e2eProjectConfig = {
|
139
|
-
root: e2eRoot,
|
140
|
-
sourceRoot: (0, devkit_1.joinPathFragments)(e2eRoot, 'src'),
|
141
|
-
projectType: 'application',
|
142
|
-
targets: {
|
143
|
-
e2e: updateE2eCypressTarget(defaultProject.targets.e2e, cypressConfig),
|
144
|
-
},
|
145
|
-
implicitDependencies: [appName],
|
146
|
-
tags: [],
|
147
|
-
};
|
148
|
-
if (defaultProject.targets['cypress-run']) {
|
149
|
-
e2eProjectConfig.targets['cypress-run'] = updateE2eCypressTarget(defaultProject.targets['cypress-run'], cypressConfig);
|
150
|
-
}
|
151
|
-
if (defaultProject.targets['cypress-open']) {
|
152
|
-
e2eProjectConfig.targets['cypress-open'] = updateE2eCypressTarget(defaultProject.targets['cypress-open'], cypressConfig);
|
153
|
-
}
|
154
|
-
(0, devkit_1.addProjectConfiguration)(host, e2eName, e2eProjectConfig);
|
155
|
-
delete defaultProject.targets['cypress-run'];
|
156
|
-
delete defaultProject.targets['cypress-open'];
|
157
|
-
}
|
158
|
-
delete defaultProject.targets.e2e;
|
159
|
-
}
|
160
|
-
(0, devkit_1.updateProjectConfiguration)(host, appName, defaultProject);
|
161
|
-
workspaceConfig.cli = workspaceConfig.cli || {};
|
162
|
-
if (!workspaceConfig.cli.defaultCollection) {
|
163
|
-
workspaceConfig.cli.defaultCollection = '@nrwl/angular';
|
164
|
-
}
|
165
|
-
(0, devkit_1.updateWorkspaceConfiguration)(host, workspaceConfig);
|
166
|
-
function convertAsset(asset) {
|
167
|
-
if (typeof asset === 'string') {
|
168
|
-
return asset.startsWith(oldSourceRoot)
|
169
|
-
? convertPath(appName, asset.replace(oldSourceRoot, 'src'))
|
170
|
-
: asset;
|
171
|
-
}
|
172
|
-
else {
|
173
|
-
return Object.assign(Object.assign({}, asset), { input: asset.input && asset.input.startsWith(oldSourceRoot)
|
174
|
-
? convertPath(appName, asset.input.replace(oldSourceRoot, 'src'))
|
175
|
-
: asset.input });
|
176
|
-
}
|
177
|
-
}
|
178
|
-
}
|
179
|
-
function getCypressConfigFile(e2eProject) {
|
180
|
-
let cypressConfig = 'cypress.json';
|
181
|
-
const configFileOption = e2eProject.targets.e2e.options.configFile;
|
182
|
-
if (configFileOption === false) {
|
183
|
-
cypressConfig = undefined;
|
184
|
-
}
|
185
|
-
else if (typeof configFileOption === 'string') {
|
186
|
-
cypressConfig = (0, path_1.basename)(configFileOption);
|
187
|
-
}
|
188
|
-
return cypressConfig;
|
189
|
-
}
|
190
|
-
function updateE2eCypressTarget(target, cypressConfig) {
|
191
|
-
const updatedTarget = Object.assign(Object.assign({}, target), { executor: '@nrwl/cypress:cypress', options: Object.assign(Object.assign({}, target.options), { cypressConfig }) });
|
192
|
-
delete updatedTarget.options.configFile;
|
193
|
-
delete updatedTarget.options.tsConfig;
|
194
|
-
if (updatedTarget.options.headless && updatedTarget.options.watch) {
|
195
|
-
updatedTarget.options.headed = false;
|
196
|
-
}
|
197
|
-
else if (updatedTarget.options.headless === false &&
|
198
|
-
!updatedTarget.options.watch) {
|
199
|
-
updatedTarget.options.headed = true;
|
200
|
-
}
|
201
|
-
delete updatedTarget.options.headless;
|
202
|
-
return updatedTarget;
|
203
|
-
}
|
204
|
-
function updateTsConfig(host) {
|
205
|
-
(0, devkit_1.updateJson)(host, 'nx.json', (json) => {
|
206
|
-
json.implicitDependencies['tsconfig.base.json'] = '*';
|
207
|
-
return json;
|
208
|
-
});
|
209
|
-
(0, devkit_1.writeJson)(host, 'tsconfig.base.json', setUpCompilerOptions((0, devkit_1.readJson)(host, (0, typescript_1.getRootTsConfigPathInTree)(host))));
|
210
|
-
if (host.exists('tsconfig.json')) {
|
211
|
-
host.delete('tsconfig.json');
|
212
|
-
}
|
213
|
-
}
|
214
|
-
function updateTsConfigsJson(host, options) {
|
215
|
-
const app = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
216
|
-
const e2eProject = getE2eProject(host);
|
217
|
-
const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(host);
|
218
|
-
const appOffset = (0, devkit_1.offsetFromRoot)(app.root);
|
219
|
-
(0, devkit_1.updateJson)(host, app.targets.build.options.tsConfig, (json) => {
|
220
|
-
json.extends = `${appOffset}${tsConfigPath}`;
|
221
|
-
json.compilerOptions = json.compilerOptions || {};
|
222
|
-
json.compilerOptions.outDir = `${appOffset}dist/out-tsc`;
|
223
|
-
return json;
|
224
|
-
});
|
225
|
-
if (app.targets.test) {
|
226
|
-
(0, devkit_1.updateJson)(host, app.targets.test.options.tsConfig, (json) => {
|
227
|
-
json.extends = `${appOffset}${tsConfigPath}`;
|
228
|
-
json.compilerOptions = json.compilerOptions || {};
|
229
|
-
json.compilerOptions.outDir = `${appOffset}dist/out-tsc`;
|
230
|
-
return json;
|
231
|
-
});
|
232
|
-
}
|
233
|
-
if (app.targets.server) {
|
234
|
-
(0, devkit_1.updateJson)(host, app.targets.server.options.tsConfig, (json) => {
|
235
|
-
json.extends = `${appOffset}${tsConfigPath}`;
|
236
|
-
json.compilerOptions = json.compilerOptions || {};
|
237
|
-
json.compilerOptions.outDir = `${appOffset}dist/out-tsc`;
|
238
|
-
return json;
|
239
|
-
});
|
240
|
-
}
|
241
|
-
if (!!e2eProject) {
|
242
|
-
const tsConfig = isProtractorE2eProject(e2eProject)
|
243
|
-
? e2eProject.targets.lint.options.tsConfig
|
244
|
-
: (0, devkit_1.joinPathFragments)(e2eProject.root, 'tsconfig.json');
|
245
|
-
(0, devkit_1.updateJson)(host, tsConfig, (json) => {
|
246
|
-
json.extends = `${(0, devkit_1.offsetFromRoot)(e2eProject.root)}${tsConfigPath}`;
|
247
|
-
json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${(0, devkit_1.offsetFromRoot)(e2eProject.root)}dist/out-tsc` });
|
248
|
-
return json;
|
249
|
-
});
|
250
|
-
}
|
251
|
-
}
|
252
|
-
function updateTsLint(host) {
|
253
|
-
if (host.exists(`tslint.json`)) {
|
254
|
-
(0, devkit_1.updateJson)(host, 'tslint.json', (tslintJson) => {
|
255
|
-
[
|
256
|
-
'no-trailing-whitespace',
|
257
|
-
'one-line',
|
258
|
-
'quotemark',
|
259
|
-
'typedef-whitespace',
|
260
|
-
'whitespace',
|
261
|
-
].forEach((key) => {
|
262
|
-
tslintJson[key] = undefined;
|
263
|
-
});
|
264
|
-
tslintJson.rulesDirectory = tslintJson.rulesDirectory || [];
|
265
|
-
tslintJson.rulesDirectory.push('node_modules/@nrwl/workspace/src/tslint');
|
266
|
-
tslintJson.rules['nx-enforce-module-boundaries'] = [
|
267
|
-
true,
|
268
|
-
{
|
269
|
-
allow: [],
|
270
|
-
depConstraints: [{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] }],
|
271
|
-
},
|
272
|
-
];
|
273
|
-
return tslintJson;
|
274
|
-
});
|
275
|
-
}
|
276
|
-
}
|
277
|
-
function updateProjectTsLint(host, options) {
|
278
|
-
const workspaceJson = (0, devkit_1.readJson)(host, (0, devkit_1.getWorkspacePath)(host));
|
279
|
-
const app = workspaceJson.projects[options.name];
|
280
|
-
const offset = '../../';
|
281
|
-
if (host.exists(`${app.root}/tslint.json`)) {
|
282
|
-
(0, devkit_1.updateJson)(host, `${app.root}/tslint.json`, (json) => {
|
283
|
-
json.extends = `${offset}tslint.json`;
|
284
|
-
return json;
|
285
|
-
});
|
286
|
-
}
|
287
|
-
}
|
288
|
-
function setUpCompilerOptions(tsconfig) {
|
289
|
-
if (!tsconfig.compilerOptions.paths) {
|
290
|
-
tsconfig.compilerOptions.paths = {};
|
291
|
-
}
|
292
|
-
tsconfig.compilerOptions.baseUrl = '.';
|
293
|
-
tsconfig.compilerOptions.rootDir = '.';
|
294
|
-
return tsconfig;
|
295
|
-
}
|
296
|
-
function moveOutOfSrc(tree, appName, filePath, required = true) {
|
297
|
-
if (!filePath) {
|
298
|
-
return;
|
299
|
-
}
|
300
|
-
const filename = !!filePath ? (0, path_1.basename)(filePath) : '';
|
301
|
-
const from = filePath;
|
302
|
-
const to = filename
|
303
|
-
? (0, devkit_1.joinPathFragments)('apps', appName, filename)
|
304
|
-
: (0, devkit_1.joinPathFragments)('apps', appName);
|
305
|
-
renameSyncInTree(tree, from, to, required);
|
306
|
-
}
|
307
|
-
function getE2eKey(host) {
|
308
|
-
const projects = (0, devkit_1.getProjects)(host);
|
309
|
-
for (const [projectName, project] of projects) {
|
310
|
-
if (project.targets.e2e) {
|
311
|
-
return projectName;
|
312
|
-
}
|
313
|
-
}
|
314
|
-
}
|
315
|
-
function getE2eProject(host) {
|
316
|
-
const key = getE2eKey(host);
|
317
|
-
if (key) {
|
318
|
-
return (0, devkit_1.readProjectConfiguration)(host, key);
|
319
|
-
}
|
320
|
-
else {
|
321
|
-
return null;
|
322
|
-
}
|
323
|
-
}
|
324
|
-
function isCypressE2eProject(e2eProject) {
|
325
|
-
return e2eProject.targets.e2e.executor === '@cypress/schematic:cypress';
|
326
|
-
}
|
327
|
-
function isProtractorE2eProject(e2eProject) {
|
328
|
-
return (e2eProject.targets.e2e.executor ===
|
329
|
-
'@angular-devkit/build-angular:protractor');
|
330
|
-
}
|
331
|
-
function moveExistingFiles(host, options) {
|
332
|
-
const app = (0, devkit_1.readProjectConfiguration)(host, options.name);
|
333
|
-
// it is not required to have a browserslist
|
334
|
-
moveOutOfSrc(host, options.name, 'browserslist', false);
|
335
|
-
moveOutOfSrc(host, options.name, '.browserslistrc', false);
|
336
|
-
moveOutOfSrc(host, options.name, app.targets.build.options.tsConfig);
|
337
|
-
if (app.targets.test) {
|
338
|
-
moveOutOfSrc(host, options.name, app.targets.test.options.karmaConfig);
|
339
|
-
moveOutOfSrc(host, options.name, app.targets.test.options.tsConfig);
|
340
|
-
}
|
341
|
-
else {
|
342
|
-
// there could still be a karma.conf.js file in the root
|
343
|
-
// so move to new location
|
344
|
-
if (host.exists('karma.conf.js')) {
|
345
|
-
console.info('No test configuration, but root Karma config file found');
|
346
|
-
moveOutOfSrc(host, options.name, 'karma.conf.js');
|
347
|
-
}
|
348
|
-
}
|
349
|
-
if (app.targets.server) {
|
350
|
-
moveOutOfSrc(host, options.name, app.targets.server.options.tsConfig);
|
351
|
-
}
|
352
|
-
const oldAppSourceRoot = app.sourceRoot;
|
353
|
-
const newAppSourceRoot = (0, devkit_1.joinPathFragments)('apps', options.name, 'src');
|
354
|
-
renameDirSyncInTree(host, oldAppSourceRoot, newAppSourceRoot);
|
355
|
-
moveE2eProjectFiles(host, app, options);
|
356
|
-
}
|
357
|
-
function moveE2eProjectFiles(tree, app, options) {
|
358
|
-
const e2eProject = getE2eProject(tree);
|
359
|
-
if (!e2eProject) {
|
360
|
-
console.warn('No e2e project was migrated because there was none declared in angular.json.');
|
361
|
-
return;
|
362
|
-
}
|
363
|
-
if (isProtractorE2eProject(e2eProject)) {
|
364
|
-
const oldE2eRoot = (0, devkit_1.joinPathFragments)(app.root || '', 'e2e');
|
365
|
-
const newE2eRoot = (0, devkit_1.joinPathFragments)('apps', `${getE2eKey(tree)}-e2e`);
|
366
|
-
renameDirSyncInTree(tree, oldE2eRoot, newE2eRoot);
|
367
|
-
}
|
368
|
-
else if (isCypressE2eProject(e2eProject)) {
|
369
|
-
const e2eProjectName = `${options.name}-e2e`;
|
370
|
-
const configFile = getCypressConfigFile(e2eProject);
|
371
|
-
const oldE2eRoot = 'cypress';
|
372
|
-
const newE2eRoot = (0, devkit_1.joinPathFragments)('apps', e2eProjectName);
|
373
|
-
if (configFile) {
|
374
|
-
updateCypressConfigFilePaths(tree, configFile, oldE2eRoot, newE2eRoot);
|
375
|
-
moveOutOfSrc(tree, e2eProjectName, configFile);
|
376
|
-
}
|
377
|
-
else {
|
378
|
-
tree.write((0, devkit_1.joinPathFragments)('apps', e2eProjectName, 'cypress.json'), JSON.stringify({
|
379
|
-
fileServerFolder: '.',
|
380
|
-
fixturesFolder: './src/fixtures',
|
381
|
-
integrationFolder: './src/integration',
|
382
|
-
modifyObstructiveCode: false,
|
383
|
-
supportFile: './src/support/index.ts',
|
384
|
-
pluginsFile: './src/plugins/index.ts',
|
385
|
-
video: true,
|
386
|
-
videosFolder: `../../dist/cypress/${newE2eRoot}/videos`,
|
387
|
-
screenshotsFolder: `../../dist/cypress/${newE2eRoot}/screenshots`,
|
388
|
-
chromeWebSecurity: false,
|
389
|
-
}));
|
390
|
-
}
|
391
|
-
moveOutOfSrc(tree, e2eProjectName, `${oldE2eRoot}/tsconfig.json`);
|
392
|
-
renameDirSyncInTree(tree, oldE2eRoot, (0, devkit_1.joinPathFragments)('apps', e2eProjectName, 'src'));
|
393
|
-
}
|
394
|
-
}
|
395
|
-
function updateCypressConfigFilePaths(tree, configFile, oldE2eRoot, newE2eRoot) {
|
396
|
-
const srcFoldersAndFiles = [
|
397
|
-
'integrationFolder',
|
398
|
-
'supportFile',
|
399
|
-
'pluginsFile',
|
400
|
-
'fixturesFolder',
|
401
|
-
];
|
402
|
-
const distFolders = ['videosFolder', 'screenshotsFolder'];
|
403
|
-
const stringOrArrayGlobs = ['ignoreTestFiles', 'testFiles'];
|
404
|
-
const cypressConfig = (0, devkit_1.readJson)(tree, configFile);
|
405
|
-
cypressConfig.fileServerFolder = '.';
|
406
|
-
srcFoldersAndFiles.forEach((folderOrFile) => {
|
407
|
-
if (cypressConfig[folderOrFile]) {
|
408
|
-
cypressConfig[folderOrFile] = `./src/${(0, path_1.relative)(oldE2eRoot, cypressConfig[folderOrFile])}`;
|
409
|
-
}
|
410
|
-
});
|
411
|
-
distFolders.forEach((folder) => {
|
412
|
-
if (cypressConfig[folder]) {
|
413
|
-
cypressConfig[folder] = `../../dist/cypress/${newE2eRoot}/${(0, path_1.relative)(oldE2eRoot, cypressConfig[folder])}`;
|
414
|
-
}
|
415
|
-
});
|
416
|
-
stringOrArrayGlobs.forEach((stringOrArrayGlob) => {
|
417
|
-
if (!cypressConfig[stringOrArrayGlob]) {
|
418
|
-
return;
|
419
|
-
}
|
420
|
-
if (Array.isArray(cypressConfig[stringOrArrayGlob])) {
|
421
|
-
cypressConfig[stringOrArrayGlob] = cypressConfig[stringOrArrayGlob].map((glob) => replaceCypressGlobConfig(glob, oldE2eRoot));
|
422
|
-
}
|
423
|
-
else {
|
424
|
-
cypressConfig[stringOrArrayGlob] = replaceCypressGlobConfig(cypressConfig[stringOrArrayGlob], oldE2eRoot);
|
425
|
-
}
|
426
|
-
});
|
427
|
-
(0, devkit_1.writeJson)(tree, configFile, cypressConfig);
|
428
|
-
}
|
429
|
-
function replaceCypressGlobConfig(globPattern, oldE2eRoot) {
|
430
|
-
return globPattern.replace(new RegExp(`^(\\.\\/|\\/)?${oldE2eRoot}\\/`), './src/');
|
431
|
-
}
|
432
|
-
function createAdditionalFiles(host, options) {
|
433
|
-
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
434
|
-
const nxJson = {
|
435
|
-
npmScope: options.npmScope,
|
436
|
-
affected: {
|
437
|
-
defaultBase: options.defaultBase
|
438
|
-
? `${options.defaultBase}`
|
439
|
-
: (0, default_base_1.deduceDefaultBase)(),
|
440
|
-
},
|
441
|
-
implicitDependencies: {
|
442
|
-
'angular.json': '*',
|
443
|
-
'package.json': '*',
|
444
|
-
'tslint.json': '*',
|
445
|
-
'.eslintrc.json': '*',
|
446
|
-
'nx.json': '*',
|
447
|
-
},
|
448
|
-
};
|
449
|
-
(0, devkit_1.writeJson)(host, 'nx.json', nxJson);
|
450
|
-
host.write('libs/.gitkeep', '');
|
451
|
-
const recommendations = [
|
452
|
-
'nrwl.angular-console',
|
453
|
-
'angular.ng-template',
|
454
|
-
'dbaeumer.vscode-eslint',
|
455
|
-
'esbenp.prettier-vscode',
|
456
|
-
];
|
457
|
-
if (host.exists('.vscode/extensions.json')) {
|
458
|
-
(0, devkit_1.updateJson)(host, '.vscode/extensions.json', (json) => {
|
459
|
-
json.recommendations = json.recommendations || [];
|
460
|
-
recommendations.forEach((extension) => {
|
461
|
-
if (!json.recommendations.includes(extension)) {
|
462
|
-
json.recommendations.push(extension);
|
463
|
-
}
|
464
|
-
});
|
465
|
-
return json;
|
466
|
-
});
|
467
|
-
}
|
468
|
-
else {
|
469
|
-
(0, devkit_1.writeJson)(host, '.vscode/extensions.json', {
|
470
|
-
recommendations,
|
471
|
-
});
|
472
|
-
}
|
473
|
-
// if the user does not already have a prettier configuration
|
474
|
-
// of any kind, create one
|
475
|
-
const existingPrettierConfig = yield (0, prettier_1.resolveUserExistingPrettierConfig)();
|
476
|
-
if (!existingPrettierConfig) {
|
477
|
-
(0, devkit_1.writeJson)(host, '.prettierrc', workspace_1.DEFAULT_NRWL_PRETTIER_CONFIG);
|
478
|
-
}
|
479
|
-
});
|
480
|
-
}
|
481
|
-
function checkCanConvertToWorkspace(host) {
|
482
|
-
try {
|
483
|
-
if (!host.exists('package.json')) {
|
484
|
-
throw new Error('Cannot find package.json');
|
485
|
-
}
|
486
|
-
if (!host.exists('angular.json')) {
|
487
|
-
throw new Error('Cannot find angular.json');
|
488
|
-
}
|
489
|
-
// TODO: This restriction should be lited
|
490
|
-
const workspaceJson = (0, devkit_1.readJson)(host, 'angular.json');
|
491
|
-
const hasLibraries = Object.keys(workspaceJson.projects).find((project) => workspaceJson.projects[project].projectType &&
|
492
|
-
workspaceJson.projects[project].projectType !== 'application');
|
493
|
-
if (Object.keys(workspaceJson.projects).length > 2 || hasLibraries) {
|
494
|
-
throw new Error('Can only convert projects with one app');
|
495
|
-
}
|
496
|
-
const e2eKey = getE2eKey(host);
|
497
|
-
const e2eApp = getE2eProject(host);
|
498
|
-
if (!e2eApp) {
|
499
|
-
return;
|
500
|
-
}
|
501
|
-
if (isProtractorE2eProject(e2eApp)) {
|
502
|
-
if (host.exists(e2eApp.targets.e2e.options.protractorConfig)) {
|
503
|
-
return;
|
504
|
-
}
|
505
|
-
console.info(`Make sure the "${e2eKey}.architect.e2e.options.protractorConfig" is valid or the "${e2eKey}" project is removed from "angular.json".`);
|
506
|
-
throw new Error(`An e2e project with Protractor was found but "${e2eApp.targets.e2e.options.protractorConfig}" could not be found.`);
|
507
|
-
}
|
508
|
-
if (isCypressE2eProject(e2eApp)) {
|
509
|
-
const configFile = getCypressConfigFile(e2eApp);
|
510
|
-
if (configFile && !host.exists(configFile)) {
|
511
|
-
throw new Error(`An e2e project with Cypress was found but "${configFile}" could not be found.`);
|
512
|
-
}
|
513
|
-
if (!host.exists('cypress')) {
|
514
|
-
throw new Error(`An e2e project with Cypress was found but the "cypress" directory could not be found.`);
|
515
|
-
}
|
516
|
-
return;
|
517
|
-
}
|
518
|
-
throw new Error(`An e2e project was found but it's using an unsupported executor "${e2eApp.targets.e2e.executor}".`);
|
519
|
-
}
|
520
|
-
catch (e) {
|
521
|
-
console.error(e.message);
|
522
|
-
console.error('Your workspace could not be converted into an Nx Workspace because of the above error.');
|
523
|
-
throw e;
|
524
|
-
}
|
525
|
-
}
|
526
|
-
function createNxJson(host) {
|
527
|
-
const json = JSON.parse(host.read('angular.json').toString());
|
528
|
-
const projects = json.projects || {};
|
529
|
-
const hasLibraries = Object.keys(projects).find((project) => projects[project].projectType &&
|
530
|
-
projects[project].projectType !== 'application');
|
531
|
-
if (Object.keys(projects).length !== 1 || hasLibraries) {
|
532
|
-
throw new Error(`The schematic can only be used with Angular CLI workspaces with a single application.`);
|
533
|
-
}
|
534
|
-
const name = Object.keys(projects)[0];
|
535
|
-
const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(host);
|
536
|
-
(0, devkit_1.writeJson)(host, 'nx.json', {
|
537
|
-
npmScope: name,
|
538
|
-
implicitDependencies: {
|
539
|
-
'package.json': {
|
540
|
-
dependencies: '*',
|
541
|
-
devDependencies: '*',
|
542
|
-
},
|
543
|
-
[tsConfigPath]: '*',
|
544
|
-
'.eslintrc.json': '*',
|
545
|
-
},
|
546
|
-
tasksRunnerOptions: {
|
547
|
-
default: {
|
548
|
-
runner: '@nrwl/workspace/tasks-runners/default',
|
549
|
-
options: {
|
550
|
-
cacheableOperations: ['build', 'lint', 'test', 'e2e'],
|
551
|
-
},
|
552
|
-
},
|
553
|
-
},
|
554
|
-
});
|
555
|
-
}
|
556
|
-
function decorateAngularClI(host) {
|
557
|
-
const decorateCli = (0, fs_1.readFileSync)((0, devkit_1.joinPathFragments)(__dirname, '..', 'utils', 'decorate-angular-cli.js__tmpl__')).toString();
|
558
|
-
host.write('decorate-angular-cli.js', decorateCli);
|
559
|
-
(0, devkit_1.updateJson)(host, 'package.json', (json) => {
|
560
|
-
if (json.scripts &&
|
561
|
-
json.scripts.postinstall &&
|
562
|
-
!json.scripts.postinstall.includes('decorate-angular-cli.js')) {
|
563
|
-
// if exists, add execution of this script
|
564
|
-
json.scripts.postinstall += ' && node ./decorate-angular-cli.js';
|
565
|
-
}
|
566
|
-
else {
|
567
|
-
if (!json.scripts)
|
568
|
-
json.scripts = {};
|
569
|
-
// if doesn't exist, set to execute this script
|
570
|
-
json.scripts.postinstall = 'node ./decorate-angular-cli.js';
|
571
|
-
}
|
572
|
-
if (json.scripts.ng) {
|
573
|
-
json.scripts.ng = 'nx';
|
574
|
-
}
|
575
|
-
return json;
|
576
|
-
});
|
577
|
-
}
|
578
|
-
function addFiles(host) {
|
579
|
-
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/root'), '.', {
|
580
|
-
tmpl: '',
|
581
|
-
dot: '.',
|
582
|
-
rootTsConfigPath: (0, typescript_1.getRootTsConfigPathInTree)(host),
|
583
|
-
});
|
584
|
-
if (!host.exists('.prettierignore')) {
|
585
|
-
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, './files/prettier'), '.', {
|
586
|
-
tmpl: '',
|
587
|
-
dot: '.',
|
588
|
-
});
|
589
|
-
}
|
590
|
-
}
|
591
|
-
function renameSyncInTree(tree, from, to, required) {
|
592
|
-
if (!tree.exists(from)) {
|
593
|
-
if (required) {
|
594
|
-
console.warn(`Path: ${from} does not exist`);
|
595
|
-
}
|
596
|
-
}
|
597
|
-
else if (tree.exists(to)) {
|
598
|
-
if (required) {
|
599
|
-
console.warn(`Path: ${to} already exists`);
|
600
|
-
}
|
601
|
-
}
|
602
|
-
else {
|
603
|
-
const contents = tree.read(from);
|
604
|
-
tree.write(to, contents);
|
605
|
-
tree.delete(from);
|
606
|
-
}
|
607
|
-
}
|
608
|
-
function renameDirSyncInTree(tree, from, to) {
|
609
|
-
(0, devkit_1.visitNotIgnoredFiles)(tree, from, (file) => {
|
610
|
-
renameSyncInTree(tree, file, file.replace(from, to), true);
|
611
|
-
});
|
612
|
-
}
|
613
|
-
function initGenerator(tree, schema) {
|
614
|
-
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
615
|
-
if (schema.preserveAngularCliLayout) {
|
616
|
-
(0, devkit_1.updateJson)(tree, 'package.json', (json) => {
|
617
|
-
var _a;
|
618
|
-
(_a = json.dependencies) === null || _a === void 0 ? true : delete _a['@nrwl/workspace'];
|
619
|
-
return json;
|
620
|
-
});
|
621
|
-
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nrwl/workspace': versions_1.nxVersion });
|
622
|
-
createNxJson(tree);
|
623
|
-
decorateAngularClI(tree);
|
624
|
-
}
|
625
|
-
else {
|
626
|
-
const options = Object.assign(Object.assign({}, schema), { npmScope: (0, devkit_1.names)(schema.npmScope || schema.name).fileName });
|
627
|
-
checkCanConvertToWorkspace(tree);
|
628
|
-
moveExistingFiles(tree, options);
|
629
|
-
addFiles(tree);
|
630
|
-
yield createAdditionalFiles(tree, options);
|
631
|
-
updatePackageJson(tree);
|
632
|
-
updateAngularCLIJson(tree, options);
|
633
|
-
updateTsLint(tree);
|
634
|
-
updateProjectTsLint(tree, options);
|
635
|
-
updateTsConfig(tree);
|
636
|
-
updateTsConfigsJson(tree, options);
|
637
|
-
decorateAngularClI(tree);
|
638
|
-
yield (0, devkit_1.formatFiles)(tree);
|
639
|
-
}
|
640
|
-
if (!schema.skipInstall) {
|
641
|
-
return () => {
|
642
|
-
(0, devkit_1.installPackagesTask)(tree);
|
643
|
-
};
|
644
|
-
}
|
645
|
-
});
|
646
|
-
}
|
647
|
-
exports.initGenerator = initGenerator;
|
648
|
-
exports.initSchematic = (0, devkit_1.convertNxGenerator)(initGenerator);
|
649
|
-
exports.default = initGenerator;
|
650
|
-
//# sourceMappingURL=init.js.map
|