@o3r/schematics 8.1.0-alpha.9 → 8.2.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/README.md +212 -0
- package/package.json +28 -26
- package/src/rule-factories/eslint-fix/index.js +2 -2
- package/src/rule-factories/eslint-fix/index.js.map +1 -1
- package/src/rule-factories/ng-add/index.d.ts +2 -2
- package/src/rule-factories/ng-add/index.d.ts.map +1 -1
- package/src/rule-factories/ng-add/index.js +18 -6
- package/src/rule-factories/ng-add/index.js.map +1 -1
- package/src/tasks/ng-add/index.d.ts +1 -1
- package/src/tasks/ng-add/index.d.ts.map +1 -1
- package/src/utility/loaders.d.ts +2 -1
- package/src/utility/loaders.d.ts.map +1 -1
- package/src/utility/loaders.js +12 -15
- package/src/utility/loaders.js.map +1 -1
- package/src/utility/matching-peers.d.ts +2 -1
- package/src/utility/matching-peers.d.ts.map +1 -1
- package/src/utility/matching-peers.js +3 -2
- package/src/utility/matching-peers.js.map +1 -1
- package/src/utility/modules.js +1 -1
- package/src/utility/modules.js.map +1 -1
package/README.md
ADDED
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
<h1 align="center">Otter Framework</h1>
|
|
2
|
+
<p align="center">
|
|
3
|
+
<img src="./.attachments/logo.png" alt="Super cute Otter!"/>
|
|
4
|
+
</p>
|
|
5
|
+
|
|
6
|
+
<br />
|
|
7
|
+
<br />
|
|
8
|
+
|
|
9
|
+
## Description
|
|
10
|
+
The **Otter** project is a highly modular framework whose goal is to provide a common platform to accelerate and facilitate the development on Angular web applications.
|
|
11
|
+
It is split into several units to cover different aspects of these applications (localization, testing, customization, etc.).
|
|
12
|
+
Also, to customize an application, metadata can be extracted from the application source code and injected into a CMS to manage dynamic configuration.
|
|
13
|
+
|
|
14
|
+
> **Note**: The full documentation is available [here](./docs/README.md).
|
|
15
|
+
|
|
16
|
+
## Built With
|
|
17
|
+
|
|
18
|
+
* [Angular](https://angular.io/)
|
|
19
|
+
* [Typescript](https://www.typescriptlang.org/)
|
|
20
|
+
* [RxJs](http://reactivex.io/rxjs/)
|
|
21
|
+
* [Redux](http://redux.js.org/)
|
|
22
|
+
* [Sass](http://sass-lang.com/)
|
|
23
|
+
* [Nx](https://nx.dev/)
|
|
24
|
+
|
|
25
|
+
## Get Started
|
|
26
|
+
|
|
27
|
+
A new application can be set up with these simple commands:
|
|
28
|
+
|
|
29
|
+
```shell
|
|
30
|
+
# Starting a new angular application
|
|
31
|
+
npm install -g @angular/cli
|
|
32
|
+
ng new my-app
|
|
33
|
+
|
|
34
|
+
# Add Otter framework
|
|
35
|
+
ng add @o3r/core
|
|
36
|
+
```
|
|
37
|
+
|
|
38
|
+
> **Note**: Please refer to [Otter Get Started](./docs/core/START_NEW_APPLICATION.md) and [Angular Get Started](https://angular.io/guide/setup-local#install-the-angular-cli) for complete documentation.
|
|
39
|
+
|
|
40
|
+
## Contributing
|
|
41
|
+
|
|
42
|
+
Please read the [Contributing](./CONTRIBUTING.md) file for details on our code of conduct and the process to submit pull requests.
|
|
43
|
+
|
|
44
|
+
## Versioning
|
|
45
|
+
|
|
46
|
+
Please refer to [Security file](./SECURITY.md).
|
|
47
|
+
|
|
48
|
+
## License
|
|
49
|
+
|
|
50
|
+
Please refer to the [License file](./LICENSE).
|
|
51
|
+
|
|
52
|
+
## Acknowledgments
|
|
53
|
+
|
|
54
|
+
The Otter Team, @AmadeusITGroup/otter_admins, is responsible for the review of the code of this repository.
|
|
55
|
+
Any bug of feature request can be addressed via [issue](https://github.com/AmadeusITGroup/otter/issues/new) report.
|
|
56
|
+
|
|
57
|
+
## Developer
|
|
58
|
+
|
|
59
|
+
### Building and Testing library
|
|
60
|
+
|
|
61
|
+
These documents describe how to set up your development environment to build and test the framework.
|
|
62
|
+
It also explains the basic mechanics of using `git`, `node`, and `npm`.
|
|
63
|
+
|
|
64
|
+
- [Description](#description)
|
|
65
|
+
- [Built With](#built-with)
|
|
66
|
+
- [Get Started](#get-started)
|
|
67
|
+
- [Contributing](#contributing)
|
|
68
|
+
- [Versioning](#versioning)
|
|
69
|
+
- [License](#license)
|
|
70
|
+
- [Acknowledgments](#acknowledgments)
|
|
71
|
+
- [Developer](#developer)
|
|
72
|
+
- [Building and Testing library](#building-and-testing-library)
|
|
73
|
+
- [Prerequisite Software](#prerequisite-software)
|
|
74
|
+
- [Getting the Sources](#getting-the-sources)
|
|
75
|
+
- [Installing NPM Modules](#installing-npm-modules)
|
|
76
|
+
- [Build command](#build-command)
|
|
77
|
+
- [Running tests locally](#running-tests-locally)
|
|
78
|
+
- [Manage task cache](#manage-task-cache)
|
|
79
|
+
- [Debugging with Visual Studio Code](#debugging-with-visual-studio-code)
|
|
80
|
+
- [Link local packages](#link-local-packages)
|
|
81
|
+
|
|
82
|
+
Refer to the [contribution guidelines](./CONTRIBUTING.md)
|
|
83
|
+
if you'd like to contribute to the framework.
|
|
84
|
+
|
|
85
|
+
#### Prerequisite Software
|
|
86
|
+
|
|
87
|
+
Before you can build and test Otter modules, you must install and configure the
|
|
88
|
+
following products on your development machine:
|
|
89
|
+
|
|
90
|
+
* [Git](http://git-scm.com) and/or the **GitHub app** (for [Mac](http://mac.github.com) or
|
|
91
|
+
[Windows](http://windows.github.com))
|
|
92
|
+
* [GitHub's Guide to Installing
|
|
93
|
+
Git](https://help.github.com/articles/set-up-git) is a good source of information.
|
|
94
|
+
|
|
95
|
+
* [Node.js](http://nodejs.org), (version `>=10.0.0`)
|
|
96
|
+
* This is used to run tests and generate distributable files. We also use Node's Package Manager, `npm`
|
|
97
|
+
(version `>3.8.x`), which comes with Node. Depending on your system, you can install Node either from
|
|
98
|
+
source or as a pre-packaged bundle.
|
|
99
|
+
|
|
100
|
+
* [Yarn](https://yarnpkg.com/lang/en/docs/install/), a Node's Package Manager
|
|
101
|
+
* You can install yarn using NPM manager (coming with Node.js).
|
|
102
|
+
The version of Yarn currently used is embedded in the repository. In case you need to link this library with your project, you can check the section "Link local packages".
|
|
103
|
+
|
|
104
|
+
* [Chrome](https://www.google.com/chrome/browser/desktop/index.html)
|
|
105
|
+
* We use Chrome to run our tests.
|
|
106
|
+
|
|
107
|
+
#### Getting the sources
|
|
108
|
+
|
|
109
|
+
Clone the Otter repository using the button `Code` or using the following git command:
|
|
110
|
+
|
|
111
|
+
```shell
|
|
112
|
+
git clone https://github.com/AmadeusITGroup/otter.git
|
|
113
|
+
```
|
|
114
|
+
|
|
115
|
+
#### Installing NPM modules
|
|
116
|
+
|
|
117
|
+
Next, install the JavaScript modules needed to build:
|
|
118
|
+
|
|
119
|
+
```shell
|
|
120
|
+
# Install library project dependencies (package.json)
|
|
121
|
+
yarn install
|
|
122
|
+
```
|
|
123
|
+
|
|
124
|
+
#### Build command
|
|
125
|
+
|
|
126
|
+
To build the modules, run:
|
|
127
|
+
|
|
128
|
+
```shell
|
|
129
|
+
yarn run build
|
|
130
|
+
```
|
|
131
|
+
|
|
132
|
+
Each module can be built independently thanks to [Nx](https://nx.dev/packages/nx/documents/run) commands:
|
|
133
|
+
|
|
134
|
+
```shell
|
|
135
|
+
# ex: Build Core package only
|
|
136
|
+
yarn nx build core
|
|
137
|
+
```
|
|
138
|
+
|
|
139
|
+
> **Note**: Results are put in the `dist` of each module (`packages/@<scope>/<module>/dist`).
|
|
140
|
+
|
|
141
|
+
#### Running tests locally
|
|
142
|
+
|
|
143
|
+
Check the formatting:
|
|
144
|
+
|
|
145
|
+
```shell
|
|
146
|
+
yarn run lint
|
|
147
|
+
```
|
|
148
|
+
|
|
149
|
+
Check Unit Tests:
|
|
150
|
+
|
|
151
|
+
```shell
|
|
152
|
+
yarn run test
|
|
153
|
+
```
|
|
154
|
+
|
|
155
|
+
Each module can be test independently thanks to [Nx](https://nx.dev/packages/nx/documents/run) commands:
|
|
156
|
+
|
|
157
|
+
```shell
|
|
158
|
+
# ex: Test Core package only
|
|
159
|
+
yarn nx test core
|
|
160
|
+
|
|
161
|
+
# ex: Lint Core package only
|
|
162
|
+
yarn nx lint core
|
|
163
|
+
```
|
|
164
|
+
|
|
165
|
+
#### Manage task cache
|
|
166
|
+
|
|
167
|
+
When running the Build, Lint, or Test commands, **Nx** can use its [cache mechanism](https://nx.dev/concepts/how-caching-works).
|
|
168
|
+
In some cases, it may be useful to clear the cache to investigate an issue. This can be done with the following command:
|
|
169
|
+
|
|
170
|
+
```shell
|
|
171
|
+
yarn nx reset
|
|
172
|
+
```
|
|
173
|
+
|
|
174
|
+
#### Debugging with Visual Studio Code
|
|
175
|
+
|
|
176
|
+
The repository contains the mandatory configuration and the recommended VSCode plugins to ensure optimal comfort and productivity while developing on the Otter Framework.
|
|
177
|
+
|
|
178
|
+
The default configuration of the repository provides a way to run Unit Tests one by one and to define, within VSCode, break points using the `vscode-jest-tests` debugger task.
|
|
179
|
+
|
|
180
|
+
#### Link local packages
|
|
181
|
+
|
|
182
|
+
For Yarn v1, add the `resolutions` property in the main package.json. It should be filled with the relative path to the `dist` of the local packages you want to link. The protocol `link:` can be used.
|
|
183
|
+
|
|
184
|
+
NOTE: It will not import the transitive dependencies of the linked packages.
|
|
185
|
+
|
|
186
|
+
Example:
|
|
187
|
+
|
|
188
|
+
```json
|
|
189
|
+
{
|
|
190
|
+
"resolutions": {
|
|
191
|
+
"@o3r/localization": "./relative/path/to/otter/packages/@o3r/localization/dist",
|
|
192
|
+
"@o3r/core": "link:./relative/path/to/otter/packages/@o3r/core/dist",
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
```
|
|
196
|
+
|
|
197
|
+
For Yarn v2+, the protocol `portal:` can also be used.
|
|
198
|
+
|
|
199
|
+
NOTE: The portal protocol will also import all the transitive dependencies of the linked packages.
|
|
200
|
+
Please keep in mind that mismatched versions of these dependencies may cause some issues.
|
|
201
|
+
|
|
202
|
+
Example:
|
|
203
|
+
|
|
204
|
+
```json
|
|
205
|
+
{
|
|
206
|
+
"resolutions": {
|
|
207
|
+
"@o3r/localization": "./relative/path/to/otter/library/@o3r/localization/dist",
|
|
208
|
+
"@o3r/core": "link:./relative/path/to/otter/library/@o3r/core/dist",
|
|
209
|
+
"@o3r/rules-engine": "portal:./relative/path/to/otter/library/@o3r/rules-engine/dist",
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
```
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.2.0-alpha.0",
|
|
4
4
|
"description": "Schematics module of the Otter framework",
|
|
5
5
|
"main": "./src/index.js",
|
|
6
6
|
"keywords": [
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
"build:builders": "tsc -b tsconfig.builders.json --pretty"
|
|
18
18
|
},
|
|
19
19
|
"peerDependencies": {
|
|
20
|
-
"@angular-devkit/core": "~15.
|
|
21
|
-
"@angular-devkit/schematics": "~15.
|
|
22
|
-
"@angular/cli": "~15.
|
|
23
|
-
"@schematics/angular": "~15.
|
|
20
|
+
"@angular-devkit/core": "~15.2.0",
|
|
21
|
+
"@angular-devkit/schematics": "~15.2.0",
|
|
22
|
+
"@angular/cli": "~15.2.0",
|
|
23
|
+
"@schematics/angular": "~15.2.0"
|
|
24
24
|
},
|
|
25
25
|
"peerDependenciesMeta": {
|
|
26
26
|
"@angular-devkit/core": {
|
|
@@ -28,31 +28,32 @@
|
|
|
28
28
|
}
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@o3r/dev-tools": "^8.
|
|
31
|
+
"@o3r/dev-tools": "^8.2.0-alpha.0",
|
|
32
32
|
"comment-json": "^4.1.0",
|
|
33
33
|
"globby": "^11.1.0",
|
|
34
|
+
"minimatch": "^6.1.6",
|
|
34
35
|
"semver": "^7.3.2",
|
|
35
36
|
"tslib": "^2.4.1"
|
|
36
37
|
},
|
|
37
38
|
"devDependencies": {
|
|
38
|
-
"@angular-devkit/build-angular": "~15.
|
|
39
|
-
"@angular-devkit/core": "~15.
|
|
40
|
-
"@angular-devkit/schematics": "~15.
|
|
39
|
+
"@angular-devkit/build-angular": "~15.2.0",
|
|
40
|
+
"@angular-devkit/core": "~15.2.0",
|
|
41
|
+
"@angular-devkit/schematics": "~15.2.0",
|
|
41
42
|
"@angular-eslint/eslint-plugin": "~15.2.0",
|
|
42
|
-
"@angular/cli": "~15.
|
|
43
|
-
"@angular/common": "~15.
|
|
44
|
-
"@angular/compiler": "~15.
|
|
45
|
-
"@angular/compiler-cli": "~15.
|
|
46
|
-
"@angular/core": "~15.
|
|
47
|
-
"@angular/platform-browser": "~15.
|
|
48
|
-
"@angular/platform-browser-dynamic": "~15.
|
|
49
|
-
"@nrwl/cli": "
|
|
50
|
-
"@nrwl/jest": "
|
|
51
|
-
"@nrwl/js": "
|
|
52
|
-
"@nrwl/linter": "
|
|
53
|
-
"@o3r/build-helpers": "^8.
|
|
54
|
-
"@o3r/eslint-plugin": "^8.
|
|
55
|
-
"@schematics/angular": "~15.
|
|
43
|
+
"@angular/cli": "~15.2.0",
|
|
44
|
+
"@angular/common": "~15.2.0",
|
|
45
|
+
"@angular/compiler": "~15.2.0",
|
|
46
|
+
"@angular/compiler-cli": "~15.2.0",
|
|
47
|
+
"@angular/core": "~15.2.0",
|
|
48
|
+
"@angular/platform-browser": "~15.2.0",
|
|
49
|
+
"@angular/platform-browser-dynamic": "~15.2.0",
|
|
50
|
+
"@nrwl/cli": "~15.8.0",
|
|
51
|
+
"@nrwl/jest": "~15.8.0",
|
|
52
|
+
"@nrwl/js": "~15.8.0",
|
|
53
|
+
"@nrwl/linter": "~15.8.0",
|
|
54
|
+
"@o3r/build-helpers": "^8.2.0-alpha.0",
|
|
55
|
+
"@o3r/eslint-plugin": "^8.2.0-alpha.0",
|
|
56
|
+
"@schematics/angular": "~15.2.0",
|
|
56
57
|
"@types/jest": "~28.1.2",
|
|
57
58
|
"@types/node": "^17.0.45",
|
|
58
59
|
"@types/semver": "^7.3.13",
|
|
@@ -64,15 +65,16 @@
|
|
|
64
65
|
"eslint-plugin-jest": "^26.1.4",
|
|
65
66
|
"eslint-plugin-jsdoc": "^39.3.6",
|
|
66
67
|
"eslint-plugin-prefer-arrow": "^1.2.3",
|
|
68
|
+
"eslint-plugin-unicorn": "^45.0.2",
|
|
67
69
|
"jest": "~28.1.1",
|
|
68
70
|
"jest-junit": "^14.0.0",
|
|
69
71
|
"jsonschema": "~1.4.1",
|
|
70
|
-
"nx": "
|
|
72
|
+
"nx": "~15.8.0",
|
|
71
73
|
"rxjs": "^7.4.0",
|
|
72
74
|
"ts-jest": "^28.0.5",
|
|
73
|
-
"type-fest": "^
|
|
75
|
+
"type-fest": "^3.6.1",
|
|
74
76
|
"typescript": "~4.9.4",
|
|
75
|
-
"zone.js": "^0.
|
|
77
|
+
"zone.js": "^0.13.0"
|
|
76
78
|
},
|
|
77
79
|
"engines": {
|
|
78
80
|
"node": ">=14.0.0"
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.applyEsLintFix = void 0;
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
|
-
const
|
|
5
|
+
const node_child_process_1 = require("node:child_process");
|
|
6
6
|
const node_path_1 = require("node:path");
|
|
7
7
|
/**
|
|
8
8
|
* Apply EsLint fix
|
|
@@ -48,7 +48,7 @@ function applyEsLintFix(_prootPath = '/', extension = ['ts'], options) {
|
|
|
48
48
|
}
|
|
49
49
|
return acc;
|
|
50
50
|
}, new Set());
|
|
51
|
-
(0,
|
|
51
|
+
(0, node_child_process_1.exec)('yarn eslint ' +
|
|
52
52
|
Array.from(files).map((file) => `"${file}"`).join(' ') +
|
|
53
53
|
' --fix --color' +
|
|
54
54
|
(linterOptions.hideWarnings ? ' --quiet' : '') +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":";;;AAAA,2DAAyG;AACzG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/eslint-fix/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Rule } from '@angular-devkit/schematics';
|
|
2
2
|
import { NgAddPackageOptions } from '../../tasks/index';
|
|
3
3
|
/**
|
|
4
4
|
* Install via `ng add` a list of npm packages.
|
|
@@ -6,5 +6,5 @@ import { NgAddPackageOptions } from '../../tasks/index';
|
|
|
6
6
|
* @param packages List of packages to be installed via `ng add`
|
|
7
7
|
* @param options install options
|
|
8
8
|
*/
|
|
9
|
-
export declare function ngAddPackages(packages: string[], options?: NgAddPackageOptions):
|
|
9
|
+
export declare function ngAddPackages(packages: string[], options?: NgAddPackageOptions): Rule;
|
|
10
10
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,mBAAmB,CAAC;AAE9E;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAqBrF"}
|
|
@@ -9,15 +9,27 @@ const index_1 = require("../../tasks/index");
|
|
|
9
9
|
* @param options install options
|
|
10
10
|
*/
|
|
11
11
|
function ngAddPackages(packages, options) {
|
|
12
|
-
|
|
12
|
+
const getInstalledVersion = async (packageName) => {
|
|
13
|
+
var _a;
|
|
14
|
+
try {
|
|
15
|
+
return (await (_a = `${packageName}/package.json`, Promise.resolve().then(() => require(_a)))).version;
|
|
16
|
+
}
|
|
17
|
+
catch (e) {
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
return async (_tree, context) => {
|
|
13
22
|
if (packages.length > 0) {
|
|
14
23
|
context.logger.info(`'${options?.parentPackageInfo || ''}' - 'ng add' has been launched for the following packages:`);
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
24
|
+
for (const packageName of packages) {
|
|
25
|
+
const installedVersion = await getInstalledVersion(packageName);
|
|
26
|
+
if (!installedVersion || options?.version !== installedVersion) {
|
|
27
|
+
context.logger.info(`Running ng add for: ${packageName}${options?.version ? ' with version: ' + options.version : ''}`);
|
|
28
|
+
context.addTask(new index_1.NodePackageNgAddTask(packageName, options));
|
|
29
|
+
}
|
|
30
|
+
}
|
|
19
31
|
}
|
|
20
|
-
return
|
|
32
|
+
return;
|
|
21
33
|
};
|
|
22
34
|
}
|
|
23
35
|
exports.ngAddPackages = ngAddPackages;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":";;;AACA,6CAA8E;AAE9E;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,QAAkB,EAAE,OAA6B;IAC7E,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/index.ts"],"names":[],"mappings":";;;AACA,6CAA8E;AAE9E;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,QAAkB,EAAE,OAA6B;IAC7E,MAAM,mBAAmB,GAAG,KAAK,EAAE,WAAmB,EAAE,EAAE;;QACxD,IAAI;YACF,OAAO,CAAC,YAAa,GAAG,WAAW,eAAe,4CAAC,CAAC,CAAC,OAAO,CAAC;SAC9D;QAAC,OAAO,CAAC,EAAE;YACV,OAAO;SACR;IACH,CAAC,CAAC;IACF,OAAO,KAAK,EAAE,KAAW,EAAE,OAAyB,EAAE,EAAE;QACtD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,OAAO,EAAE,iBAAiB,IAAI,EAAE,4DAA4D,CAAC,CAAC;YACtH,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;gBAClC,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,WAAW,CAAC,CAAC;gBAChE,IAAI,CAAC,gBAAgB,IAAI,OAAO,EAAE,OAAO,KAAK,gBAAgB,EAAE;oBAC9D,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,uBAAuB,WAAW,GAAG,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACxH,OAAO,CAAC,OAAO,CAAC,IAAI,4BAAoB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;iBACjE;aACF;SACF;QACD,OAAO;IACT,CAAC,CAAC;AACJ,CAAC;AArBD,sCAqBC"}
|
|
@@ -12,7 +12,7 @@ export interface NgAddPackageOptions {
|
|
|
12
12
|
version?: string;
|
|
13
13
|
/** The package which launched the ng add for the current one */
|
|
14
14
|
parentPackageInfo?: string;
|
|
15
|
-
/** Name of the project
|
|
15
|
+
/** Name of the project */
|
|
16
16
|
projectName?: string | null;
|
|
17
17
|
}
|
|
18
18
|
export declare class NodePackageNgAddTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAEnH;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,yBAAyB;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,kBAAkB;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,gEAAgE;IAChE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/tasks/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0DAA0D,CAAC;AAEnH;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,yBAAyB;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,kBAAkB;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,gEAAgE;IAChE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,0BAA0B;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,qBAAa,oBAAqB,YAAW,0BAA0B,CAAC,sBAAsB,CAAC;IAG1E,WAAW,EAAE,MAAM;IAAS,OAAO,CAAC;IAFhD,KAAK,UAAQ;gBAED,WAAW,EAAE,MAAM,EAAS,OAAO,CAAC,iCAAqB;IAErE,eAAe,IAAI,iBAAiB,CAAC,sBAAsB,CAAC;CAgBpE"}
|
package/src/utility/loaders.d.ts
CHANGED
|
@@ -50,8 +50,9 @@ export declare function getTemplateFolder(rootPath: string, currentPath: string,
|
|
|
50
50
|
*
|
|
51
51
|
* @param basePath Base path from which starting the list
|
|
52
52
|
* @param tree Schematics file tree
|
|
53
|
+
* @param excludes Array of globs to be ignored
|
|
53
54
|
*/
|
|
54
|
-
export declare function getAllFilesInTree(tree: Tree, basePath?: string): string[];
|
|
55
|
+
export declare function getAllFilesInTree(tree: Tree, basePath?: string, excludes?: string[]): string[];
|
|
55
56
|
/**
|
|
56
57
|
* Get all files with specific extension from the specified folder for all the projects described in the workspace
|
|
57
58
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,IAAI,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAKvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE7E;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,SAAkB,GAAG,eAAe,CAO9F;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,gEAGtE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,gBAAgB,eAQ7E;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,gBAAgB,CAG5F;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAGxD;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,cAAc,SAAc,UAGpG;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,SAAM,EAAE,QAAQ,GAAE,MAAM,EAAO,GAAG,MAAM,EAAE,CAS/F;AAED;;;;;;;GAOG;AACH,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAS3G;AAED;;;;;;GAMG;AACH,wBAAgB,2CAA2C,CAAC,IAAI,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,YAOjH;AAED;;;;;GAKG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAEhF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,YAE1E;AAGD;;;;GAIG;AACH,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,YAE7D"}
|
package/src/utility/loaders.js
CHANGED
|
@@ -4,6 +4,7 @@ exports.getSourceFilesFromWorkspaceProjects = exports.getFilesFromWorkspaceProje
|
|
|
4
4
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
5
|
const commentJson = require("comment-json");
|
|
6
6
|
const globby_1 = require("globby");
|
|
7
|
+
const minimatch_1 = require("minimatch");
|
|
7
8
|
const path = require("node:path");
|
|
8
9
|
/**
|
|
9
10
|
* Load the angular.json file
|
|
@@ -85,13 +86,16 @@ exports.getTemplateFolder = getTemplateFolder;
|
|
|
85
86
|
*
|
|
86
87
|
* @param basePath Base path from which starting the list
|
|
87
88
|
* @param tree Schematics file tree
|
|
89
|
+
* @param excludes Array of globs to be ignored
|
|
88
90
|
*/
|
|
89
|
-
function getAllFilesInTree(tree, basePath = '/') {
|
|
91
|
+
function getAllFilesInTree(tree, basePath = '/', excludes = []) {
|
|
92
|
+
if (excludes.length && excludes.some((e) => (0, minimatch_1.minimatch)(basePath, e, { dot: true }))) {
|
|
93
|
+
return [];
|
|
94
|
+
}
|
|
90
95
|
return [
|
|
91
96
|
...tree.getDir(basePath).subfiles.map((file) => path.posix.join(basePath, file)),
|
|
92
97
|
...tree.getDir(basePath).subdirs
|
|
93
|
-
.
|
|
94
|
-
.flat()
|
|
98
|
+
.flatMap((dir) => getAllFilesInTree(tree, path.posix.join(basePath, dir), excludes))
|
|
95
99
|
];
|
|
96
100
|
}
|
|
97
101
|
exports.getAllFilesInTree = getAllFilesInTree;
|
|
@@ -122,18 +126,11 @@ exports.getFilesInFolderFromWorkspaceProjects = getFilesInFolderFromWorkspacePro
|
|
|
122
126
|
*/
|
|
123
127
|
function getFilesInFolderFromWorkspaceProjectsInTree(tree, folderInProject, extension) {
|
|
124
128
|
const workspace = readAngularJson(tree);
|
|
125
|
-
const
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
.
|
|
129
|
-
.
|
|
130
|
-
.replace(/\/$/, ''));
|
|
131
|
-
const files = getAllFilesInTree(tree);
|
|
132
|
-
const excludes = /.*\/node_modules\/.*/;
|
|
133
|
-
return projectSources.flatMap((projectSource) => {
|
|
134
|
-
const regexp = new RegExp(projectSource);
|
|
135
|
-
return files.filter((file) => regexp.test(file) && !excludes.test(file));
|
|
136
|
-
});
|
|
129
|
+
const extensionMatcher = new RegExp(`\\.${extension}$`);
|
|
130
|
+
const excludes = ['**/node_modules/**', '**/.cache/**'];
|
|
131
|
+
return Object.values(workspace.projects)
|
|
132
|
+
.flatMap((project) => getAllFilesInTree(tree, path.posix.join(project.root, folderInProject), excludes))
|
|
133
|
+
.filter((filePath) => extensionMatcher.test(filePath));
|
|
137
134
|
}
|
|
138
135
|
exports.getFilesInFolderFromWorkspaceProjectsInTree = getFilesInFolderFromWorkspaceProjectsInTree;
|
|
139
136
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AACvE,4CAA4C;AAC5C,mCAA4C;AAC5C,kCAAkC;AAIlC;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,eAAe,GAAG,eAAe;IAC3E,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACnD,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,gCAAmB,CAAC,gDAAgD,CAAC,CAAC;KACjF;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAQ,CAAC;AAC9D,CAAC;AAPD,0CAOC;AAED;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,IAAU,EAAE,SAA0B;IACrE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,WAAW,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3E,OAAO,IAAI,CAAC;AACd,CAAC;AAHD,4CAGC;AAED;;;;;;GAMG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,gBAAkC;IAC5E,4EAA4E;IAC5E,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,IAAI,eAAe,CAAC,CAAC;IAC3E,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,gCAAmB,CAAC,4BAA4B,CAAC,CAAC;KAC7D;IAED,OAAO,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAgB,CAAC;AACtE,CAAC;AARD,0CAQC;AAED;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,IAAU,EAAE,WAA2B;IACxE,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACxC,OAAO,SAAS,CAAC,QAAQ,CAAC,WAAW,IAAI,SAAS,CAAC,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC3G,CAAC;AAHD,gDAGC;AAED;;;;GAIG;AACH,SAAgB,qBAAqB,CAAC,IAAU;IAC9C,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACxC,OAAO,SAAS,CAAC,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AACxE,CAAC;AAHD,sDAGC;AAED;;;;;;GAMG;AACH,SAAgB,iBAAiB,CAAC,QAAgB,EAAE,WAAmB,EAAE,cAAc,GAAG,WAAW;IACnG,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3F,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;AACrD,CAAC;AAHD,8CAGC;AAED
|
|
1
|
+
{"version":3,"file":"loaders.js","sourceRoot":"","sources":["../../../src/utility/loaders.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,8 +14,9 @@ export declare function getPeerDepWithPattern(packageJsonPath: string, pattern?:
|
|
|
14
14
|
*
|
|
15
15
|
* @param packageJsonPath The package json on which we search for o3r peer deps
|
|
16
16
|
* @param filterBasics If activated it will remove the basic peer deps (o3r/core, o3r/dev-tools and o3r/schematics) from the list of results
|
|
17
|
+
* @param packagePattern Pattern of the package name to look in the packages peer dependencies.
|
|
17
18
|
*/
|
|
18
|
-
export declare function getO3rPeerDeps(packageJsonPath: string, filterBasics?: boolean): {
|
|
19
|
+
export declare function getO3rPeerDeps(packageJsonPath: string, filterBasics?: boolean, packagePattern?: RegExp): {
|
|
19
20
|
packageName: string | undefined;
|
|
20
21
|
packageVersion: string | undefined;
|
|
21
22
|
o3rPeerDeps: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matching-peers.d.ts","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,SAA0B;;;;EAY/F;AAED
|
|
1
|
+
{"version":3,"file":"matching-peers.d.ts","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,SAA0B;;;;EAY/F;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,UAAO,EAAE,cAAc,SAAsB;;;;EAUhH"}
|
|
@@ -25,9 +25,10 @@ exports.getPeerDepWithPattern = getPeerDepWithPattern;
|
|
|
25
25
|
*
|
|
26
26
|
* @param packageJsonPath The package json on which we search for o3r peer deps
|
|
27
27
|
* @param filterBasics If activated it will remove the basic peer deps (o3r/core, o3r/dev-tools and o3r/schematics) from the list of results
|
|
28
|
+
* @param packagePattern Pattern of the package name to look in the packages peer dependencies.
|
|
28
29
|
*/
|
|
29
|
-
function getO3rPeerDeps(packageJsonPath, filterBasics = true) {
|
|
30
|
-
const depsInfo = getPeerDepWithPattern(packageJsonPath,
|
|
30
|
+
function getO3rPeerDeps(packageJsonPath, filterBasics = true, packagePattern = /^@(?:o3r|ama-sdk)/) {
|
|
31
|
+
const depsInfo = getPeerDepWithPattern(packageJsonPath, packagePattern);
|
|
31
32
|
return {
|
|
32
33
|
packageName: depsInfo.packageName,
|
|
33
34
|
packageVersion: depsInfo.packageVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matching-peers.js","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAG9B;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,eAAuB,EAAE,OAAO,GAAG,uBAAuB;IAC9F,MAAM,kBAAkB,GAAgB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC5G,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC;IAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAClD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,IAAI,EAAE,CAAC;SACnF,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,IAAI,EAAE,CAAC;SAC5E,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAEnF,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC;AAC3D,CAAC;AAZD,sDAYC;AAED
|
|
1
|
+
{"version":3,"file":"matching-peers.js","sourceRoot":"","sources":["../../../src/utility/matching-peers.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAG9B;;;;;GAKG;AACH,SAAgB,qBAAqB,CAAC,eAAuB,EAAE,OAAO,GAAG,uBAAuB;IAC9F,MAAM,kBAAkB,GAAgB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAC5G,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC;IAC5C,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC;IAClD,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,oBAAoB,IAAI,EAAE,CAAC;SACnF,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,QAAQ,CAAC;SAClC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC;IAE/B,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,IAAI,EAAE,CAAC;SAC5E,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAEnF,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,CAAC;AAC3D,CAAC;AAZD,sDAYC;AAED;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,eAAuB,EAAE,YAAY,GAAG,IAAI,EAAE,cAAc,GAAG,mBAAmB;IAC/G,MAAM,QAAQ,GAAG,qBAAqB,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;IACxE,OAAO;QACL,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,WAAW,EAAE,YAAY,CAAC,CAAC;YACzB,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,KAAK,WAAW,IAAI,OAAO,KAAK,iBAAiB,IAAI,OAAO,KAAK,gBAAgB,CAAC;YACrI,CAAC,CAAC,QAAQ,CAAC,gBAAgB;KAC9B,CAAC;AAEJ,CAAC;AAVD,wCAUC"}
|
package/src/utility/modules.js
CHANGED
|
@@ -88,7 +88,7 @@ exports.getMainFilePath = getMainFilePath;
|
|
|
88
88
|
function isApplicationThatUsesRouterModule(tree) {
|
|
89
89
|
const workspaceProject = (0, loaders_1.getProjectFromTree)(tree);
|
|
90
90
|
return workspaceProject.projectType === 'application' && workspaceProject.sourceRoot &&
|
|
91
|
-
(0, globby_1.sync)(path.join(workspaceProject.sourceRoot, '**', '*.ts')).some((filePath) => {
|
|
91
|
+
(0, globby_1.sync)(path.posix.join(workspaceProject.sourceRoot, '**', '*.ts')).some((filePath) => {
|
|
92
92
|
const sourceFile = ts.createSourceFile(filePath, fs.readFileSync(filePath).toString(), ts.ScriptTarget.ES2015, true);
|
|
93
93
|
try {
|
|
94
94
|
return !!(0, ast_utils_1.getRouterModuleDeclaration)(sourceFile);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../../src/utility/modules.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"modules.js","sourceRoot":"","sources":["../../../src/utility/modules.ts"],"names":[],"mappings":"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"}
|