@nrwl/workspace 13.3.0-beta.3 → 13.3.0-beta.4
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 +5 -5
- package/src/command-line/format.js +8 -3
- package/src/command-line/format.js.map +1 -1
- package/src/core/dep-graph/index.html +41 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/styles.css +1 -1
- package/src/core/project-graph/daemon/server/logger.d.ts +0 -1
- package/src/core/project-graph/daemon/server/logger.js +0 -3
- package/src/core/project-graph/daemon/server/logger.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts +3 -0
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +26 -19
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +55 -33
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.js +10 -6
- package/src/core/project-graph/daemon/server/shutdown-utils.js.map +1 -1
- package/src/generators/npm-package/npm-package.js +6 -3
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.d.ts +3 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js +8 -4
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
- package/src/utils/rules/format-files.js +6 -10
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/runtime-lint-utils.d.ts +6 -2
- package/src/utils/runtime-lint-utils.js +28 -7
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/versions.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
.tippy-box[data-animation=fade][data-state=hidden]{opacity:0}[data-tippy-root]{max-width:calc(100vw - 10px)}.tippy-box{background-color:#333;border-radius:4px;color:#fff;font-size:14px;line-height:1.4;outline:0;position:relative;transition-property:transform,visibility,opacity;white-space:normal}.tippy-box[data-placement^=top]>.tippy-arrow{bottom:0}.tippy-box[data-placement^=top]>.tippy-arrow:before{border-top-color:initial;border-width:8px 8px 0;bottom:-7px;left:0;transform-origin:center top}.tippy-box[data-placement^=bottom]>.tippy-arrow{top:0}.tippy-box[data-placement^=bottom]>.tippy-arrow:before{border-bottom-color:initial;border-width:0 8px 8px;left:0;top:-7px;transform-origin:center bottom}.tippy-box[data-placement^=left]>.tippy-arrow{right:0}.tippy-box[data-placement^=left]>.tippy-arrow:before{border-left-color:initial;border-width:8px 0 8px 8px;right:-7px;transform-origin:center left}.tippy-box[data-placement^=right]>.tippy-arrow{left:0}.tippy-box[data-placement^=right]>.tippy-arrow:before{border-right-color:initial;border-width:8px 8px 8px 0;left:-7px;transform-origin:center right}.tippy-box[data-inertia][data-state=visible]{transition-timing-function:cubic-bezier(.54,1.5,.38,1.11)}.tippy-arrow{color:#333;height:16px;width:16px}.tippy-arrow:before{border-color:transparent;border-style:solid;content:"";position:absolute}.tippy-content{padding:5px 9px;position:relative;z-index:1}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}/*! tailwindcss v2.2.19 | MIT License | https://tailwindcss.com *//*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */html{-webkit-text-size-adjust:100%;line-height:1.15;-moz-tab-size:4;tab-size:4}body{font-family:system-ui,-apple-system,Segoe UI,Roboto,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;margin:0}hr{color:inherit;height:0}abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}::-moz-focus-inner{border-style:none;padding:0}:-moz-focusring{outline:1px dotted ButtonText}:-moz-ui-invalid{box-shadow:none}legend{padding:0}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}button{background-color:transparent;background-image:none}fieldset,ol,ul{margin:0;padding:0}ol,ul{list-style:none}html{font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}body{font-family:inherit;line-height:inherit}*,:after,:before{border:0 solid;box-sizing:border-box}hr{border-top-width:1px}img{border-style:solid}textarea{resize:vertical}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:-moz-focusring{outline:auto}table{border-collapse:collapse}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}button,input,optgroup,select,textarea{color:inherit;line-height:inherit;padding:0}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}*,:after,:before{--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-transform:translateX(var(--tw-translate-x)) translateY(var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));--tw-border-opacity:1;--tw-ring-inset:var(--tw-empty,/*!*/ /*!*/);--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-blur:var(--tw-empty,/*!*/ /*!*/);--tw-brightness:var(--tw-empty,/*!*/ /*!*/);--tw-contrast:var(--tw-empty,/*!*/ /*!*/);--tw-grayscale:var(--tw-empty,/*!*/ /*!*/);--tw-hue-rotate:var(--tw-empty,/*!*/ /*!*/);--tw-invert:var(--tw-empty,/*!*/ /*!*/);--tw-saturate:var(--tw-empty,/*!*/ /*!*/);--tw-sepia:var(--tw-empty,/*!*/ /*!*/);--tw-drop-shadow:var(--tw-empty,/*!*/ /*!*/);--tw-filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);border-color:rgba(229,231,235,var(--tw-border-opacity))}.visible{visibility:visible}.static{position:static}.absolute{position:absolute}.relative{position:relative}.inset-y-0{bottom:0;top:0}.right-2{right:.5rem}.right-0{right:0}.top-1{top:.25rem}.right-1{right:.25rem}.mx-4{margin-left:1rem;margin-right:1rem}.my-5{margin-bottom:1.25rem;margin-top:1.25rem}.ml-4{margin-left:1rem}.mt-3{margin-top:.75rem}.mr-2{margin-right:.5rem}.mt-8{margin-top:2rem}.mr-4{margin-right:1rem}.-ml-1{margin-left:-.25rem}.ml-3{margin-left:.75rem}.mt-4{margin-top:1rem}.mt-10{margin-top:2.5rem}.-mt-1{margin-top:-.25rem}.mr-1{margin-right:.25rem}.mt-2{margin-top:.5rem}.-ml-3{margin-left:-.75rem}.block{display:block}.inline-block{display:inline-block}.inline{display:inline}.flex{display:flex}.inline-flex{display:inline-flex}.hidden{display:none}.h-full{height:100%}.h-10{height:2.5rem}.h-4{height:1rem}.h-6{height:1.5rem}.h-5{height:1.25rem}.w-72{width:18rem}.w-auto{width:auto}.w-4{width:1rem}.w-6{width:1.5rem}.w-full{width:100%}.w-5{width:1.25rem}.flex-1{flex:1 1 0%}.flex-grow{flex-grow:1}.translate-x-32{--tw-translate-x:8rem}.transform,.translate-x-32{transform:var(--tw-transform)}.cursor-pointer{cursor:pointer}.cursor-default{cursor:default}.cursor-text{cursor:text}.select-none{-webkit-user-select:none;user-select:none}.resize{resize:both}.flex-col{flex-direction:column}.items-start{align-items:flex-start}.items-center{align-items:center}.justify-start{justify-content:flex-start}.justify-items-center{justify-items:center}.gap-4{gap:1rem}.overflow-hidden{overflow:hidden}.overflow-scroll{overflow:scroll}.truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.rounded-md{border-radius:.375rem}.rounded{border-radius:.25rem}.rounded-none{border-radius:0}.rounded-l-md{border-bottom-left-radius:.375rem;border-top-left-radius:.375rem}.rounded-r-md{border-bottom-right-radius:.375rem;border-top-right-radius:.375rem}.border{border-width:1px}.border-t{border-top-width:1px}.border-b{border-bottom-width:1px}.border-r-0{border-right-width:0}.border-solid{border-style:solid}.border-gray-200{--tw-border-opacity:1;border-color:rgba(229,231,235,var(--tw-border-opacity))}.border-gray-300{--tw-border-opacity:1;border-color:rgba(209,213,219,var(--tw-border-opacity))}.border-red-300{--tw-border-opacity:1;border-color:rgba(252,165,165,var(--tw-border-opacity))}.border-gray-50{--tw-border-opacity:1;border-color:rgba(249,250,251,var(--tw-border-opacity))}.bg-blue-nx-base{background-color:#143157}.bg-gray-50{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity))}.bg-white{--tw-bg-opacity:1;background-color:rgba(255,255,255,var(--tw-bg-opacity))}.bg-green-nx-base{background-color:#44bb97}.p-4{padding:1rem}.p-1\.5{padding:.375rem}.p-1{padding:.25rem}.p-2{padding:.5rem}.px-4{padding-left:1rem;padding-right:1rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.py-1{padding-bottom:.25rem;padding-top:.25rem}.pb-10{padding-bottom:2.5rem}.pl-2{padding-left:.5rem}.pl-3{padding-left:.75rem}.pr-9{padding-right:2.25rem}.text-center{text-align:center}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.font-medium{font-weight:500}.font-bold{font-weight:700}.font-normal{font-weight:400}.font-semibold{font-weight:600}.uppercase{text-transform:uppercase}.tracking-wide{letter-spacing:.025em}.text-white{--tw-text-opacity:1;color:rgba(255,255,255,var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity:1;color:rgba(107,114,128,var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.text-red-500{--tw-text-opacity:1;color:rgba(239,68,68,var(--tw-text-opacity))}.text-gray-50{--tw-text-opacity:1;color:rgba(249,250,251,var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity))}.text-green-nx-base{color:#44bb97}.text-gray-900{--tw-text-opacity:1;color:rgba(17,24,39,var(--tw-text-opacity))}.shadow-lg{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -2px rgba(0,0,0,.05)}.shadow-lg,.shadow-sm{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.ring-1{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.ring-gray-400{--tw-ring-opacity:1;--tw-ring-color:rgba(156,163,175,var(--tw-ring-opacity))}.ring-gray-500{--tw-ring-opacity:1;--tw-ring-color:rgba(107,114,128,var(--tw-ring-opacity))}.ring-gray-200{--tw-ring-opacity:1;--tw-ring-color:rgba(229,231,235,var(--tw-ring-opacity))}.ring-opacity-10{--tw-ring-opacity:0.1}.filter{filter:var(--tw-filter)}.transition{transition-duration:.15s;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-200{transition-duration:.2s}.ease-out{transition-timing-function:cubic-bezier(0,0,.2,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}#app,body,html{height:100%;margin:0;overflow:hidden;padding:0;width:100%}#app{display:flex}.tippy-box[data-theme~=nx]{background-color:#fff;border:1px solid #d1d5db;border-radius:.375rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05);box-sizing:border-box;color:#384252;margin-bottom:1rem;min-width:250px;padding:.375rem}.tippy-box[data-theme~=nx] .tippy-content{padding:.375rem}.tippy-box[data-theme~=nx][data-placement^=top]>.tippy-arrow:before{border-top-color:#d1d5db}.tippy-box[data-theme~=nx][data-placement^=bottom]>.tippy-arrow:before{border-bottom-color:#d1d5db}.tippy-box[data-theme~=nx][data-placement^=left]>.tippy-arrow:before{border-left-color:#d1d5db}.tippy-box[data-theme~=nx][data-placement^=right]>.tippy-arrow:before{border-right-color:#d1d5db}.tag{background-color:#143157;border-radius:.375rem;color:#fff;display:inline-block;font-family:system-ui;font-size:.75rem;font-weight:600;letter-spacing:.025em;line-height:1rem;margin-bottom:.75rem;margin-right:.75rem;padding:.5rem;text-transform:uppercase}.tippy-box[data-theme~=nx] h4{font-family:monospace}.tippy-box[data-theme~=nx] p{margin:.375rem}.tippy-box[data-theme~=nx] button{background-color:#f9fafb;border-color:#d1d5db;border-radius:.375rem;border-width:1px;color:#6b7280;margin:.375rem;padding:.5rem 1rem}.tippy-box[data-theme~=nx] button:hover{background-color:#f3f4f6}#no-projects-chosen{align-items:center;display:flex;justify-content:center}#graph-container,#no-projects-chosen{height:100%;width:100%}canvas{cursor:pointer}.hover\:bg-gray-50:hover{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity))}.hover\:bg-red-50:hover{--tw-bg-opacity:1;background-color:rgba(254,242,242,var(--tw-bg-opacity))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgba(243,244,246,var(--tw-bg-opacity))}.hover\:underline:hover{text-decoration:underline}.group:hover .group-hover\:translate-x-0{--tw-translate-x:0px;transform:var(--tw-transform)}.group:hover .group-hover\:opacity-60{opacity:.6}@media (min-width:1024px){.lg\:text-xs{font-size:.75rem;line-height:1rem}}
|
|
1
|
+
.tippy-box[data-animation=fade][data-state=hidden]{opacity:0}[data-tippy-root]{max-width:calc(100vw - 10px)}.tippy-box{background-color:#333;border-radius:4px;color:#fff;font-size:14px;line-height:1.4;outline:0;position:relative;transition-property:transform,visibility,opacity;white-space:normal}.tippy-box[data-placement^=top]>.tippy-arrow{bottom:0}.tippy-box[data-placement^=top]>.tippy-arrow:before{border-top-color:initial;border-width:8px 8px 0;bottom:-7px;left:0;transform-origin:center top}.tippy-box[data-placement^=bottom]>.tippy-arrow{top:0}.tippy-box[data-placement^=bottom]>.tippy-arrow:before{border-bottom-color:initial;border-width:0 8px 8px;left:0;top:-7px;transform-origin:center bottom}.tippy-box[data-placement^=left]>.tippy-arrow{right:0}.tippy-box[data-placement^=left]>.tippy-arrow:before{border-left-color:initial;border-width:8px 0 8px 8px;right:-7px;transform-origin:center left}.tippy-box[data-placement^=right]>.tippy-arrow{left:0}.tippy-box[data-placement^=right]>.tippy-arrow:before{border-right-color:initial;border-width:8px 8px 8px 0;left:-7px;transform-origin:center right}.tippy-box[data-inertia][data-state=visible]{transition-timing-function:cubic-bezier(.54,1.5,.38,1.11)}.tippy-arrow{color:#333;height:16px;width:16px}.tippy-arrow:before{border-color:transparent;border-style:solid;content:"";position:absolute}.tippy-content{padding:5px 9px;position:relative;z-index:1}.container{width:100%}@media (min-width:640px){.container{max-width:640px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:1024px){.container{max-width:1024px}}@media (min-width:1280px){.container{max-width:1280px}}@media (min-width:1536px){.container{max-width:1536px}}/*! tailwindcss v2.2.19 | MIT License | https://tailwindcss.com *//*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */html{-webkit-text-size-adjust:100%;line-height:1.15;-moz-tab-size:4;tab-size:4}body{font-family:system-ui,-apple-system,Segoe UI,Roboto,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji;margin:0}hr{color:inherit;height:0}abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Consolas,Liberation Mono,Menlo,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}::-moz-focus-inner{border-style:none;padding:0}:-moz-focusring{outline:1px dotted ButtonText}:-moz-ui-invalid{box-shadow:none}legend{padding:0}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}button{background-color:transparent;background-image:none}fieldset,ol,ul{margin:0;padding:0}ol,ul{list-style:none}html{font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;line-height:1.5}body{font-family:inherit;line-height:inherit}*,:after,:before{border:0 solid;box-sizing:border-box}hr{border-top-width:1px}img{border-style:solid}textarea{resize:vertical}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:-moz-focusring{outline:auto}table{border-collapse:collapse}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}button,input,optgroup,select,textarea{color:inherit;line-height:inherit;padding:0}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]{display:none}*,:after,:before{--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-transform:translateX(var(--tw-translate-x)) translateY(var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));--tw-border-opacity:1;--tw-ring-inset:var(--tw-empty,/*!*/ /*!*/);--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-blur:var(--tw-empty,/*!*/ /*!*/);--tw-brightness:var(--tw-empty,/*!*/ /*!*/);--tw-contrast:var(--tw-empty,/*!*/ /*!*/);--tw-grayscale:var(--tw-empty,/*!*/ /*!*/);--tw-hue-rotate:var(--tw-empty,/*!*/ /*!*/);--tw-invert:var(--tw-empty,/*!*/ /*!*/);--tw-saturate:var(--tw-empty,/*!*/ /*!*/);--tw-sepia:var(--tw-empty,/*!*/ /*!*/);--tw-drop-shadow:var(--tw-empty,/*!*/ /*!*/);--tw-filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);border-color:rgba(229,231,235,var(--tw-border-opacity))}.visible{visibility:visible}.static{position:static}.fixed{position:fixed}.absolute{position:absolute}.relative{position:relative}.inset-y-0{bottom:0;top:0}.bottom-4{bottom:1rem}.right-4{right:1rem}.top-1\/2{top:50%}.left-1\/2{left:50%}.right-2{right:.5rem}.right-0{right:0}.top-1{top:.25rem}.right-1{right:.25rem}.z-50{z-index:50}.mx-4{margin-left:1rem;margin-right:1rem}.my-5{margin-bottom:1.25rem;margin-top:1.25rem}.ml-4{margin-left:1rem}.mt-3{margin-top:.75rem}.mr-2{margin-right:.5rem}.mt-8{margin-top:2rem}.mr-4{margin-right:1rem}.-mt-3{margin-top:-.75rem}.-ml-3{margin-left:-.75rem}.-ml-1{margin-left:-.25rem}.ml-3{margin-left:.75rem}.mt-4{margin-top:1rem}.mt-10{margin-top:2.5rem}.-mt-1{margin-top:-.25rem}.mr-1{margin-right:.25rem}.mt-2{margin-top:.5rem}.block{display:block}.inline-block{display:inline-block}.inline{display:inline}.flex{display:flex}.inline-flex{display:inline-flex}.hidden{display:none}.h-full{height:100%}.h-10{height:2.5rem}.h-4{height:1rem}.h-6{height:1.5rem}.h-16{height:4rem}.h-5{height:1.25rem}.w-72{width:18rem}.w-auto{width:auto}.w-4{width:1rem}.w-6{width:1.5rem}.w-16{width:4rem}.w-full{width:100%}.w-5{width:1.25rem}.flex-1{flex:1 1 0%}.flex-grow{flex-grow:1}.translate-x-32{--tw-translate-x:8rem}.transform,.translate-x-32{transform:var(--tw-transform)}.cursor-pointer{cursor:pointer}.cursor-default{cursor:default}.cursor-text{cursor:text}.select-none{-webkit-user-select:none;user-select:none}.resize{resize:both}.flex-col{flex-direction:column}.items-start{align-items:flex-start}.items-center{align-items:center}.justify-start{justify-content:flex-start}.justify-items-center{justify-items:center}.gap-4{gap:1rem}.overflow-hidden{overflow:hidden}.overflow-scroll{overflow:scroll}.truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.rounded-full{border-radius:9999px}.rounded-md{border-radius:.375rem}.rounded{border-radius:.25rem}.rounded-none{border-radius:0}.rounded-l-md{border-bottom-left-radius:.375rem;border-top-left-radius:.375rem}.rounded-r-md{border-bottom-right-radius:.375rem;border-top-right-radius:.375rem}.border{border-width:1px}.border-t{border-top-width:1px}.border-b{border-bottom-width:1px}.border-r-0{border-right-width:0}.border-solid{border-style:solid}.border-gray-200{--tw-border-opacity:1;border-color:rgba(229,231,235,var(--tw-border-opacity))}.border-gray-300{--tw-border-opacity:1;border-color:rgba(209,213,219,var(--tw-border-opacity))}.border-red-300{--tw-border-opacity:1;border-color:rgba(252,165,165,var(--tw-border-opacity))}.border-gray-50{--tw-border-opacity:1;border-color:rgba(249,250,251,var(--tw-border-opacity))}.bg-blue-nx-base{background-color:#143157}.bg-gray-50{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity))}.bg-green-nx-base{background-color:#44bb97}.bg-white{--tw-bg-opacity:1;background-color:rgba(255,255,255,var(--tw-bg-opacity))}.p-4{padding:1rem}.p-1\.5{padding:.375rem}.p-1{padding:.25rem}.p-2{padding:.5rem}.px-4{padding-left:1rem;padding-right:1rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.py-1{padding-bottom:.25rem;padding-top:.25rem}.pb-10{padding-bottom:2.5rem}.pl-2{padding-left:.5rem}.pl-3{padding-left:.75rem}.pr-9{padding-right:2.25rem}.text-center{text-align:center}.font-mono{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.text-lg{font-size:1.125rem;line-height:1.75rem}.text-sm{font-size:.875rem;line-height:1.25rem}.font-medium{font-weight:500}.font-bold{font-weight:700}.font-normal{font-weight:400}.font-semibold{font-weight:600}.uppercase{text-transform:uppercase}.tracking-wide{letter-spacing:.025em}.text-white{--tw-text-opacity:1;color:rgba(255,255,255,var(--tw-text-opacity))}.text-gray-500{--tw-text-opacity:1;color:rgba(107,114,128,var(--tw-text-opacity))}.text-gray-700{--tw-text-opacity:1;color:rgba(55,65,81,var(--tw-text-opacity))}.text-red-500{--tw-text-opacity:1;color:rgba(239,68,68,var(--tw-text-opacity))}.text-gray-50{--tw-text-opacity:1;color:rgba(249,250,251,var(--tw-text-opacity))}.text-gray-600{--tw-text-opacity:1;color:rgba(75,85,99,var(--tw-text-opacity))}.text-green-nx-base{color:#44bb97}.text-gray-900{--tw-text-opacity:1;color:rgba(17,24,39,var(--tw-text-opacity))}.opacity-0{opacity:0}.shadow-lg{--tw-shadow:0 10px 15px -3px rgba(0,0,0,.1),0 4px 6px -2px rgba(0,0,0,.05)}.shadow-lg,.shadow-sm{box-shadow:var(--tw-ring-offset-shadow,0 0 #0000),var(--tw-ring-shadow,0 0 #0000),var(--tw-shadow)}.shadow-sm{--tw-shadow:0 1px 2px 0 rgba(0,0,0,.05)}.ring-1{--tw-ring-offset-shadow:var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);--tw-ring-shadow:var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);box-shadow:var(--tw-ring-offset-shadow),var(--tw-ring-shadow),var(--tw-shadow,0 0 #0000)}.ring-gray-400{--tw-ring-opacity:1;--tw-ring-color:rgba(156,163,175,var(--tw-ring-opacity))}.ring-gray-500{--tw-ring-opacity:1;--tw-ring-color:rgba(107,114,128,var(--tw-ring-opacity))}.ring-gray-200{--tw-ring-opacity:1;--tw-ring-color:rgba(229,231,235,var(--tw-ring-opacity))}.ring-opacity-10{--tw-ring-opacity:0.1}.filter{filter:var(--tw-filter)}.transition{transition-duration:.15s;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,-webkit-backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter;transition-property:background-color,border-color,color,fill,stroke,opacity,box-shadow,transform,filter,backdrop-filter,-webkit-backdrop-filter;transition-timing-function:cubic-bezier(.4,0,.2,1)}.transition-all{transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-300{transition-duration:.3s}.duration-200{transition-duration:.2s}.ease-out{transition-timing-function:cubic-bezier(0,0,.2,1)}.ease-in-out{transition-timing-function:cubic-bezier(.4,0,.2,1)}#app,body,html{height:100%;margin:0;overflow:hidden;padding:0;width:100%}#app{display:flex}.tippy-box[data-theme~=nx]{background-color:#fff;border:1px solid #d1d5db;border-radius:.375rem;box-shadow:0 1px 2px 0 rgba(0,0,0,.05);box-sizing:border-box;color:#384252;min-width:250px;padding:.375rem}.tippy-box[data-theme~=nx] .tippy-content{padding:.375rem}.tippy-box[data-theme~=nx][data-placement^=top]{margin-bottom:1rem}.tippy-box[data-theme~=nx][data-placement^=top]>.tippy-arrow:before{border-top-color:#d1d5db}.tippy-box[data-theme~=nx][data-placement^=bottom]>.tippy-arrow:before{border-bottom-color:#d1d5db}.tippy-box[data-theme~=nx][data-placement^=left]>.tippy-arrow:before{border-left-color:#d1d5db}.tippy-box[data-theme~=nx][data-placement^=right]>.tippy-arrow:before{border-right-color:#d1d5db}.tag{background-color:#143157;border-radius:.375rem;color:#fff;display:inline-block;font-family:system-ui;font-size:.75rem;font-weight:600;letter-spacing:.025em;line-height:1rem;margin-bottom:.75rem;margin-right:.75rem;padding:.5rem;text-transform:uppercase}.tippy-box[data-theme~=nx] h4{font-family:monospace}.tippy-box[data-theme~=nx] p{margin:.375rem}.tippy-box[data-theme~=nx] button{background-color:#f9fafb;border-color:#d1d5db;border-radius:.375rem;border-width:1px;color:#6b7280;margin:.375rem;padding:.5rem 1rem}.tippy-box[data-theme~=nx] button:hover{background-color:#f3f4f6}#no-projects-chosen{align-items:center;display:flex;justify-content:center}#cytoscape-graph,#graph-container,#no-projects-chosen{height:100%;width:100%}canvas{cursor:pointer}.hover\:bg-gray-50:hover{--tw-bg-opacity:1;background-color:rgba(249,250,251,var(--tw-bg-opacity))}.hover\:bg-red-50:hover{--tw-bg-opacity:1;background-color:rgba(254,242,242,var(--tw-bg-opacity))}.hover\:bg-gray-100:hover{--tw-bg-opacity:1;background-color:rgba(243,244,246,var(--tw-bg-opacity))}.hover\:underline:hover{text-decoration:underline}.group:hover .group-hover\:translate-x-0{--tw-translate-x:0px;transform:var(--tw-transform)}.group:hover .group-hover\:opacity-60{opacity:.6}@media (min-width:1024px){.lg\:text-xs{font-size:.75rem;line-height:1rem}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/logger.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAEH,MAAM,YAAY;IAChB,GAAG,CAAC,GAAG,CAAY;QACjB,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,gBAAgB,CACnB,GAAG,CAAC;aACD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC3B,OAAO,GAAG,CAAC;aACZ;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE,CACf,CACF,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,GAAG,CAAY;QACxB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,GAAG,CAAY;QACxB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/logger.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAEH,MAAM,YAAY;IAChB,GAAG,CAAC,GAAG,CAAY;QACjB,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,gBAAgB,CACnB,GAAG,CAAC;aACD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC3B,OAAO,GAAG,CAAC;aACZ;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE,CACf,CACF,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,GAAG,CAAY;QACxB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,GAAG,CAAY;QACxB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAEO,gBAAgB,CAAC,OAAe;QACtC,OAAO,wBAAwB,IAAI,CAAC,MAAM,EAAE,MAAM,OAAO,EAAE,CAAC;IAC9D,CAAC;IAEO,MAAM;QACZ,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5C,CAAC;CACF;AAEY,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
export declare function getCachedSerializedProjectGraphPromise(): Promise<{
|
|
2
2
|
error: Error;
|
|
3
3
|
serializedProjectGraph: string;
|
|
4
|
+
} | {
|
|
5
|
+
error: any;
|
|
6
|
+
serializedProjectGraph: any;
|
|
4
7
|
}>;
|
|
5
8
|
export declare function addUpdatedAndDeletedFiles(updatedFiles: string[], deletedFiles: string[]): void;
|
|
6
9
|
export declare function resetInternalState(): void;
|
|
@@ -21,25 +21,32 @@ const collectedDeletedFiles = new Set();
|
|
|
21
21
|
let waitPeriod = 100;
|
|
22
22
|
let scheduledTimeoutId;
|
|
23
23
|
function getCachedSerializedProjectGraphPromise() {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
24
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
25
|
+
try {
|
|
26
|
+
// recomputing it now on demand. we can ignore the scheduled timeout
|
|
27
|
+
if (scheduledTimeoutId) {
|
|
28
|
+
clearTimeout(scheduledTimeoutId);
|
|
29
|
+
scheduledTimeoutId = undefined;
|
|
30
|
+
}
|
|
31
|
+
// reset the wait time
|
|
32
|
+
waitPeriod = 100;
|
|
33
|
+
resetInternalStateIfNxDepsMissing();
|
|
34
|
+
if (collectedUpdatedFiles.size == 0 && collectedDeletedFiles.size == 0) {
|
|
35
|
+
if (!cachedSerializedProjectGraphPromise) {
|
|
36
|
+
processCollectedUpdatedAndDeletedFiles(); // this creates a project graph
|
|
37
|
+
cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph();
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
processCollectedUpdatedAndDeletedFiles();
|
|
42
|
+
cachedSerializedProjectGraphPromise = createAndSerializeProjectGraph();
|
|
43
|
+
}
|
|
44
|
+
return yield cachedSerializedProjectGraphPromise;
|
|
36
45
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
}
|
|
42
|
-
return cachedSerializedProjectGraphPromise;
|
|
46
|
+
catch (e) {
|
|
47
|
+
return { error: e, serializedProjectGraph: null };
|
|
48
|
+
}
|
|
49
|
+
});
|
|
43
50
|
}
|
|
44
51
|
exports.getCachedSerializedProjectGraphPromise = getCachedSerializedProjectGraphPromise;
|
|
45
52
|
function addUpdatedAndDeletedFiles(updatedFiles, deletedFiles) {
|
|
@@ -71,7 +78,7 @@ function processCollectedUpdatedAndDeletedFiles() {
|
|
|
71
78
|
perf_hooks_1.performance.measure('hash changed files from watcher', 'hash-watched-changes-start', 'hash-watched-changes-end');
|
|
72
79
|
file_hasher_1.defaultFileHasher.incrementalUpdate(updatedFiles, deletedFiles);
|
|
73
80
|
const workspaceJson = (0, file_utils_1.readWorkspaceJson)();
|
|
74
|
-
logger_1.serverLogger.
|
|
81
|
+
logger_1.serverLogger.requestLog(`Updated file-hasher based on watched changes, recomputing project graph...`);
|
|
75
82
|
// when workspace.json changes we cannot be sure about the correctness of the project file map
|
|
76
83
|
if (collectedUpdatedFiles.has(configName) ||
|
|
77
84
|
collectedDeletedFiles.has(configName)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph-incremental-recomputation.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":";;;;AACA,2DAA2D;AAC3D,2CAAyC;AACzC,oDAI6B;AAC7B,6DAAgE;AAChE,2DAAgE;AAChE,qCAAwC;AACxC,mEAAiF;AACjF,8DAAqE;AACrE,kEAIwC;AACxC,+DAA6D;AAE7D,MAAM,UAAU,GAAG,IAAA,+BAAmB,EAAC,sBAAW,CAAC,CAAC;AACpD,IAAI,mCAGF,CAAC;AACH,IAAI,uBAES,CAAC;AACd,IAAI,wBAAuD,CAAC;AAE5D,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;AAChD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;AAChD,IAAI,UAAU,GAAG,GAAG,CAAC;AACrB,IAAI,kBAAkB,CAAC;AAEvB,
|
|
1
|
+
{"version":3,"file":"project-graph-incremental-recomputation.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,44 +14,60 @@ const watcher_1 = require("./watcher");
|
|
|
14
14
|
const project_graph_incremental_recomputation_1 = require("./project-graph-incremental-recomputation");
|
|
15
15
|
const fs_1 = require("fs");
|
|
16
16
|
function respondToClient(socket, message) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
return new Promise((res) => {
|
|
18
|
+
socket.write(message, () => {
|
|
19
|
+
// Close the connection once all data has been written so that the client knows when to read it.
|
|
20
|
+
socket.end();
|
|
21
|
+
logger_1.serverLogger.log(`Closed Connection to Client`);
|
|
22
|
+
res(null);
|
|
23
|
+
});
|
|
21
24
|
});
|
|
22
25
|
}
|
|
23
26
|
let watcherSubscription;
|
|
24
27
|
let performanceObserver;
|
|
25
|
-
|
|
28
|
+
let watcherError;
|
|
29
|
+
function respondWithErrorAndExit(socket, description, error) {
|
|
30
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
31
|
+
// print some extra stuff in the error message
|
|
32
|
+
logger_1.serverLogger.requestLog(`Responding to the client with an error`, description, error.message);
|
|
33
|
+
console.error(error);
|
|
34
|
+
error.message = (0, devkit_1.stripIndents) `
|
|
35
|
+
${error.message}
|
|
36
|
+
${description}
|
|
37
|
+
Because of the error the Nx daemon process has exited. The next Nx command is going to restart the daemon process.
|
|
38
|
+
If the error persists, please run "nx reset".
|
|
39
|
+
`;
|
|
40
|
+
yield respondToClient(socket, (0, socket_utils_1.serializeResult)(error, null));
|
|
41
|
+
process.exit(1);
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
const server = (0, net_1.createServer)((socket) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
26
45
|
(0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
|
|
27
46
|
if (!performanceObserver) {
|
|
28
47
|
performanceObserver = new perf_hooks_1.PerformanceObserver((list) => {
|
|
29
48
|
const entry = list.getEntries()[0];
|
|
30
|
-
logger_1.serverLogger.
|
|
49
|
+
logger_1.serverLogger.log(`Time taken for '${entry.name}'`, `${entry.duration}ms`);
|
|
31
50
|
});
|
|
32
51
|
performanceObserver.observe({ entryTypes: ['measure'], buffered: false });
|
|
33
52
|
}
|
|
34
53
|
socket.on('data', (data) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
54
|
+
if (watcherError) {
|
|
55
|
+
yield respondWithErrorAndExit(socket, `File watcher error.`, watcherError);
|
|
56
|
+
}
|
|
35
57
|
(0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
|
|
36
58
|
const payload = data.toString();
|
|
37
59
|
if (payload !== 'REQUEST_PROJECT_GRAPH_PAYLOAD') {
|
|
38
|
-
|
|
60
|
+
yield respondWithErrorAndExit(socket, null, new Error(`Unsupported payload sent to daemon server: ${payload}`));
|
|
39
61
|
}
|
|
40
62
|
perf_hooks_1.performance.mark('server-connection');
|
|
41
63
|
logger_1.serverLogger.requestLog('Client Request for Project Graph Received');
|
|
42
64
|
const result = yield (0, project_graph_incremental_recomputation_1.getCachedSerializedProjectGraphPromise)();
|
|
43
65
|
if (result.error) {
|
|
44
|
-
(
|
|
45
|
-
logger_1.serverLogger.nestedLog(`Error when preparing serialized project graph: ${result.error.message}`);
|
|
46
|
-
respondToClient(socket, (0, socket_utils_1.serializeResult)(result.error, result.serializedProjectGraph));
|
|
47
|
-
return;
|
|
66
|
+
yield respondWithErrorAndExit(socket, `Error when preparing serialized project graph.`, result.error);
|
|
48
67
|
}
|
|
49
68
|
const serializedResult = (0, socket_utils_1.serializeResult)(result.error, result.serializedProjectGraph);
|
|
50
69
|
if (!serializedResult) {
|
|
51
|
-
(
|
|
52
|
-
logger_1.serverLogger.nestedLog(`Error when serializing project graph result`);
|
|
53
|
-
respondToClient(socket, (0, socket_utils_1.serializeResult)(new Error('Critical error when serializing server result, check server logs'), null));
|
|
54
|
-
return;
|
|
70
|
+
yield respondWithErrorAndExit(socket, `Error when serializing project graph result.`, new Error('Critical error when serializing server result, check server logs'));
|
|
55
71
|
}
|
|
56
72
|
perf_hooks_1.performance.mark('serialized-project-graph-ready');
|
|
57
73
|
perf_hooks_1.performance.measure('total for creating and serializing project graph', 'server-connection', 'serialized-project-graph-ready');
|
|
@@ -62,10 +78,10 @@ const server = (0, net_1.createServer)((socket) => {
|
|
|
62
78
|
socket.end();
|
|
63
79
|
perf_hooks_1.performance.measure('total for server response', 'server-connection', 'serialized-project-graph-written-to-client');
|
|
64
80
|
const bytesWritten = Buffer.byteLength(result.serializedProjectGraph, 'utf-8');
|
|
65
|
-
logger_1.serverLogger.
|
|
81
|
+
logger_1.serverLogger.requestLog(`Closed Connection to Client (${bytesWritten} bytes transferred)`);
|
|
66
82
|
});
|
|
67
83
|
}));
|
|
68
|
-
});
|
|
84
|
+
}));
|
|
69
85
|
function handleInactivityTimeout() {
|
|
70
86
|
(0, shutdown_utils_1.handleServerProcessTermination)({
|
|
71
87
|
server,
|
|
@@ -103,8 +119,8 @@ function resolveCurrentNxVersion() {
|
|
|
103
119
|
const { version } = requireUncached(nrwlWorkspacePackageJsonPath);
|
|
104
120
|
return version;
|
|
105
121
|
}
|
|
106
|
-
catch (
|
|
107
|
-
logger_1.serverLogger.
|
|
122
|
+
catch (err) {
|
|
123
|
+
logger_1.serverLogger.log(`Error: Could not determine the current Nx version by inspecting: ${nrwlWorkspacePackageJsonPath}`);
|
|
108
124
|
return null;
|
|
109
125
|
}
|
|
110
126
|
}
|
|
@@ -121,22 +137,27 @@ function isNxVersionSame(currentNxVersion) {
|
|
|
121
137
|
* available for the next client request to the server.
|
|
122
138
|
*/
|
|
123
139
|
const handleWorkspaceChanges = (err, changeEvents) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
yield (0, shutdown_utils_1.handleServerProcessTermination)({
|
|
127
|
-
server,
|
|
128
|
-
watcherSubscription,
|
|
129
|
-
reason: '@nrwl/workspace installation changed',
|
|
130
|
-
});
|
|
131
|
-
return;
|
|
132
|
-
}
|
|
133
|
-
if (err || !changeEvents || !changeEvents.length) {
|
|
134
|
-
logger_1.serverLogger.watcherLog('Unexpected Error');
|
|
135
|
-
console.error(err);
|
|
140
|
+
if (watcherError) {
|
|
141
|
+
logger_1.serverLogger.watcherLog('Skipping handleWorkspaceChanges because of a previously recorded watcher error.');
|
|
136
142
|
return;
|
|
137
143
|
}
|
|
138
|
-
logger_1.serverLogger.watcherLog((0, watcher_1.convertChangeEventsToLogMessage)(changeEvents));
|
|
139
144
|
try {
|
|
145
|
+
(0, shutdown_utils_1.resetInactivityTimeout)(handleInactivityTimeout);
|
|
146
|
+
if (!isNxVersionSame(resolveCurrentNxVersion())) {
|
|
147
|
+
yield (0, shutdown_utils_1.handleServerProcessTermination)({
|
|
148
|
+
server,
|
|
149
|
+
watcherSubscription,
|
|
150
|
+
reason: '@nrwl/workspace installation changed',
|
|
151
|
+
});
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
if (err || !changeEvents || !changeEvents.length) {
|
|
155
|
+
logger_1.serverLogger.watcherLog('Unexpected watcher error', err.message);
|
|
156
|
+
console.error(err);
|
|
157
|
+
watcherError = err;
|
|
158
|
+
return;
|
|
159
|
+
}
|
|
160
|
+
logger_1.serverLogger.watcherLog((0, watcher_1.convertChangeEventsToLogMessage)(changeEvents));
|
|
140
161
|
const filesToHash = [];
|
|
141
162
|
const deletedFiles = [];
|
|
142
163
|
for (const event of changeEvents) {
|
|
@@ -158,8 +179,9 @@ const handleWorkspaceChanges = (err, changeEvents) => (0, tslib_1.__awaiter)(voi
|
|
|
158
179
|
(0, project_graph_incremental_recomputation_1.addUpdatedAndDeletedFiles)(filesToHash, deletedFiles);
|
|
159
180
|
}
|
|
160
181
|
catch (err) {
|
|
161
|
-
logger_1.serverLogger.
|
|
182
|
+
logger_1.serverLogger.watcherLog(`Unexpected error`, err.message);
|
|
162
183
|
console.error(err);
|
|
184
|
+
watcherError = err;
|
|
163
185
|
}
|
|
164
186
|
});
|
|
165
187
|
function startServer() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,17 @@ const logger_1 = require("./logger");
|
|
|
7
7
|
exports.SERVER_INACTIVITY_TIMEOUT_MS = 10800000; // 10800000 ms = 3 hours
|
|
8
8
|
function handleServerProcessTermination({ server, reason, watcherSubscription, }) {
|
|
9
9
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
try {
|
|
11
|
+
server.close();
|
|
12
|
+
if (watcherSubscription) {
|
|
13
|
+
yield watcherSubscription.unsubscribe();
|
|
14
|
+
logger_1.serverLogger.watcherLog(`Unsubscribed from changes within: ${app_root_1.appRootPath}`);
|
|
15
|
+
}
|
|
16
|
+
logger_1.serverLogger.log(`Server stopped because: "${reason}"`);
|
|
17
|
+
}
|
|
18
|
+
finally {
|
|
19
|
+
process.exit(0);
|
|
14
20
|
}
|
|
15
|
-
logger_1.serverLogger.log(`Server stopped because: "${reason}"`);
|
|
16
|
-
process.exit(0);
|
|
17
21
|
});
|
|
18
22
|
}
|
|
19
23
|
exports.handleServerProcessTermination = handleServerProcessTermination;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shutdown-utils.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/shutdown-utils.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAE3D,qCAAwC;AAG3B,QAAA,4BAA4B,GAAG,QAAiB,CAAC,CAAC,wBAAwB;AAavF,SAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,mBAAmB,GACkB;;QACrC,MAAM,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"shutdown-utils.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/shutdown-utils.ts"],"names":[],"mappings":";;;;AAAA,2DAA2D;AAE3D,qCAAwC;AAG3B,QAAA,4BAA4B,GAAG,QAAiB,CAAC,CAAC,wBAAwB;AAavF,SAAsB,8BAA8B,CAAC,EACnD,MAAM,EACN,MAAM,EACN,mBAAmB,GACkB;;QACrC,IAAI;YACF,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,IAAI,mBAAmB,EAAE;gBACvB,MAAM,mBAAmB,CAAC,WAAW,EAAE,CAAC;gBACxC,qBAAY,CAAC,UAAU,CACrB,qCAAqC,sBAAW,EAAE,CACnD,CAAC;aACH;YACD,qBAAY,CAAC,GAAG,CAAC,4BAA4B,MAAM,GAAG,CAAC,CAAC;SACzD;gBAAS;YACR,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAjBD,wEAiBC;AAED,IAAI,uBAAmD,CAAC;AAExD,SAAgB,sBAAsB,CAAC,EAAc;IACnD,IAAI,uBAAuB,EAAE;QAC3B,YAAY,CAAC,uBAAuB,CAAC,CAAC;KACvC;IACD,uBAAuB,GAAG,UAAU,CAAC,EAAE,EAAE,oCAA4B,CAAC,CAAC;AACzE,CAAC;AALD,wDAKC"}
|
|
@@ -22,10 +22,13 @@ function npmPackageGenerator(tree, options) {
|
|
|
22
22
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
23
23
|
options = normalizeOptions(options);
|
|
24
24
|
const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
25
|
+
const workspaceFile = (0, devkit_1.getWorkspacePath)(tree);
|
|
25
26
|
const projectRoot = (0, path_1.join)(libsDir, options.name);
|
|
26
|
-
(
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
if (!!workspaceFile) {
|
|
28
|
+
(0, devkit_1.addProjectConfiguration)(tree, options.name, {
|
|
29
|
+
root: projectRoot,
|
|
30
|
+
});
|
|
31
|
+
}
|
|
29
32
|
const fileCount = tree.children(projectRoot).length;
|
|
30
33
|
const projectJsonExists = tree.exists((0, path_1.join)(projectRoot, 'project.json'));
|
|
31
34
|
const isEmpty = fileCount === 0 || (fileCount === 1 && projectJsonExists);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,yCAWsB;AACtB,+BAA4B;AAM5B,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,QAAQ,CACf,WAAmB,EACnB,IAAU,EACV,QAAgB,EAChB,OAAuB;IAEvB,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE;QAC/B,IAAI,EAAE,IAAA,WAAI,EAAC,IAAI,QAAQ,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC;QACxC,OAAO,EAAE;YACP,IAAI,EAAE,eAAe;SACtB;KACF,CAAC,CAAC;IAEH,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAuB;;QAC3E,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAI,CAAC,CAAC,aAAa,EAAE;YACnB,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;gBAC1C,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;SACJ;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAE1E,IAAI,OAAO,EAAE;YACX,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAtBD,kDAsBC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as Lint from 'tslint';
|
|
2
2
|
import { IOptions } from 'tslint';
|
|
3
3
|
import * as ts from 'typescript';
|
|
4
|
+
import type { NxJsonConfiguration } from '@nrwl/devkit';
|
|
4
5
|
import { MappedProjectGraph } from '../utils/runtime-lint-utils';
|
|
5
6
|
import { TargetProjectLocator } from '../core/target-project-locator';
|
|
6
7
|
export declare class Rule extends Lint.Rules.AbstractRule {
|
|
@@ -8,6 +9,7 @@ export declare class Rule extends Lint.Rules.AbstractRule {
|
|
|
8
9
|
private readonly npmScope?;
|
|
9
10
|
private readonly projectGraph?;
|
|
10
11
|
private readonly targetProjectLocator?;
|
|
11
|
-
|
|
12
|
+
private readonly workspaceLayout?;
|
|
13
|
+
constructor(options: IOptions, projectPath?: string, npmScope?: string, projectGraph?: MappedProjectGraph, targetProjectLocator?: TargetProjectLocator, workspaceLayout?: NxJsonConfiguration['workspaceLayout']);
|
|
12
14
|
apply(sourceFile: ts.SourceFile): Lint.RuleFailure[];
|
|
13
15
|
}
|
|
@@ -11,17 +11,19 @@ const target_project_locator_1 = require("../core/target-project-locator");
|
|
|
11
11
|
const graph_utils_1 = require("../utils/graph-utils");
|
|
12
12
|
const fileutils_1 = require("../utilities/fileutils");
|
|
13
13
|
class Rule extends Lint.Rules.AbstractRule {
|
|
14
|
-
constructor(options, projectPath, npmScope, projectGraph, targetProjectLocator) {
|
|
14
|
+
constructor(options, projectPath, npmScope, projectGraph, targetProjectLocator, workspaceLayout) {
|
|
15
15
|
super(options);
|
|
16
16
|
this.projectPath = projectPath;
|
|
17
17
|
this.npmScope = npmScope;
|
|
18
18
|
this.projectGraph = projectGraph;
|
|
19
19
|
this.targetProjectLocator = targetProjectLocator;
|
|
20
|
+
this.workspaceLayout = workspaceLayout;
|
|
20
21
|
if (!projectPath) {
|
|
21
22
|
this.projectPath = (0, path_1.normalize)(app_root_1.appRootPath);
|
|
22
23
|
if (!global.projectGraph) {
|
|
23
24
|
const nxJson = (0, file_utils_1.readNxJson)();
|
|
24
25
|
global.npmScope = nxJson.npmScope;
|
|
26
|
+
global.workspaceLayout = nxJson.workspaceLayout;
|
|
25
27
|
/**
|
|
26
28
|
* Because there are a number of ways in which the rule can be invoked (executor vs TSLint CLI vs IDE Plugin),
|
|
27
29
|
* the ProjectGraph may or may not exist by the time the lint rule is invoked for the first time.
|
|
@@ -32,6 +34,7 @@ class Rule extends Lint.Rules.AbstractRule {
|
|
|
32
34
|
catch (_a) { }
|
|
33
35
|
}
|
|
34
36
|
this.npmScope = global.npmScope;
|
|
37
|
+
this.workspaceLayout = global.workspaceLayout;
|
|
35
38
|
this.projectGraph = global.projectGraph;
|
|
36
39
|
if (!global.targetProjectLocator && this.projectGraph) {
|
|
37
40
|
global.targetProjectLocator = new target_project_locator_1.TargetProjectLocator(this.projectGraph.nodes, this.projectGraph.externalNodes);
|
|
@@ -42,17 +45,18 @@ class Rule extends Lint.Rules.AbstractRule {
|
|
|
42
45
|
apply(sourceFile) {
|
|
43
46
|
if (!this.projectGraph)
|
|
44
47
|
return [];
|
|
45
|
-
return this.applyWithWalker(new EnforceModuleBoundariesWalker(sourceFile, this.getOptions(), this.projectPath, this.npmScope, this.projectGraph, this.targetProjectLocator));
|
|
48
|
+
return this.applyWithWalker(new EnforceModuleBoundariesWalker(sourceFile, this.getOptions(), this.projectPath, this.npmScope, this.projectGraph, this.targetProjectLocator, this.workspaceLayout));
|
|
46
49
|
}
|
|
47
50
|
}
|
|
48
51
|
exports.Rule = Rule;
|
|
49
52
|
class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
50
|
-
constructor(sourceFile, options, projectPath, npmScope, projectGraph, targetProjectLocator) {
|
|
53
|
+
constructor(sourceFile, options, projectPath, npmScope, projectGraph, targetProjectLocator, workspaceLayout) {
|
|
51
54
|
super(sourceFile, options);
|
|
52
55
|
this.projectPath = projectPath;
|
|
53
56
|
this.npmScope = npmScope;
|
|
54
57
|
this.projectGraph = projectGraph;
|
|
55
58
|
this.targetProjectLocator = targetProjectLocator;
|
|
59
|
+
this.workspaceLayout = workspaceLayout;
|
|
56
60
|
this.enforceBuildableLibDependency = false; // for backwards compat
|
|
57
61
|
this.allowCircularSelfDependency = false;
|
|
58
62
|
this.allow = Array.isArray(this.getOptions()[0].allow)
|
|
@@ -79,7 +83,7 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
|
79
83
|
const sourceProject = (0, runtime_lint_utils_1.findSourceProject)(this.projectGraph, filePath);
|
|
80
84
|
// check for relative and absolute imports
|
|
81
85
|
if ((0, runtime_lint_utils_1.isRelativeImportIntoAnotherProject)(imp, this.projectPath, this.projectGraph, filePath, sourceProject) ||
|
|
82
|
-
(0, runtime_lint_utils_1.isAbsoluteImportIntoAnotherProject)(imp)) {
|
|
86
|
+
(0, runtime_lint_utils_1.isAbsoluteImportIntoAnotherProject)(imp, this.workspaceLayout)) {
|
|
83
87
|
this.addFailureAt(node.getStart(), node.getWidth(), `libraries cannot be imported by a relative or absolute path, and must begin with a npm scope`);
|
|
84
88
|
return;
|
|
85
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAI/B,
|
|
1
|
+
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
|
19
19
|
return (0, schematics_1.noop)();
|
|
20
20
|
}
|
|
21
21
|
return (host, context) => {
|
|
22
|
-
updateWorkspaceJsonToMatchFormatVersion(host
|
|
22
|
+
updateWorkspaceJsonToMatchFormatVersion(host);
|
|
23
23
|
if (!prettier) {
|
|
24
24
|
return host;
|
|
25
25
|
}
|
|
@@ -55,18 +55,14 @@ function formatFiles(options = { skipFormat: false }, directory = '') {
|
|
|
55
55
|
};
|
|
56
56
|
}
|
|
57
57
|
exports.formatFiles = formatFiles;
|
|
58
|
-
function updateWorkspaceJsonToMatchFormatVersion(host
|
|
59
|
-
const
|
|
60
|
-
`${directory}/workspace.json`,
|
|
61
|
-
`${directory}/angular.json`,
|
|
62
|
-
];
|
|
63
|
-
const path = possibleFiles.filter((path) => host.exists(path))[0];
|
|
58
|
+
function updateWorkspaceJsonToMatchFormatVersion(host) {
|
|
59
|
+
const workspaceConfig = (0, workspace_1.workspaceConfigName)(app_root_1.appRootPath);
|
|
64
60
|
try {
|
|
65
|
-
if (
|
|
66
|
-
const workspaceJson = (0, devkit_1.parseJson)(host.read(
|
|
61
|
+
if (workspaceConfig) {
|
|
62
|
+
const workspaceJson = (0, devkit_1.parseJson)(host.read(workspaceConfig).toString());
|
|
67
63
|
const reformatted = (0, workspace_1.reformattedWorkspaceJsonOrNull)(workspaceJson);
|
|
68
64
|
if (reformatted) {
|
|
69
|
-
host.overwrite(
|
|
65
|
+
host.overwrite(workspaceConfig, (0, devkit_1.serializeJson)(reformatted));
|
|
70
66
|
}
|
|
71
67
|
}
|
|
72
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/format-files.ts"],"names":[],"mappings":";;;;AAAA,2DAOoC;AACpC,+BAA4B;AAC5B,8CAAuD;AACvD,6BAA6B;AAC7B,2DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"format-files.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/utils/rules/format-files.ts"],"names":[],"mappings":"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"}
|