Skip to content

Commit e491834

Browse files
author
Angular Builds
committed
cc723d8d7 feat(@angular-devkit/build-angular): support following symlinked asset directories
1 parent 023afef commit e491834

File tree

7 files changed

+20
-7
lines changed

7 files changed

+20
-7
lines changed

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "@angular-devkit/build-angular",
3-
"version": "0.1100.0-next.7+70.ff7edce",
3+
"version": "0.1100.0-next.7+71.cc723d8",
44
"description": "Angular Webpack Build Facade",
55
"experimental": true,
66
"main": "src/index.js",
77
"typings": "src/index.d.ts",
88
"builders": "builders.json",
99
"dependencies": {
10-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ff7edce98",
11-
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#ff7edce98",
12-
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ff7edce98",
13-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#ff7edce98",
10+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#cc723d8d7",
11+
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#cc723d8d7",
12+
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#cc723d8d7",
13+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#cc723d8d7",
1414
"@babel/core": "7.12.3",
1515
"@babel/generator": "7.12.1",
1616
"@babel/plugin-transform-runtime": "7.12.1",
1717
"@babel/preset-env": "7.12.1",
1818
"@babel/runtime": "7.12.1",
1919
"@babel/template": "7.10.4",
2020
"@jsdevtools/coverage-istanbul-loader": "3.0.5",
21-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#ff7edce98",
21+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#cc723d8d7",
2222
"ansi-colors": "4.1.1",
2323
"autoprefixer": "9.8.6",
2424
"babel-loader": "8.1.0",

src/browser/schema.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,11 @@ export interface Schema {
199199
}
200200
export declare type AssetPattern = AssetPatternClass | string;
201201
export interface AssetPatternClass {
202+
/**
203+
* Allow glob patterns to follow symlink directories. This allows subdirectories of the
204+
* symlink to be searched.
205+
*/
206+
followSymlinks?: boolean;
202207
/**
203208
* The pattern to match.
204209
*/

src/browser/schema.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,11 @@
389389
{
390390
"type": "object",
391391
"properties": {
392+
"followSymlinks": {
393+
"type": "boolean",
394+
"default": false,
395+
"description": "Allow glob patterns to follow symlink directories. This allows subdirectories of the symlink to be searched."
396+
},
392397
"glob": {
393398
"type": "string",
394399
"description": "The pattern to match."

src/utils/copy-assets.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ export declare function copyAssets(entries: {
44
input: string;
55
output: string;
66
flatten?: boolean;
7+
followSymlinks?: boolean;
78
}[], basePaths: Iterable<string>, root: string, changed?: Set<string>): Promise<void>;

src/utils/copy-assets.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ async function copyAssets(entries, basePaths, root, changed) {
2424
dot: true,
2525
nodir: true,
2626
ignore: entry.ignore ? defaultIgnore.concat(entry.ignore) : defaultIgnore,
27+
follow: entry.followSymlinks,
2728
});
2829
const directoryExists = new Set();
2930
for (const file of files) {

src/webpack/configs/common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ function getCommonConfig(wco) {
212212
force: true,
213213
globOptions: {
214214
dot: true,
215+
followSymbolicLinks: !!asset.followSymlinks,
215216
ignore: [
216217
'.gitkeep',
217218
'**/.DS_Store',

uniqueId

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Wed Oct 21 2020 18:46:27 GMT+0000 (Coordinated Universal Time)
1+
Wed Oct 21 2020 23:30:12 GMT+0000 (Coordinated Universal Time)

0 commit comments

Comments
 (0)