nx 15.6.3 → 15.7.0-alpha.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.
- package/CHANGELOG.md +1 -1
- package/README.md +1 -1
- package/bin/init-local.js +0 -1
- package/bin/init-local.js.map +1 -1
- package/nx.darwin-arm64.node +0 -0
- package/nx.darwin-x64.node +0 -0
- package/nx.linux-arm-gnueabihf.node +0 -0
- package/nx.linux-arm64-gnu.node +0 -0
- package/nx.linux-arm64-musl.node +0 -0
- package/nx.linux-x64-gnu.node +0 -0
- package/nx.linux-x64-musl.node +0 -0
- package/nx.win32-arm64-msvc.node +0 -0
- package/nx.win32-x64-msvc.node +0 -0
- package/package.json +34 -6
- package/src/adapter/angular-json.d.ts +9 -0
- package/src/adapter/angular-json.js +100 -0
- package/src/adapter/angular-json.js.map +1 -0
- package/src/adapter/compat.js +6 -34
- package/src/adapter/compat.js.map +1 -1
- package/src/adapter/ngcli-adapter.d.ts +3 -24
- package/src/adapter/ngcli-adapter.js +137 -427
- package/src/adapter/ngcli-adapter.js.map +1 -1
- package/src/command-line/affected.js +2 -0
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/examples.js +7 -3
- package/src/command-line/examples.js.map +1 -1
- package/src/command-line/format.d.ts +0 -5
- package/src/command-line/format.js +8 -78
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/lint.js +7 -24
- package/src/command-line/lint.js.map +1 -1
- package/src/command-line/migrate.js +26 -2
- package/src/command-line/migrate.js.map +1 -1
- package/src/command-line/nx-commands.js +16 -0
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/run-many.js +2 -0
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +2 -0
- package/src/command-line/run-one.js.map +1 -1
- package/src/command-line/show.d.ts +3 -0
- package/src/command-line/show.js +18 -0
- package/src/command-line/show.js.map +1 -0
- package/src/config/configuration.js +1 -1
- package/src/config/configuration.js.map +1 -1
- package/src/config/project-graph.d.ts +5 -1
- package/src/config/project-graph.js.map +1 -1
- package/src/config/workspace-json-project-json.d.ts +3 -5
- package/src/config/workspaces.d.ts +4 -18
- package/src/config/workspaces.js +13 -162
- package/src/config/workspaces.js.map +1 -1
- package/src/daemon/server/project-graph-incremental-recomputation.js +10 -10
- package/src/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/executors/run-commands/schema.json +4 -8
- package/src/executors/run-script/schema.json +1 -2
- package/src/executors/utils/convert-nx-executor.js +1 -1
- package/src/executors/utils/convert-nx-executor.js.map +1 -1
- package/src/generators/testing-utils/create-tree-with-empty-workspace.d.ts +3 -0
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js +4 -3
- package/src/generators/testing-utils/create-tree-with-empty-workspace.js.map +1 -1
- package/src/generators/utils/deprecated.d.ts +35 -0
- package/src/generators/utils/deprecated.js +68 -0
- package/src/generators/utils/deprecated.js.map +1 -0
- package/src/generators/utils/nx-json.d.ts +10 -0
- package/src/generators/utils/nx-json.js +54 -0
- package/src/generators/utils/nx-json.js.map +1 -0
- package/src/generators/utils/project-configuration.d.ts +9 -57
- package/src/generators/utils/project-configuration.js +102 -338
- package/src/generators/utils/project-configuration.js.map +1 -1
- package/src/hasher/file-hasher.js +4 -0
- package/src/hasher/file-hasher.js.map +1 -1
- package/src/hasher/native-file-hasher.d.ts +6 -0
- package/src/hasher/native-file-hasher.js +34 -0
- package/src/hasher/native-file-hasher.js.map +1 -0
- package/src/lock-file/lock-file.js +9 -10
- package/src/lock-file/lock-file.js.map +1 -1
- package/src/migrations/update-14-2-0/remove-default-collection.js +3 -3
- package/src/migrations/update-14-2-0/remove-default-collection.js.map +1 -1
- package/src/migrations/update-14-3-4/create-target-defaults.js +3 -3
- package/src/migrations/update-14-3-4/create-target-defaults.js.map +1 -1
- package/src/migrations/update-15-0-0/migrate-to-inputs.js +3 -2
- package/src/migrations/update-15-0-0/migrate-to-inputs.js.map +1 -1
- package/src/migrations/update-15-0-0/prefix-outputs.js +3 -2
- package/src/migrations/update-15-0-0/prefix-outputs.js.map +1 -1
- package/src/migrations/update-15-1-0/set-project-names.js +2 -2
- package/src/migrations/update-15-1-0/set-project-names.js.map +1 -1
- package/src/native/index.d.ts +11 -0
- package/src/native/index.js +252 -0
- package/src/native/nx.linux-x64-gnu.node +0 -0
- package/src/nx-init/add-nx-to-nest.js.map +1 -1
- package/src/plugins/js/index.d.ts +2 -0
- package/src/plugins/js/index.js +12 -0
- package/src/plugins/js/index.js.map +1 -0
- package/src/plugins/js/project-graph/build-nodes/build-npm-package-nodes.d.ts +2 -0
- package/src/{project-graph/build-nodes/npm-packages.js → plugins/js/project-graph/build-nodes/build-npm-package-nodes.js} +3 -3
- package/src/plugins/js/project-graph/build-nodes/build-npm-package-nodes.js.map +1 -0
- package/src/project-graph/affected/affected-project-graph.js +1 -9
- package/src/project-graph/affected/affected-project-graph.js.map +1 -1
- package/src/project-graph/affected/locators/npm-packages.js +1 -1
- package/src/project-graph/affected/locators/workspace-json-changes.js +1 -1
- package/src/project-graph/affected/locators/workspace-json-changes.js.map +1 -1
- package/src/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.d.ts +3 -2
- package/src/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +3 -3
- package/src/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -1
- package/src/project-graph/build-dependencies/explicit-package-json-dependencies.d.ts +3 -2
- package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js +8 -7
- package/src/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/project-graph/build-dependencies/explicit-project-dependencies.d.ts +1 -2
- package/src/project-graph/build-dependencies/explicit-project-dependencies.js +1 -1
- package/src/project-graph/build-dependencies/explicit-project-dependencies.js.map +1 -1
- package/src/project-graph/build-nodes/index.d.ts +0 -1
- package/src/project-graph/build-nodes/index.js +0 -1
- package/src/project-graph/build-nodes/index.js.map +1 -1
- package/src/project-graph/build-project-graph.js +15 -13
- package/src/project-graph/build-project-graph.js.map +1 -1
- package/src/project-graph/file-map-utils.d.ts +3 -2
- package/src/project-graph/file-map-utils.js +5 -5
- package/src/project-graph/file-map-utils.js.map +1 -1
- package/src/project-graph/file-utils.d.ts +0 -1
- package/src/project-graph/file-utils.js +5 -15
- package/src/project-graph/file-utils.js.map +1 -1
- package/src/project-graph/project-graph-worker.js +6 -4
- package/src/project-graph/project-graph-worker.js.map +1 -1
- package/src/project-graph/project-graph.js +3 -2
- package/src/project-graph/project-graph.js.map +1 -1
- package/src/tasks-runner/utils.js +0 -1
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/utils/assert-workspace-validity.d.ts +1 -1
- package/src/utils/assert-workspace-validity.js +3 -3
- package/src/utils/assert-workspace-validity.js.map +1 -1
- package/src/utils/nx-plugin.js +45 -36
- package/src/utils/nx-plugin.js.map +1 -1
- package/src/utils/testing/mock-fs.d.ts +0 -0
- package/src/utils/testing/mock-fs.js +13 -0
- package/src/utils/testing/mock-fs.js.map +1 -0
- package/src/utils/workspace-configuration-check.d.ts +1 -0
- package/src/utils/workspace-configuration-check.js +38 -0
- package/src/utils/workspace-configuration-check.js.map +1 -0
- package/src/command-line/workspace-integrity-checks.d.ts +0 -101
- package/src/command-line/workspace-integrity-checks.js +0 -112
- package/src/command-line/workspace-integrity-checks.js.map +0 -1
- package/src/project-graph/build-nodes/npm-packages.d.ts +0 -2
- package/src/project-graph/build-nodes/npm-packages.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,6 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
|
|
7
7
|
|
|
8
8
|
**Note:** Version bump only for package nx
|
package/README.md
CHANGED
|
@@ -53,7 +53,7 @@ npx nx@latest init
|
|
|
53
53
|
|
|
54
54
|
- [Nx.Dev: Documentation, Guides, Tutorials](https://nx.dev)
|
|
55
55
|
- [Intro to Nx](https://nx.dev/getting-started/intro)
|
|
56
|
-
- [Official Nx YouTube Channel](https://www.youtube.com
|
|
56
|
+
- [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
|
|
57
57
|
- [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
|
|
58
58
|
|
|
59
59
|
<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg"
|
package/bin/init-local.js
CHANGED
package/bin/init-local.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-local.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":";;;AAAA,kEAAwE;AAExE,2CAAyC;AACzC,iDAAyC;AAEzC,iEAAiE;AAEjE,8DAA0D;AAE1D;;;;GAIG;AACH,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC;AAEhC,SAAgB,SAAS,CAAC,SAA+B;IACvD,IAAI;QACF,wBAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAErC,IAAI,SAAS,CAAC,IAAI,KAAK,IAAI,IAAI,0BAA0B,EAAE,EAAE;YAC3D,OAAO,CAAC,IAAI,CACV,IAAA,4BAAY,EAAA;iDAC6B,CAC1C,CAAC;YACF,yBAAyB,CAAC,SAAS,CAAC,CAAC;YACrC,OAAO;SACR;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,UAAU,EAAE;YAClE,4BAAc,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SAC7C;aAAM,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE;YAClC,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACxD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACpC,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,CAAC,IAAI,KAAK,GAAG,IAAI,CAAC,EAAE;gBAC/C,4BAAc,CAAC,QAAQ,EAAE,CAAC;aAC3B;iBAAM;gBACL,4BAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC/B;SACF;aAAM;YACL,MAAM,OAAO,GAAG,0BAA0B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACzD,4BAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAC/B;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAlCD,8BAkCC;AAED,SAAgB,yBAAyB,CAAC,IAAc;IACtD,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE;QACtB,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;YACpB,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;SACvC;aAAM,IACL,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI;YAChB,IAAI,CAAC,CAAC,CAAC,KAAK,YAAY;YACxB,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW;YACvB,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS;YACrB,IAAI,CAAC,CAAC,CAAC,KAAK,IAAI;YAChB,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU;YACtB,IAAI,CAAC,CAAC,CAAC,KAAK,WAAW,EACvB;YACA,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACtB,CAAC,EAAE,CAAC;YACJ,MAAM,KAAK,GAAG,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAClD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpB,CAAC,EAAE,CAAC;aACL;YACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SAC/B;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACtB,EAAE,CAAC,CAAC;SACL;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AA7BD,8DA6BC;AAED,SAAS,0BAA0B,CAAC,IAAc;IAChD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACvC,OAAO,CAAC,KAAK,EAAE,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxE;SAAM;QACL,OAAO;YACL,KAAK;YACL,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YAC/C,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;SACjB,CAAC;KACH;AACH,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAW;IACzC,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AAClD,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,QAAQ,GAAG;QACf,GAAG,MAAM,CAAC,IAAI,CACX,4BAAsB;aACpB,kBAAkB,EAAE;aACpB,kBAAkB,EAAE;aACpB,kBAAkB,EAAE,CACxB;QACD,GAAG;QACH,WAAW;QACX,oBAAoB;QACpB,QAAQ;QACR,qBAAqB;QACrB,qBAAqB;QACrB,aAAa;QACb,MAAM;KACP,CAAC;IACF,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,0BAA0B;IACjC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,QAAQ,GAAG;QACf,KAAK;QACL,WAAW;QACX,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,YAAY;KACb,CAAC;IACF,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,yBAAyB,CAAC,SAA+B;IAChE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,MAAM,EAAE;QACzE,OAAO,CAAC,GAAG,CACT,qGAAqG,CACtG,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,2CAA2C,CAAC,CAAC;QACzD,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;QACnD,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;QACnD,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE,CAAC;QACF,OAAO,CAAC,GAAG,CACT,2JAA2J,CAC5J,CAAC;QACF,OAAO,CAAC,GAAG,CACT,gEAAgE,CACjE,CAAC;QACF,OAAO,CAAC,GAAG,CACT,oGAAoG,CACrG,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;KAC7E;SAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,GAAG,EAAE;YACR,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;QAED,MAAM,EAAE,GAAG,IAAA,0CAAwB,GAAE,CAAC;QACtC,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC,GAAG,IAAI,GAAG,OAAO,EAAE,CAAC,IAAI,SAAS,GAAG,SAAS,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,mCAAmC,GAAG,IAAI,CAAC,CAAC;QAExD,qCAAO,UAAU,GAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5B,CAAC;aACE,MAAM,CAAiB;YACtB,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,mBAAmB;SAC7B,CAAC;aACD,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE;YACd,IAAI,CAAC,EAAE;gBACL,IAAA,wBAAQ,EAAC,GAAG,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;aACrC;QACH,CAAC,CAAC,CACL,CAAC;KACH;SAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE;QAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YACpB,OAAO,CAAC,GAAG,CAAC;;gFAE8D,CAAC,CAAC;SAC7E;KACF;SAAM;QACL,
|
|
1
|
+
{"version":3,"file":"init-local.js","sourceRoot":"","sources":["../../../../packages/nx/bin/init-local.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nx",
|
|
3
|
-
"version": "15.
|
|
3
|
+
"version": "15.7.0-alpha.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
|
|
6
6
|
"repository": {
|
|
@@ -9,7 +9,8 @@
|
|
|
9
9
|
"directory": "packages/nx"
|
|
10
10
|
},
|
|
11
11
|
"scripts": {
|
|
12
|
-
"postinstall": "node ./bin/compute-project-graph"
|
|
12
|
+
"postinstall": "node ./bin/compute-project-graph",
|
|
13
|
+
"prepublishOnly": "napi prepublish --skip-gh-release --prefix ./native-packages $NAPI_DRY_RUN"
|
|
13
14
|
},
|
|
14
15
|
"keywords": [
|
|
15
16
|
"Monorepo",
|
|
@@ -32,8 +33,8 @@
|
|
|
32
33
|
},
|
|
33
34
|
"homepage": "https://nx.dev",
|
|
34
35
|
"dependencies": {
|
|
35
|
-
"@nrwl/cli": "15.
|
|
36
|
-
"@nrwl/tao": "15.
|
|
36
|
+
"@nrwl/cli": "15.7.0-alpha.0",
|
|
37
|
+
"@nrwl/tao": "15.7.0-alpha.0",
|
|
37
38
|
"@parcel/watcher": "2.0.4",
|
|
38
39
|
"@yarnpkg/lockfile": "^1.1.0",
|
|
39
40
|
"@yarnpkg/parsers": "^3.0.0-rc.18",
|
|
@@ -119,7 +120,34 @@
|
|
|
119
120
|
"publishConfig": {
|
|
120
121
|
"access": "public"
|
|
121
122
|
},
|
|
123
|
+
"napi": {
|
|
124
|
+
"name": "nx",
|
|
125
|
+
"package": {
|
|
126
|
+
"name": "@nrwl/nx"
|
|
127
|
+
},
|
|
128
|
+
"triples": {
|
|
129
|
+
"additional": [
|
|
130
|
+
"aarch64-apple-darwin",
|
|
131
|
+
"aarch64-unknown-linux-gnu",
|
|
132
|
+
"aarch64-unknown-linux-musl",
|
|
133
|
+
"aarch64-pc-windows-msvc",
|
|
134
|
+
"armv7-unknown-linux-gnueabihf",
|
|
135
|
+
"x86_64-unknown-linux-musl"
|
|
136
|
+
]
|
|
137
|
+
}
|
|
138
|
+
},
|
|
122
139
|
"main": "./bin/nx.js",
|
|
123
140
|
"types": "./bin/nx.d.ts",
|
|
124
|
-
"gitHead": "
|
|
125
|
-
|
|
141
|
+
"gitHead": "be7988a3428ba211fba66c0d071f9b486a5ef584",
|
|
142
|
+
"optionalDependencies": {
|
|
143
|
+
"@nrwl/nx-win32-x64-msvc": "15.7.0-alpha.0",
|
|
144
|
+
"@nrwl/nx-darwin-x64": "15.7.0-alpha.0",
|
|
145
|
+
"@nrwl/nx-linux-x64-gnu": "15.7.0-alpha.0",
|
|
146
|
+
"@nrwl/nx-darwin-arm64": "15.7.0-alpha.0",
|
|
147
|
+
"@nrwl/nx-linux-arm64-gnu": "15.7.0-alpha.0",
|
|
148
|
+
"@nrwl/nx-linux-arm64-musl": "15.7.0-alpha.0",
|
|
149
|
+
"@nrwl/nx-win32-arm64-msvc": "15.7.0-alpha.0",
|
|
150
|
+
"@nrwl/nx-linux-arm-gnueabihf": "15.7.0-alpha.0",
|
|
151
|
+
"@nrwl/nx-linux-x64-musl": "15.7.0-alpha.0"
|
|
152
|
+
}
|
|
153
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { ProjectConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
2
|
+
export declare function shouldMergeAngularProjects(root: string, includeProjectsFromAngularJson: boolean): boolean;
|
|
3
|
+
export declare function mergeAngularJsonAndGlobProjects(globProjects: {
|
|
4
|
+
[name: string]: ProjectConfiguration;
|
|
5
|
+
}): {
|
|
6
|
+
[name: string]: ProjectConfiguration;
|
|
7
|
+
};
|
|
8
|
+
export declare function toNewFormat(w: any): ProjectsConfigurations;
|
|
9
|
+
export declare function toOldFormat(w: any): any;
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.toOldFormat = exports.toNewFormat = exports.mergeAngularJsonAndGlobProjects = exports.shouldMergeAngularProjects = void 0;
|
|
4
|
+
const fs_1 = require("fs");
|
|
5
|
+
const path = require("path");
|
|
6
|
+
const fileutils_1 = require("../utils/fileutils");
|
|
7
|
+
const workspaces_1 = require("../config/workspaces");
|
|
8
|
+
const workspace_root_1 = require("../utils/workspace-root");
|
|
9
|
+
function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
|
|
10
|
+
if ((0, fs_1.existsSync)(path.join(root, 'angular.json')) &&
|
|
11
|
+
// Include projects from angular.json if explicitly required.
|
|
12
|
+
// e.g. when invoked from `packages/devkit/src/utils/convert-nx-executor.ts`
|
|
13
|
+
(includeProjectsFromAngularJson ||
|
|
14
|
+
// Or if a workspace has `@nrwl/angular` installed then projects from `angular.json` to be considered by Nx.
|
|
15
|
+
isNrwlAngularInstalled())) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
exports.shouldMergeAngularProjects = shouldMergeAngularProjects;
|
|
23
|
+
function isNrwlAngularInstalled() {
|
|
24
|
+
try {
|
|
25
|
+
require.resolve('@nrwl/angular');
|
|
26
|
+
return true;
|
|
27
|
+
}
|
|
28
|
+
catch (_a) {
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function readAngularJson() {
|
|
33
|
+
return toNewFormat((0, fileutils_1.readJsonFile)(path.join(workspace_root_1.workspaceRoot, 'angular.json')))
|
|
34
|
+
.projects;
|
|
35
|
+
}
|
|
36
|
+
function mergeAngularJsonAndGlobProjects(globProjects) {
|
|
37
|
+
const res = readAngularJson();
|
|
38
|
+
const folders = new Set();
|
|
39
|
+
for (let k of Object.keys(res)) {
|
|
40
|
+
folders.add(res[k].root);
|
|
41
|
+
}
|
|
42
|
+
for (let k of Object.keys(globProjects)) {
|
|
43
|
+
if (!folders.has(globProjects[k].root)) {
|
|
44
|
+
res[k] = globProjects[k];
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return res;
|
|
48
|
+
}
|
|
49
|
+
exports.mergeAngularJsonAndGlobProjects = mergeAngularJsonAndGlobProjects;
|
|
50
|
+
function toNewFormat(w) {
|
|
51
|
+
Object.values(w.projects || {}).forEach((projectConfig) => {
|
|
52
|
+
if (projectConfig.architect) {
|
|
53
|
+
(0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'architect', 'targets');
|
|
54
|
+
}
|
|
55
|
+
if (projectConfig.schematics) {
|
|
56
|
+
(0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'schematics', 'generators');
|
|
57
|
+
}
|
|
58
|
+
Object.values(projectConfig.targets || {}).forEach((target) => {
|
|
59
|
+
if (target.builder !== undefined) {
|
|
60
|
+
(0, workspaces_1.renamePropertyWithStableKeys)(target, 'builder', 'executor');
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
if (w.schematics) {
|
|
65
|
+
(0, workspaces_1.renamePropertyWithStableKeys)(w, 'schematics', 'generators');
|
|
66
|
+
}
|
|
67
|
+
if (w.version !== 2) {
|
|
68
|
+
w.version = 2;
|
|
69
|
+
}
|
|
70
|
+
return w;
|
|
71
|
+
}
|
|
72
|
+
exports.toNewFormat = toNewFormat;
|
|
73
|
+
function toOldFormat(w) {
|
|
74
|
+
Object.values(w.projects || {}).forEach((projectConfig) => {
|
|
75
|
+
if (typeof projectConfig === 'string') {
|
|
76
|
+
throw new Error("'project.json' files are incompatible with version 1 workspace schemas.");
|
|
77
|
+
}
|
|
78
|
+
if (projectConfig.targets) {
|
|
79
|
+
(0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'targets', 'architect');
|
|
80
|
+
}
|
|
81
|
+
if (projectConfig.generators) {
|
|
82
|
+
(0, workspaces_1.renamePropertyWithStableKeys)(projectConfig, 'generators', 'schematics');
|
|
83
|
+
}
|
|
84
|
+
delete projectConfig.name;
|
|
85
|
+
Object.values(projectConfig.architect || {}).forEach((target) => {
|
|
86
|
+
if (target.executor !== undefined) {
|
|
87
|
+
(0, workspaces_1.renamePropertyWithStableKeys)(target, 'executor', 'builder');
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
if (w.generators) {
|
|
92
|
+
(0, workspaces_1.renamePropertyWithStableKeys)(w, 'generators', 'schematics');
|
|
93
|
+
}
|
|
94
|
+
if (w.version !== 1) {
|
|
95
|
+
w.version = 1;
|
|
96
|
+
}
|
|
97
|
+
return w;
|
|
98
|
+
}
|
|
99
|
+
exports.toOldFormat = toOldFormat;
|
|
100
|
+
//# sourceMappingURL=angular-json.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"angular-json.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/angular-json.ts"],"names":[],"mappings":"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"}
|
package/src/adapter/compat.js
CHANGED
|
@@ -1,16 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const logger_1 = require("../utils/logger");
|
|
5
|
-
const workspaces_1 = require("../config/workspaces");
|
|
6
|
-
const workspace_root_1 = require("../utils/workspace-root");
|
|
7
4
|
const project_graph_1 = require("../project-graph/project-graph");
|
|
8
5
|
const configuration_1 = require("../config/configuration");
|
|
6
|
+
const angular_json_1 = require("./angular-json");
|
|
9
7
|
/* eslint-disable */
|
|
10
8
|
const Module = require('module');
|
|
11
9
|
const originalRequire = Module.prototype.require;
|
|
12
10
|
let patched = false;
|
|
13
|
-
let loggedWriteWorkspaceWarning = false;
|
|
14
11
|
const allowedProjectExtensions = [
|
|
15
12
|
'tags',
|
|
16
13
|
'implicitDependencies',
|
|
@@ -19,6 +16,7 @@ const allowedProjectExtensions = [
|
|
|
19
16
|
'generators',
|
|
20
17
|
'namedInputs',
|
|
21
18
|
'name',
|
|
19
|
+
'files',
|
|
22
20
|
];
|
|
23
21
|
const allowedWorkspaceExtensions = [
|
|
24
22
|
'implicitDependencies',
|
|
@@ -36,13 +34,10 @@ if (!patched) {
|
|
|
36
34
|
Module.prototype.require = function () {
|
|
37
35
|
const result = originalRequire.apply(this, arguments);
|
|
38
36
|
if (arguments[0].startsWith('@angular-devkit/core')) {
|
|
39
|
-
// Register `workspace.json` as a nonstandard workspace config file
|
|
40
37
|
const ngCoreWorkspace = originalRequire.apply(this, [
|
|
41
38
|
`@angular-devkit/core/src/workspace/core`,
|
|
42
39
|
]);
|
|
43
|
-
ngCoreWorkspace._test_addWorkspaceFile('workspace.json', ngCoreWorkspace.WorkspaceFormat.JSON);
|
|
44
40
|
mockReadWorkspace(ngCoreWorkspace);
|
|
45
|
-
mockWriteWorkspace(ngCoreWorkspace);
|
|
46
41
|
const readJsonUtils = originalRequire.apply(this, [
|
|
47
42
|
`@angular-devkit/core/src/workspace/json/reader`,
|
|
48
43
|
]);
|
|
@@ -64,34 +59,12 @@ if (!patched) {
|
|
|
64
59
|
}
|
|
65
60
|
function mockReadWorkspace(ngCoreWorkspace) {
|
|
66
61
|
mockMember(ngCoreWorkspace, 'readWorkspace', (originalReadWorkspace) => (path, ...rest) => {
|
|
67
|
-
|
|
68
|
-
if (!configFile) {
|
|
69
|
-
path = 'workspace.json';
|
|
70
|
-
}
|
|
62
|
+
path = 'angular.json';
|
|
71
63
|
return originalReadWorkspace.apply(this, [path, ...rest]);
|
|
72
64
|
});
|
|
73
65
|
}
|
|
74
|
-
function mockWriteWorkspace(ngCoreWorkspace) {
|
|
75
|
-
mockMember(ngCoreWorkspace, 'writeWorkspace', (originalWriteWorkspace) => (...args) => {
|
|
76
|
-
const configFile = (0, workspaces_1.workspaceConfigName)(workspace_root_1.workspaceRoot);
|
|
77
|
-
if (!loggedWriteWorkspaceWarning) {
|
|
78
|
-
if (configFile) {
|
|
79
|
-
logger_1.logger.warn(`[NX] Angular devkit called \`writeWorkspace\`, this may have had unintended consequences in ${configFile}`);
|
|
80
|
-
logger_1.logger.warn(`[NX] Double check ${configFile} before proceeding`);
|
|
81
|
-
}
|
|
82
|
-
else {
|
|
83
|
-
logger_1.logger.warn(`[NX] Angular devkit called \`writeWorkspace\`, this may have created 'workspace.json' or 'angular.json`);
|
|
84
|
-
logger_1.logger.warn(`[NX] Double check workspace configuration before proceeding`);
|
|
85
|
-
}
|
|
86
|
-
loggedWriteWorkspaceWarning = true;
|
|
87
|
-
}
|
|
88
|
-
return originalWriteWorkspace.apply(this, args);
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
66
|
/**
|
|
92
|
-
* Patch readJsonWorkspace to
|
|
93
|
-
* as well as work in workspaces without a central workspace file.
|
|
94
|
-
*
|
|
67
|
+
* Patch readJsonWorkspace to handle workspaces without a central workspace file.
|
|
95
68
|
* NOTE: We hide warnings that would be logged during this process.
|
|
96
69
|
*/
|
|
97
70
|
function mockReadJsonWorkspace(readJsonUtils) {
|
|
@@ -105,17 +78,16 @@ function mockReadJsonWorkspace(readJsonUtils) {
|
|
|
105
78
|
catch (_a) {
|
|
106
79
|
// This failed. Its most likely due to a lack of a workspace definition file,
|
|
107
80
|
// or other things that are different between NgCLI and Nx config files.
|
|
108
|
-
logger_1.logger.debug('[NX] Angular devkit readJsonWorkspace fell back to Nx workspaces logic');
|
|
109
81
|
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
110
82
|
const nxJson = (0, configuration_1.readNxJson)();
|
|
111
83
|
// Construct old workspace.json format from project graph
|
|
112
84
|
const w = Object.assign(Object.assign({}, nxJson), (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph));
|
|
113
85
|
// Read our v1 workspace schema
|
|
114
|
-
const workspaceConfiguration = (0,
|
|
86
|
+
const workspaceConfiguration = (0, angular_json_1.toOldFormat)(w);
|
|
115
87
|
// readJsonWorkspace actually has AST parsing + more, so we
|
|
116
88
|
// still need to call it rather than just return our file
|
|
117
89
|
return originalReadJsonWorkspace.apply(this, [
|
|
118
|
-
'
|
|
90
|
+
'angular.json',
|
|
119
91
|
{
|
|
120
92
|
// second arg is a host, only method used is readFile
|
|
121
93
|
readFile: () => JSON.stringify(workspaceConfiguration),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../packages/nx/src/adapter/compat.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,6 @@ import { GenerateOptions } from '../command-line/generate';
|
|
|
3
3
|
import { Tree } from '../generators/tree';
|
|
4
4
|
import { FileBuffer } from '@angular-devkit/core/src/virtual-fs/host/interface';
|
|
5
5
|
import { Observable } from 'rxjs';
|
|
6
|
-
import { NxJsonConfiguration } from '../config/nx-json';
|
|
7
|
-
import { RawProjectsConfigurations, ProjectsConfigurations } from '../config/workspace-json-project-json';
|
|
8
6
|
export declare function scheduleTarget(root: string, opts: {
|
|
9
7
|
project: string;
|
|
10
8
|
target: string;
|
|
@@ -13,31 +11,14 @@ export declare function scheduleTarget(root: string, opts: {
|
|
|
13
11
|
}, verbose: boolean): Promise<Observable<import('@angular-devkit/architect').BuilderOutput>>;
|
|
14
12
|
export declare class NxScopedHost extends virtualFs.ScopedHost<any> {
|
|
15
13
|
private root;
|
|
16
|
-
protected
|
|
14
|
+
protected cachedConfigurationV1: any;
|
|
17
15
|
constructor(root: string);
|
|
18
|
-
protected __readWorkspaceConfiguration: (configFileName: ChangeContext['actualConfigFileName'], overrides?: {
|
|
19
|
-
workspace?: Observable<RawProjectsConfigurations>;
|
|
20
|
-
nx?: Observable<NxJsonConfiguration>;
|
|
21
|
-
}) => Observable<FileBuffer>;
|
|
22
16
|
read(path: Path): Observable<FileBuffer>;
|
|
23
17
|
write(path: Path, content: FileBuffer): Observable<void>;
|
|
24
18
|
isFile(path: Path): Observable<boolean>;
|
|
25
19
|
exists(path: Path): Observable<boolean>;
|
|
26
|
-
|
|
27
|
-
protected context(path: string): Observable<ChangeContext>;
|
|
28
|
-
private writeWorkspaceConfiguration;
|
|
29
|
-
private __saveNxJsonProps;
|
|
30
|
-
private writeWorkspaceConfigFiles;
|
|
31
|
-
protected resolveInlineProjectConfigurations(config: RawProjectsConfigurations): Observable<ProjectsConfigurations>;
|
|
20
|
+
readExistingAngularJson(): Observable<any>;
|
|
32
21
|
}
|
|
33
|
-
declare type ConfigFilePath = ('/angular.json' | '/workspace.json') & {
|
|
34
|
-
__PRIVATE_DEVKIT_PATH: void;
|
|
35
|
-
};
|
|
36
|
-
declare type ChangeContext = {
|
|
37
|
-
isWorkspaceConfig: boolean;
|
|
38
|
-
actualConfigFileName: ConfigFilePath | null;
|
|
39
|
-
isNewFormat: boolean;
|
|
40
|
-
};
|
|
41
22
|
export declare class NxScopeHostUsedForWrappedSchematics extends NxScopedHost {
|
|
42
23
|
private readonly host;
|
|
43
24
|
constructor(root: string, host: Tree);
|
|
@@ -87,7 +68,7 @@ export declare function overrideCollectionResolutionForTesting(collections: {
|
|
|
87
68
|
* ```typescript
|
|
88
69
|
* mockSchematicsForTesting({
|
|
89
70
|
* 'mycollection:myschematic': (tree, params) => {
|
|
90
|
-
* tree.write(
|
|
71
|
+
* tree.write("README.md");
|
|
91
72
|
* }
|
|
92
73
|
* });
|
|
93
74
|
*
|
|
@@ -101,6 +82,4 @@ export declare function mockSchematicsForTesting(schematics: {
|
|
|
101
82
|
export declare function wrapAngularDevkitSchematic(collectionName: string, generatorName: string): (host: Tree, generatorOptions: {
|
|
102
83
|
[k: string]: any;
|
|
103
84
|
}) => Promise<any>;
|
|
104
|
-
export declare function invokeNew(root: string, opts: GenerateOptions, verbose: boolean): Promise<number>;
|
|
105
85
|
export declare const getLogger: (isVerbose?: boolean) => logging.Logger;
|
|
106
|
-
export {};
|