ng-packagr 5.0.0 → 5.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +86 -2
- package/README.md +4 -17
- package/lib/commands/version.command.js +5 -1
- package/lib/commands/version.command.js.map +1 -1
- package/lib/flatten/rollup.js +9 -1
- package/lib/flatten/rollup.js.map +1 -1
- package/lib/ng-v5/discover-packages.js +3 -0
- package/lib/ng-v5/discover-packages.js.map +1 -1
- package/lib/ng-v5/entry-point/resources/stylesheet-processor.js +4 -4
- package/lib/ng-v5/entry-point/resources/stylesheet-processor.js.map +1 -1
- package/lib/ng-v5/entry-point/ts/compile-ngc.transform.js +16 -18
- package/lib/ng-v5/entry-point/ts/compile-ngc.transform.js.map +1 -1
- package/lib/ng-v5/entry-point/write-package.transform.js +8 -6
- package/lib/ng-v5/entry-point/write-package.transform.js.map +1 -1
- package/lib/ng-v5/package.transform.js +1 -1
- package/lib/ng-v5/package.transform.js.map +1 -1
- package/lib/ng-v5/packagr.js +1 -1
- package/lib/ng-v5/packagr.js.map +1 -1
- package/lib/ngc/compile-source-files.js +1 -0
- package/lib/ngc/compile-source-files.js.map +1 -1
- package/lib/util/log.js +7 -5
- package/lib/util/log.js.map +1 -1
- package/package.json +13 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,7 +1,77 @@
|
|
|
1
|
-
#
|
|
1
|
+
# Changelog
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [5.3.0](https://github.com/ng-packagr/ng-packagr/compare/v5.2.0...v5.3.0) (2019-06-05)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* add quotes to less include-path ([af6816b](https://github.com/ng-packagr/ng-packagr/commit/af6816b))
|
|
11
|
+
* don't write stacktraces when there are errors ([42692b0](https://github.com/ng-packagr/ng-packagr/commit/42692b0))
|
|
12
|
+
* remove opencollective postinstall scripts ([123f39a](https://github.com/ng-packagr/ng-packagr/commit/123f39a))
|
|
13
|
+
* update @angular/cdk to version ~8.0.0 ([#1301](https://github.com/ng-packagr/ng-packagr/issues/1301)) ([f7a462a](https://github.com/ng-packagr/ng-packagr/commit/f7a462a))
|
|
14
|
+
* update terser to version ^4.0.0 ([dd28818](https://github.com/ng-packagr/ng-packagr/commit/dd28818))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Build System
|
|
18
|
+
|
|
19
|
+
* introduce support for minor beta releases ([a73a600](https://github.com/ng-packagr/ng-packagr/commit/a73a600))
|
|
20
|
+
* update @commitlint/cli to version ^8.0.0 ([5856506](https://github.com/ng-packagr/ng-packagr/commit/5856506))
|
|
21
|
+
* update angular and typescript ([c72d351](https://github.com/ng-packagr/ng-packagr/commit/c72d351))
|
|
22
|
+
* update codelyzer to version ~5.1.0 ([d612ca3](https://github.com/ng-packagr/ng-packagr/commit/d612ca3))
|
|
23
|
+
* update husky to version ^2.0.0 ([5398fe7](https://github.com/ng-packagr/ng-packagr/commit/5398fe7))
|
|
24
|
+
* update standard-version to version ^6.0.0 ([6c0c039](https://github.com/ng-packagr/ng-packagr/commit/6c0c039))
|
|
25
|
+
* update ts-node to version ~8.2.0 ([3e730fc](https://github.com/ng-packagr/ng-packagr/commit/3e730fc))
|
|
26
|
+
* update tslint to version ~5.17.0 ([58d4217](https://github.com/ng-packagr/ng-packagr/commit/58d4217))
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
### Features
|
|
30
|
+
|
|
31
|
+
* support inline javascript in less ([#1300](https://github.com/ng-packagr/ng-packagr/issues/1300)) ([e0b4136](https://github.com/ng-packagr/ng-packagr/commit/e0b4136)), closes [#1298](https://github.com/ng-packagr/ng-packagr/issues/1298)
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
# [5.2.0](https://github.com/ng-packagr/ng-packagr/compare/v5.1.0...v5.2.0) (2019-05-17)
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
### Bug Fixes
|
|
39
|
+
|
|
40
|
+
* copy+dereference LICENSE and README.md ([6ace017](https://github.com/ng-packagr/ng-packagr/commit/6ace017))
|
|
41
|
+
* fix resolution for less binary ([6bc789c](https://github.com/ng-packagr/ng-packagr/commit/6bc789c)), closes [#1276](https://github.com/ng-packagr/ng-packagr/issues/1276)
|
|
42
|
+
* logger print errors and warnings to stderr ([9534d19](https://github.com/ng-packagr/ng-packagr/commit/9534d19))
|
|
43
|
+
* update chokidar to version ^3.0.0 ([2f0e75f](https://github.com/ng-packagr/ng-packagr/commit/2f0e75f))
|
|
44
|
+
* update fs-extra to version ^8.0.0 ([de09a1a](https://github.com/ng-packagr/ng-packagr/commit/de09a1a))
|
|
45
|
+
* update update-notifier to version ^3.0.0 ([d5b136f](https://github.com/ng-packagr/ng-packagr/commit/d5b136f))
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
### Features
|
|
49
|
+
|
|
50
|
+
* update several rollup dependencies ([0772371](https://github.com/ng-packagr/ng-packagr/commit/0772371))
|
|
51
|
+
|
|
52
|
+
|
|
53
|
+
# [5.1.0](https://github.com/ng-packagr/ng-packagr/compare/v5.0.1...v5.1.0) (2019-04-15)
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
### Bug Fixes
|
|
57
|
+
|
|
58
|
+
* emit ts option diagnostic ([ed960b6](https://github.com/ng-packagr/ng-packagr/commit/ed960b6))
|
|
59
|
+
* error out gracefully when `package.json` is not found ([902dea2](https://github.com/ng-packagr/ng-packagr/commit/902dea2)), closes [#1255](https://github.com/ng-packagr/ng-packagr/issues/1255)
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
### Features
|
|
63
|
+
|
|
64
|
+
* add support for TypeScript 3.4 ([828065c](https://github.com/ng-packagr/ng-packagr/commit/828065c))
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
## [5.0.1](https://github.com/ng-packagr/ng-packagr/compare/v5.0.0...v5.0.1) (2019-03-27)
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
### Bug Fixes
|
|
71
|
+
|
|
72
|
+
* version command should not require tsickle ([6ac0dcf](https://github.com/ng-packagr/ng-packagr/commit/6ac0dcf))
|
|
73
|
+
|
|
74
|
+
|
|
5
75
|
# [5.0.0](https://github.com/ng-packagr/ng-packagr/compare/v4.7.1...v5.0.0) (2019-03-27)
|
|
6
76
|
|
|
7
77
|
|
|
@@ -29,8 +99,22 @@ All notable changes to this project will be documented in this file. See [standa
|
|
|
29
99
|
|
|
30
100
|
### BREAKING CHANGES
|
|
31
101
|
|
|
32
|
-
* Users outside of Google don't usually need closure annotations hence `annotateForClosureCompiler` is turned off by default. In case users want to emit closure
|
|
102
|
+
* Users outside of Google don't usually need closure annotations hence `annotateForClosureCompiler` is turned off by default. In case users want to emit closure compatible code, they need to install `tsickle` and enable opt it this feature.
|
|
103
|
+
|
|
104
|
+
* We no longer use node-sass by default, instead we use sass (dart-sass).
|
|
105
|
+
|
|
106
|
+
While in most cases this should not have an impact the generated code, dart sass has some differences from Ruby Sass. See https://github.com/sass/dart-sass#behavioral-differences-from-ruby-sass for more details
|
|
33
107
|
|
|
108
|
+
If you wish to use node-sass instead of sass you need to install node-sass as a dev dependency.
|
|
109
|
+
|
|
110
|
+
npm users
|
|
111
|
+
```
|
|
112
|
+
npm install node-sass --save-dev
|
|
113
|
+
```
|
|
114
|
+
yarn users
|
|
115
|
+
```
|
|
116
|
+
yarn add node-sass --dev
|
|
117
|
+
```
|
|
34
118
|
|
|
35
119
|
|
|
36
120
|
<a name="4.7.1"></a>
|
package/README.md
CHANGED
|
@@ -8,8 +8,6 @@
|
|
|
8
8
|
[](https://conventionalcommits.org)
|
|
9
9
|
[](https://circleci.com/gh/ng-packagr/ng-packagr)
|
|
10
10
|
|
|
11
|
-
[](#backers)
|
|
12
|
-
[](#sponsors)
|
|
13
11
|
[](https://github.com/ng-packagr/ng-packagr)
|
|
14
12
|
[](https://github.com/ng-packagr/ng-packagr)
|
|
15
13
|
[](https://www.npmjs.com/package/ng-packagr)
|
|
@@ -23,22 +21,11 @@ This project exists thanks to all the people who contribute. [[Contribute](CONTR
|
|
|
23
21
|
|
|
24
22
|
<a href="https://github.com/ng-packagr/ng-packagr/graphs/contributors"><img src="https://opencollective.com/ng-packagr/contributors.svg?width=890&button=false" /></a>
|
|
25
23
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/ng-packagr#backer)]
|
|
29
|
-
|
|
30
|
-
<a href="https://opencollective.com/ng-packagr#backers" target="_blank"><img src="https://opencollective.com/ng-packagr/backers.svg?width=890"></a>
|
|
31
|
-
|
|
32
|
-
### Sponsors
|
|
33
|
-
|
|
34
|
-
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/ng-packagr#sponsor)]
|
|
35
|
-
|
|
36
|
-
<a href="https://opencollective.com/ng-packagr/sponsor/0/website" target="_blank"><img src="https://opencollective.com/ng-packagr/sponsor/0/avatar.svg"></a>
|
|
37
|
-
|
|
38
|
-
<a href="https://opencollective.com/ng-packagr/sponsor/1/website" target="_blank"><img src="https://opencollective.com/ng-packagr/sponsor/1/avatar.svg"></a>
|
|
39
|
-
|
|
40
|
-
<a href="https://opencollective.com/ng-packagr/sponsor/2/website" target="_blank"><img src="https://opencollective.com/ng-packagr/sponsor/2/avatar.svg"></a>
|
|
24
|
+
## Installation
|
|
41
25
|
|
|
26
|
+
```bash
|
|
27
|
+
npm install -D ng-packagr
|
|
28
|
+
```
|
|
42
29
|
|
|
43
30
|
## Usage Example
|
|
44
31
|
|
|
@@ -3,13 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const rollup_1 = require("rollup");
|
|
4
4
|
const compiler_1 = require("@angular/compiler");
|
|
5
5
|
const typescript_1 = require("typescript");
|
|
6
|
-
const TSICKLE_VERSION = require('tsickle/package.json').version;
|
|
7
6
|
/**
|
|
8
7
|
* Prints version information.
|
|
9
8
|
*
|
|
10
9
|
* @stable
|
|
11
10
|
*/
|
|
12
11
|
exports.version = (pkg) => {
|
|
12
|
+
let TSICKLE_VERSION = '';
|
|
13
|
+
try {
|
|
14
|
+
TSICKLE_VERSION = require('tsickle/package.json').version;
|
|
15
|
+
}
|
|
16
|
+
catch (_a) { }
|
|
13
17
|
const NG_PACKAGR_VERSION = pkg ? pkg.version : 'unknown';
|
|
14
18
|
console.log(`ng-packagr: ` + NG_PACKAGR_VERSION);
|
|
15
19
|
console.log(`@angular/compiler: ` + compiler_1.VERSION.full);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.command.js","sourceRoot":"","sources":["../../../src/lib/commands/version.command.ts"],"names":[],"mappings":";;AAAA,mCAAmD;AACnD,gDAAgE;AAChE,2CAAmD;AAGnD,
|
|
1
|
+
{"version":3,"file":"version.command.js","sourceRoot":"","sources":["../../../src/lib/commands/version.command.ts"],"names":[],"mappings":";;AAAA,mCAAmD;AACnD,gDAAgE;AAChE,2CAAmD;AAGnD;;;;GAIG;AACU,QAAA,OAAO,GAAuB,CAAC,GAAQ,EAAE,EAAE;IACtD,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,IAAI;QACF,eAAe,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC;KAC3D;IAAC,WAAM,GAAE;IAEV,MAAM,kBAAkB,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAEzD,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,kBAAkB,CAAC,CAAC;IAC5D,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,kBAAgB,CAAC,IAAI,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,gBAAc,CAAC,CAAC;IACxD,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,eAAe,CAAC,CAAC;IACzD,OAAO,CAAC,GAAG,CAAC,yBAAyB,GAAG,oBAAU,CAAC,CAAC;AACtD,CAAC,CAAC","sourcesContent":["import { VERSION as ROLLUP_VERSION } from 'rollup';\nimport { VERSION as COMPILER_VERSION } from '@angular/compiler';\nimport { version as TS_VERSION } from 'typescript';\nimport { Command } from './command';\n\n/**\n * Prints version information.\n *\n * @stable\n */\nexport const version: Command<any, void> = (pkg: any) => {\n let TSICKLE_VERSION = '';\n try {\n TSICKLE_VERSION = require('tsickle/package.json').version;\n } catch {}\n\n const NG_PACKAGR_VERSION = pkg ? pkg.version : 'unknown';\n\n console.log(`ng-packagr: ` + NG_PACKAGR_VERSION);\n console.log(`@angular/compiler: ` + COMPILER_VERSION.full);\n console.log(`rollup: ` + ROLLUP_VERSION);\n console.log(`tsickle: ` + TSICKLE_VERSION);\n console.log(`typescript: ` + TS_VERSION);\n};\n"]}
|
package/lib/flatten/rollup.js
CHANGED
|
@@ -28,7 +28,15 @@ function rollupBundleFile(opts) {
|
|
|
28
28
|
external: moduleId => externalModuleIdStrategy.isExternalDependency(moduleId),
|
|
29
29
|
inlineDynamicImports: false,
|
|
30
30
|
input: opts.entry,
|
|
31
|
-
plugins: [
|
|
31
|
+
plugins: [
|
|
32
|
+
rollupJson(),
|
|
33
|
+
// @ts-ignore
|
|
34
|
+
nodeResolve(),
|
|
35
|
+
// @ts-ignore
|
|
36
|
+
commonJs(),
|
|
37
|
+
sourcemaps(),
|
|
38
|
+
{ transform: opts.transform }
|
|
39
|
+
],
|
|
32
40
|
onwarn: warning => {
|
|
33
41
|
if (typeof warning === 'string') {
|
|
34
42
|
log.warn(warning);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollup.js","sourceRoot":"","sources":["../../../src/lib/flatten/rollup.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,uDAAuD;AACvD,mDAAmD;AACnD,iDAAiD;AACjD,mCAAmC;AACnC,+EAAyF;AACzF,qEAA+D;AAE/D,uCAA8C;AAmB9C,mEAAmE;AACnE,SAAsB,gBAAgB,CAAC,IAAmB;;QACxD,GAAG,CAAC,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAExF,MAAM,wBAAwB,GAAG,IAAI,sDAAwB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAEhG,oBAAoB;QACpB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;YACjC,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,wBAAwB,CAAC,oBAAoB,CAAC,QAAQ,CAAC;YAC7E,oBAAoB,EAAE,KAAK;YAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"rollup.js","sourceRoot":"","sources":["../../../src/lib/flatten/rollup.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,iCAAiC;AACjC,0DAA0D;AAC1D,uDAAuD;AACvD,mDAAmD;AACnD,iDAAiD;AACjD,mCAAmC;AACnC,+EAAyF;AACzF,qEAA+D;AAE/D,uCAA8C;AAmB9C,mEAAmE;AACnE,SAAsB,gBAAgB,CAAC,IAAmB;;QACxD,GAAG,CAAC,KAAK,CAAC,YAAY,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAExF,MAAM,wBAAwB,GAAG,IAAI,sDAAwB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QAEhG,oBAAoB;QACpB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;YACjC,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,wBAAwB,CAAC,oBAAoB,CAAC,QAAQ,CAAC;YAC7E,oBAAoB,EAAE,KAAK;YAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE;gBACP,UAAU,EAAE;gBACZ,aAAa;gBACb,WAAW,EAAE;gBACb,aAAa;gBACb,QAAQ,EAAE;gBACV,UAAU,EAAE;gBACZ,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE;aAC9B;YACD,MAAM,EAAE,OAAO,CAAC,EAAE;gBAChB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;oBAC/B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACnB;qBAAM;oBACL,IAAI,OAAO,CAAC,IAAI,KAAK,mBAAmB,EAAE;wBACxC,OAAO;qBACR;oBAED,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;iBAC3B;YACH,CAAC;YACD,gBAAgB,EAAE,IAAI;SACvB,CAAC,CAAC;QAEH,4BAA4B;QAC5B,MAAM,MAAM,CAAC,KAAK,CAAC;YACjB,IAAI,EAAE,IAAI,CAAC,UAAU;YACrB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,QAAQ,CAAC,EAAE,CAAC,4CAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;YAC3E,SAAS,EAAE,IAAI;YACf,sBAAsB,EAAE,CAAC,UAAkB,EAAE,EAAE;gBAC7C,UAAU,GAAG,qBAAc,CAAC,UAAU,CAAC,CAAC;gBACxC,sBAAsB;gBACtB,IAAI,CAAC,UAAU,EAAE;oBACf,OAAO,UAAU,CAAC;iBACnB;gBAED,wFAAwF;gBACxF,MAAM,UAAU,GAAG,qBAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACnD,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACjD,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBACvC,OAAO,GAAG,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;iBAChG;qBAAM,IAAI,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAC9C,OAAO,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;iBAC1D;qBAAM;oBACL,OAAO,UAAU,CAAC;iBACnB;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CAAA;AA9DD,4CA8DC","sourcesContent":["import * as rollup from 'rollup';\nimport * as nodeResolve from 'rollup-plugin-node-resolve';\nimport * as sourcemaps from 'rollup-plugin-sourcemaps';\nimport * as commonJs from 'rollup-plugin-commonjs';\nimport * as rollupJson from 'rollup-plugin-json';\nimport * as log from '../util/log';\nimport { ExternalModuleIdStrategy, DependencyList } from './external-module-id-strategy';\nimport { umdModuleIdStrategy } from './umd-module-id-strategy';\nimport { TransformHook } from 'rollup';\nimport { ensureUnixPath } from '../util/path';\n\n/**\n * Options used in `ng-packagr` for writing flat bundle files.\n *\n * These options are passed through to rollup.\n */\nexport interface RollupOptions {\n moduleName: string;\n entry: string;\n format: rollup.ModuleFormat;\n dest: string;\n sourceRoot: string;\n umdModuleIds?: { [key: string]: string };\n amd?: { id: string };\n transform?: TransformHook;\n dependencyList?: DependencyList;\n}\n\n/** Runs rollup over the given entry file, writes a bundle file. */\nexport async function rollupBundleFile(opts: RollupOptions): Promise<void> {\n log.debug(`rollup (v${rollup.VERSION}) ${opts.entry} to ${opts.dest} (${opts.format})`);\n\n const externalModuleIdStrategy = new ExternalModuleIdStrategy(opts.format, opts.dependencyList);\n\n // Create the bundle\n const bundle = await rollup.rollup({\n context: 'this',\n external: moduleId => externalModuleIdStrategy.isExternalDependency(moduleId),\n inlineDynamicImports: false,\n input: opts.entry,\n plugins: [\n rollupJson(),\n // @ts-ignore\n nodeResolve(),\n // @ts-ignore\n commonJs(),\n sourcemaps(),\n { transform: opts.transform }\n ],\n onwarn: warning => {\n if (typeof warning === 'string') {\n log.warn(warning);\n } else {\n if (warning.code === 'THIS_IS_UNDEFINED') {\n return;\n }\n\n log.warn(warning.message);\n }\n },\n preserveSymlinks: true\n });\n\n // Output the bundle to disk\n await bundle.write({\n name: opts.moduleName,\n format: opts.format,\n amd: opts.amd,\n file: opts.dest,\n banner: '',\n globals: moduleId => umdModuleIdStrategy(moduleId, opts.umdModuleIds || {}),\n sourcemap: true,\n sourcemapPathTransform: (sourcePath: string) => {\n sourcePath = ensureUnixPath(sourcePath);\n // relocate sourcemaps\n if (!sourcePath) {\n return sourcePath;\n }\n\n // the replace here is because during the compilation one of the `/` gets lost sometimes\n const sourceRoot = ensureUnixPath(opts.sourceRoot);\n const mapRootUrl = sourceRoot.replace('//', '/');\n if (sourcePath.indexOf(mapRootUrl) >= 0) {\n return `${sourceRoot}${sourcePath.substr(sourcePath.indexOf(mapRootUrl) + mapRootUrl.length)}`;\n } else if (sourcePath.indexOf(sourceRoot) >= 0) {\n return sourcePath.substr(sourcePath.indexOf(mapRootUrl));\n } else {\n return sourcePath;\n }\n }\n });\n}\n"]}
|
|
@@ -33,6 +33,9 @@ const resolveUserPackage = (folderPathOrFilePath) => __awaiter(this, void 0, voi
|
|
|
33
33
|
const pathStats = yield fs_extra_1.lstat(fullPath);
|
|
34
34
|
const basePath = pathStats.isDirectory() ? fullPath : path.dirname(fullPath);
|
|
35
35
|
const packageJson = yield readConfigFile(path.join(basePath, 'package.json'));
|
|
36
|
+
if (!packageJson) {
|
|
37
|
+
throw new Error(`Cannot discover package sources at ${folderPathOrFilePath} as 'package.json' was not found.`);
|
|
38
|
+
}
|
|
36
39
|
let ngPackageJson;
|
|
37
40
|
if (packageJson['ngPackage']) {
|
|
38
41
|
// Read `ngPackage` from `package.json`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discover-packages.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/discover-packages.ts"],"names":[],"mappings":"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","sourcesContent":["import { SchemaClassFactory } from '@ngtools/json-schema';\nimport { pathExistsSync, lstat } from 'fs-extra';\nimport * as path from 'path';\nimport * as log from '../util/log';\nimport { ensureUnixPath } from '../util/path';\nimport { NgPackageConfig } from '../../ng-package.schema';\nimport { NgEntryPoint } from '../ng-package-format/entry-point';\nimport { NgPackage } from '../ng-package-format/package';\nimport { globFiles } from '../util/glob';\n\nconst ngPackageSchemaJson = require('../../ng-package.schema.json');\n\n/** Creates a SchemaClass for `NgPackageConfig` */\nconst NgPackageSchemaClass = SchemaClassFactory<NgPackageConfig>(ngPackageSchemaJson);\n\n/** Instantiates a concrete schema from `NgPackageConfig` */\nconst instantiateSchemaClass = (ngPackageJson: NgPackageConfig) => new NgPackageSchemaClass(ngPackageJson);\n\ninterface UserPackage {\n packageJson: object;\n ngPackageJson: object;\n basePath: string;\n}\n\n/**\n * Resolves a user's package by testing for 'package.json', 'ng-package.json', or 'ng-package.js'.\n *\n * @param folderPathOrFilePath A path pointing either to a file or a directory\n * @return The user's package\n */\nconst resolveUserPackage = async (folderPathOrFilePath: string): Promise<UserPackage | undefined> => {\n const readConfigFile = async (filePath: string) => (pathExistsSync(filePath) ? import(filePath) : undefined);\n const fullPath = path.resolve(folderPathOrFilePath);\n const pathStats = await lstat(fullPath);\n const basePath = pathStats.isDirectory() ? fullPath : path.dirname(fullPath);\n const packageJson = await readConfigFile(path.join(basePath, 'package.json'));\n\n let ngPackageJson: undefined | object;\n\n if (packageJson['ngPackage']) {\n // Read `ngPackage` from `package.json`\n ngPackageJson = { ...packageJson['ngPackage'] };\n } else if (pathStats.isDirectory()) {\n ngPackageJson = await readConfigFile(path.join(basePath, 'ng-package.json'));\n if (!ngPackageJson) {\n ngPackageJson = await readConfigFile(path.join(basePath, 'ng-package.js'));\n }\n } else {\n ngPackageJson = await readConfigFile(fullPath);\n }\n\n if (ngPackageJson) {\n return {\n basePath,\n packageJson,\n ngPackageJson\n };\n }\n\n if (pathStats.isDirectory()) {\n // return even if it's undefined and use defaults when it's not a file\n return undefined;\n }\n\n if (pathStats.isFile()) {\n // a project file was specified but was in valid\n if (path.basename(folderPathOrFilePath) === 'package.json') {\n throw new Error(`Cannot read a package from 'package.json' without 'ngPackage' property.`);\n }\n\n throw new Error(`Trying to read a package from unsupported file extension. Path=${folderPathOrFilePath}`);\n }\n\n throw new Error(`Cannot discover package sources at ${folderPathOrFilePath}`);\n};\n\n/** Reads a primary entry point from it's package file. */\nconst primaryEntryPoint = ({ packageJson, ngPackageJson, basePath }: UserPackage): NgEntryPoint =>\n new NgEntryPoint(packageJson, ngPackageJson, instantiateSchemaClass(ngPackageJson), basePath);\n\n/**\n * Scans `directoryPath` and sub-folders, looking for `package.json` files.\n * Similar to `find ${directoryPath} --name package.json --exec dirname {}`.\n *\n * @param directoryPath Path pointing to a directory\n * @param excludeFolder A sub-folder of `directoryPath` that is excluded from search results.\n */\nconst findSecondaryPackagesPaths = async (directoryPath: string, excludeFolder: string): Promise<string[]> => {\n const ignore = [\n '**/node_modules/**',\n '**/.git/**',\n `${path.resolve(directoryPath, excludeFolder)}/**`,\n `${directoryPath}/package.json`\n ];\n\n const filePaths = await globFiles(`${directoryPath}/**/package.json`, {\n ignore,\n cwd: directoryPath\n });\n\n return filePaths.map(path.dirname);\n};\n\n/**\n * Reads a secondary entry point from it's package file.\n *\n * @param primaryDirectoryPath A path pointing to the directory of the primary entry point.\n * @param primary The primary entry point.\n */\nconst secondaryEntryPoint = (\n primaryDirectoryPath: string,\n primary: NgEntryPoint,\n { packageJson, ngPackageJson, basePath }: UserPackage\n): NgEntryPoint => {\n if (path.resolve(basePath) === path.resolve(primaryDirectoryPath)) {\n log.error(`Cannot read secondary entry point. It's already a primary entry point. path=${basePath}`);\n throw new Error(`Secondary entry point is already a primary.`);\n }\n\n const relativeSourcePath = path.relative(primaryDirectoryPath, basePath);\n const secondaryModuleId = ensureUnixPath(`${primary.moduleId}/${relativeSourcePath}`);\n\n return new NgEntryPoint(packageJson, ngPackageJson, instantiateSchemaClass(ngPackageJson), basePath, {\n moduleId: secondaryModuleId,\n primaryDestinationPath: primary.destinationPath,\n destinationPath: path.join(primary.destinationPath, relativeSourcePath)\n });\n};\n\nexport const discoverPackages = async ({ project }: { project: string }): Promise<NgPackage> => {\n project = path.isAbsolute(project) ? project : path.resolve(project);\n\n const primaryPackage = await resolveUserPackage(project);\n const primary = primaryEntryPoint(primaryPackage);\n log.debug(`Found primary entry point: ${primary.moduleId}`);\n\n const secondaries = await findSecondaryPackagesPaths(primaryPackage.basePath, primary.$get('dest'))\n .then(folderPaths =>\n Promise.all(\n folderPaths.map(folderPath =>\n resolveUserPackage(folderPath).catch(() => {\n log.warn(`Cannot read secondary entry point at ${folderPath}. Skipping.`);\n\n return null;\n })\n )\n )\n )\n .then(secondaryPackages =>\n secondaryPackages\n .filter(value => !!value)\n .map(secondaryPackage => secondaryEntryPoint(primaryPackage.basePath, primary, secondaryPackage))\n );\n if (secondaries.length > 0) {\n log.debug(`Found secondary entry points: ${secondaries.map(e => e.moduleId).join(', ')}`);\n }\n\n return new NgPackage(primaryPackage.basePath, primary, secondaries);\n};\n"]}
|
|
1
|
+
{"version":3,"file":"discover-packages.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/discover-packages.ts"],"names":[],"mappings":"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","sourcesContent":["import { SchemaClassFactory } from '@ngtools/json-schema';\nimport { pathExistsSync, lstat } from 'fs-extra';\nimport * as path from 'path';\nimport * as log from '../util/log';\nimport { ensureUnixPath } from '../util/path';\nimport { NgPackageConfig } from '../../ng-package.schema';\nimport { NgEntryPoint } from '../ng-package-format/entry-point';\nimport { NgPackage } from '../ng-package-format/package';\nimport { globFiles } from '../util/glob';\n\nconst ngPackageSchemaJson = require('../../ng-package.schema.json');\n\n/** Creates a SchemaClass for `NgPackageConfig` */\nconst NgPackageSchemaClass = SchemaClassFactory<NgPackageConfig>(ngPackageSchemaJson);\n\n/** Instantiates a concrete schema from `NgPackageConfig` */\nconst instantiateSchemaClass = (ngPackageJson: NgPackageConfig) => new NgPackageSchemaClass(ngPackageJson);\n\ninterface UserPackage {\n packageJson: object;\n ngPackageJson: object;\n basePath: string;\n}\n\n/**\n * Resolves a user's package by testing for 'package.json', 'ng-package.json', or 'ng-package.js'.\n *\n * @param folderPathOrFilePath A path pointing either to a file or a directory\n * @return The user's package\n */\nconst resolveUserPackage = async (folderPathOrFilePath: string): Promise<UserPackage | undefined> => {\n const readConfigFile = async (filePath: string) => (pathExistsSync(filePath) ? import(filePath) : undefined);\n const fullPath = path.resolve(folderPathOrFilePath);\n const pathStats = await lstat(fullPath);\n const basePath = pathStats.isDirectory() ? fullPath : path.dirname(fullPath);\n const packageJson = await readConfigFile(path.join(basePath, 'package.json'));\n\n if (!packageJson) {\n throw new Error(`Cannot discover package sources at ${folderPathOrFilePath} as 'package.json' was not found.`);\n }\n\n let ngPackageJson: undefined | object;\n if (packageJson['ngPackage']) {\n // Read `ngPackage` from `package.json`\n ngPackageJson = { ...packageJson['ngPackage'] };\n } else if (pathStats.isDirectory()) {\n ngPackageJson = await readConfigFile(path.join(basePath, 'ng-package.json'));\n if (!ngPackageJson) {\n ngPackageJson = await readConfigFile(path.join(basePath, 'ng-package.js'));\n }\n } else {\n ngPackageJson = await readConfigFile(fullPath);\n }\n\n if (ngPackageJson) {\n return {\n basePath,\n packageJson,\n ngPackageJson\n };\n }\n\n if (pathStats.isDirectory()) {\n // return even if it's undefined and use defaults when it's not a file\n return undefined;\n }\n\n if (pathStats.isFile()) {\n // a project file was specified but was in valid\n if (path.basename(folderPathOrFilePath) === 'package.json') {\n throw new Error(`Cannot read a package from 'package.json' without 'ngPackage' property.`);\n }\n\n throw new Error(`Trying to read a package from unsupported file extension. Path=${folderPathOrFilePath}`);\n }\n\n throw new Error(`Cannot discover package sources at ${folderPathOrFilePath}`);\n};\n\n/** Reads a primary entry point from it's package file. */\nconst primaryEntryPoint = ({ packageJson, ngPackageJson, basePath }: UserPackage): NgEntryPoint =>\n new NgEntryPoint(packageJson, ngPackageJson, instantiateSchemaClass(ngPackageJson), basePath);\n\n/**\n * Scans `directoryPath` and sub-folders, looking for `package.json` files.\n * Similar to `find ${directoryPath} --name package.json --exec dirname {}`.\n *\n * @param directoryPath Path pointing to a directory\n * @param excludeFolder A sub-folder of `directoryPath` that is excluded from search results.\n */\nconst findSecondaryPackagesPaths = async (directoryPath: string, excludeFolder: string): Promise<string[]> => {\n const ignore = [\n '**/node_modules/**',\n '**/.git/**',\n `${path.resolve(directoryPath, excludeFolder)}/**`,\n `${directoryPath}/package.json`\n ];\n\n const filePaths = await globFiles(`${directoryPath}/**/package.json`, {\n ignore,\n cwd: directoryPath\n });\n\n return filePaths.map(path.dirname);\n};\n\n/**\n * Reads a secondary entry point from it's package file.\n *\n * @param primaryDirectoryPath A path pointing to the directory of the primary entry point.\n * @param primary The primary entry point.\n */\nconst secondaryEntryPoint = (\n primaryDirectoryPath: string,\n primary: NgEntryPoint,\n { packageJson, ngPackageJson, basePath }: UserPackage\n): NgEntryPoint => {\n if (path.resolve(basePath) === path.resolve(primaryDirectoryPath)) {\n log.error(`Cannot read secondary entry point. It's already a primary entry point. path=${basePath}`);\n throw new Error(`Secondary entry point is already a primary.`);\n }\n\n const relativeSourcePath = path.relative(primaryDirectoryPath, basePath);\n const secondaryModuleId = ensureUnixPath(`${primary.moduleId}/${relativeSourcePath}`);\n\n return new NgEntryPoint(packageJson, ngPackageJson, instantiateSchemaClass(ngPackageJson), basePath, {\n moduleId: secondaryModuleId,\n primaryDestinationPath: primary.destinationPath,\n destinationPath: path.join(primary.destinationPath, relativeSourcePath)\n });\n};\n\nexport const discoverPackages = async ({ project }: { project: string }): Promise<NgPackage> => {\n project = path.isAbsolute(project) ? project : path.resolve(project);\n\n const primaryPackage = await resolveUserPackage(project);\n const primary = primaryEntryPoint(primaryPackage);\n log.debug(`Found primary entry point: ${primary.moduleId}`);\n\n const secondaries = await findSecondaryPackagesPaths(primaryPackage.basePath, primary.$get('dest'))\n .then(folderPaths =>\n Promise.all(\n folderPaths.map(folderPath =>\n resolveUserPackage(folderPath).catch(() => {\n log.warn(`Cannot read secondary entry point at ${folderPath}. Skipping.`);\n\n return null;\n })\n )\n )\n )\n .then(secondaryPackages =>\n secondaryPackages\n .filter(value => !!value)\n .map(secondaryPackage => secondaryEntryPoint(primaryPackage.basePath, primary, secondaryPackage))\n );\n if (secondaries.length > 0) {\n log.debug(`Found secondary entry points: ${secondaries.map(e => e.moduleId).join(', ')}`);\n }\n\n return new NgPackage(primaryPackage.basePath, primary, secondaries);\n};\n"]}
|
|
@@ -64,9 +64,9 @@ class StylesheetProcessor {
|
|
|
64
64
|
.css.toString();
|
|
65
65
|
case '.less':
|
|
66
66
|
// this is the only way I found to make LESS sync
|
|
67
|
-
let cmd = `node
|
|
67
|
+
let cmd = `node "${require.resolve('less/bin/lessc')}" "${filePath}" --less-plugin-npm-import="prefix=~" --js`;
|
|
68
68
|
if (this.styleIncludePaths.length) {
|
|
69
|
-
cmd
|
|
69
|
+
cmd += ` --include-path="${this.styleIncludePaths.join(':')}"`;
|
|
70
70
|
}
|
|
71
71
|
return child_process_1.execSync(cmd).toString();
|
|
72
72
|
case '.styl':
|
|
@@ -87,14 +87,14 @@ class StylesheetProcessor {
|
|
|
87
87
|
}
|
|
88
88
|
createPostCssProcessor(basePath, cssUrl) {
|
|
89
89
|
log.debug(`determine browserslist for ${basePath}`);
|
|
90
|
-
const
|
|
90
|
+
const overrideBrowserslist = browserslist(undefined, { path: basePath });
|
|
91
91
|
const postCssPlugins = [];
|
|
92
92
|
if (cssUrl !== shared_1.CssUrl.none) {
|
|
93
93
|
log.debug(`postcssUrl: ${cssUrl}`);
|
|
94
94
|
postCssPlugins.push(postcssUrl({ url: cssUrl }));
|
|
95
95
|
}
|
|
96
96
|
// this is important to be executed post running `postcssUrl`
|
|
97
|
-
postCssPlugins.push(autoprefixer({
|
|
97
|
+
postCssPlugins.push(autoprefixer({ overrideBrowserslist, grid: true }), postcss_clean_1.default({
|
|
98
98
|
level: {
|
|
99
99
|
2: {
|
|
100
100
|
specialComments: false
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../src/lib/ng-v5/entry-point/resources/stylesheet-processor.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,yCAAyC;AACzC,8DAA2D;AAC3D,iDAAyC;AAEzC,YAAY;AACZ,6CAA6C;AAC7C,6CAA6C;AAC7C,kEAAkE;AAClE,mCAAmC;AACnC,0CAA0C;AAC1C,mDAA2C;AAC3C,iCAAiC;AAEjC;;;;;;;;IAQI;AACJ,IAAI,YAA6B,CAAC;AAClC,IAAI;IACF,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,6CAA6C;CACnF;AAAC,WAAM;IACN,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAChC;AAED,MAAa,mBAAmB;IAG9B,YAAqB,QAAgB,EAAW,MAAe,EAAW,iBAA4B;QAAjF,aAAQ,GAAR,QAAQ,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAS;QAAW,sBAAiB,GAAjB,iBAAiB,CAAW;QACpG,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,CAAC,QAAgB,EAAE,OAAe;QACvC,mDAAmD;QACnD,MAAM,WAAW,GAAW,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEvE,6CAA6C;QAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE;YACxD,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;SACrD,CAAC,CAAC;QAEH,4BAA4B;QAC5B,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAE3D,OAAO,MAAM,CAAC,GAAG,CAAC;IACpB,CAAC;IAEO,kBAAkB,CAAC,QAAgB,EAAE,OAAe;QAC1D,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAEnC,GAAG,CAAC,KAAK,CAAC,aAAa,GAAG,SAAS,QAAQ,EAAE,CAAC,CAAC;QAE/C,QAAQ,GAAG,EAAE;YACX,KAAK,OAAO,CAAC;YACb,KAAK,OAAO;gBACV,OAAO,YAAY;qBAChB,UAAU,CAAC;oBACV,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,OAAO;oBACb,cAAc,EAAE,OAAO,KAAK,GAAG;oBAC/B,QAAQ,EAAE,qBAAqB;oBAC/B,YAAY,EAAE,IAAI,CAAC,iBAAiB;iBACrC,CAAC;qBACD,GAAG,CAAC,QAAQ,EAAE,CAAC;YAEpB,KAAK,OAAO;gBACV,iDAAiD;gBACjD,IAAI,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"stylesheet-processor.js","sourceRoot":"","sources":["../../../../../src/lib/ng-v5/entry-point/resources/stylesheet-processor.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as log from '../../../util/log';\nimport { CssUrl } from '../../../ng-package-format/shared';\nimport { execSync } from 'child_process';\n\n// CSS Tools\nimport * as autoprefixer from 'autoprefixer';\nimport * as browserslist from 'browserslist';\nimport * as nodeSassTildeImporter from 'node-sass-tilde-importer';\nimport * as postcss from 'postcss';\nimport * as postcssUrl from 'postcss-url';\nimport postcssClean from './postcss-clean';\nimport * as stylus from 'stylus';\n\n/*\n * Please be aware of the few differences in behaviour https://github.com/sass/dart-sass/blob/master/README.md#behavioral-differences-from-ruby-sass\n * By default `npm install` will install sass.\n * To use node-sass you need to use:\n * Npm:\n * `npm install node-sass --save-dev`\n * Yarn:\n * `yarn add node-sass --dev`\n */\nlet sassComplier: any | undefined;\ntry {\n sassComplier = require('node-sass'); // Check if node-sass is explicitly included.\n} catch {\n sassComplier = require('sass');\n}\n\nexport class StylesheetProcessor {\n private postCssProcessor: postcss.Processor;\n\n constructor(readonly basePath: string, readonly cssUrl?: CssUrl, readonly styleIncludePaths?: string[]) {\n this.postCssProcessor = this.createPostCssProcessor(basePath, cssUrl);\n }\n\n process(filePath: string, content: string) {\n // Render pre-processor language (sass, styl, less)\n const renderedCss: string = this.renderPreProcessor(filePath, content);\n\n // Render postcss (autoprefixing and friends)\n const result = this.postCssProcessor.process(renderedCss, {\n from: filePath,\n to: filePath.replace(path.extname(filePath), '.css')\n });\n\n // Log warnings from postcss\n result.warnings().forEach(msg => log.warn(msg.toString()));\n\n return result.css;\n }\n\n private renderPreProcessor(filePath: string, content: string): string {\n const ext = path.extname(filePath);\n\n log.debug(`rendering ${ext} from ${filePath}`);\n\n switch (ext) {\n case '.sass':\n case '.scss':\n return sassComplier\n .renderSync({\n file: filePath,\n data: content,\n indentedSyntax: '.sass' === ext,\n importer: nodeSassTildeImporter,\n includePaths: this.styleIncludePaths\n })\n .css.toString();\n\n case '.less':\n // this is the only way I found to make LESS sync\n let cmd = `node \"${require.resolve('less/bin/lessc')}\" \"${filePath}\" --less-plugin-npm-import=\"prefix=~\" --js`;\n if (this.styleIncludePaths.length) {\n cmd += ` --include-path=\"${this.styleIncludePaths.join(':')}\"`;\n }\n\n return execSync(cmd).toString();\n\n case '.styl':\n case '.stylus':\n return (\n stylus(content)\n // add paths for resolve\n .set('paths', [this.basePath, '.', ...this.styleIncludePaths, 'node_modules'])\n // add support for resolving plugins from node_modules\n .set('filename', filePath)\n // turn on url resolver in stylus, same as flag --resolve-url\n .set('resolve url', true)\n .define('url', stylus.resolver(undefined))\n .render()\n );\n\n case '.css':\n default:\n return content;\n }\n }\n\n private createPostCssProcessor(basePath: string, cssUrl?: CssUrl): postcss.Processor {\n log.debug(`determine browserslist for ${basePath}`);\n const overrideBrowserslist = browserslist(undefined, { path: basePath });\n\n const postCssPlugins = [];\n\n if (cssUrl !== CssUrl.none) {\n log.debug(`postcssUrl: ${cssUrl}`);\n postCssPlugins.push(postcssUrl({ url: cssUrl }));\n }\n\n // this is important to be executed post running `postcssUrl`\n postCssPlugins.push(\n autoprefixer({ overrideBrowserslist, grid: true }),\n postcssClean({\n level: {\n 2: {\n specialComments: false\n }\n }\n })\n );\n\n return postcss(postCssPlugins);\n }\n}\n"]}
|
|
@@ -27,24 +27,22 @@ exports.compileNgcTransform = transform_1.transformFromPromise((graph) => __awai
|
|
|
27
27
|
const { moduleResolutionCache } = entryPoint.cache;
|
|
28
28
|
const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;
|
|
29
29
|
const stylesheetProcessor = new stylesheet_processor_1.StylesheetProcessor(basePath, cssUrl, styleIncludePaths);
|
|
30
|
-
yield
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
})
|
|
47
|
-
]);
|
|
30
|
+
yield compile_source_files_1.compileSourceFiles(graph, entryPoint, tsConfig, moduleResolutionCache, stylesheetProcessor, {
|
|
31
|
+
outDir: path.dirname(esm2015),
|
|
32
|
+
declaration: true,
|
|
33
|
+
target: ts.ScriptTarget.ES2015
|
|
34
|
+
}, path.dirname(declarations));
|
|
35
|
+
yield compile_source_files_1.compileSourceFiles(graph, entryPoint, tsConfig, moduleResolutionCache, stylesheetProcessor, {
|
|
36
|
+
outDir: path.dirname(esm5),
|
|
37
|
+
target: ts.ScriptTarget.ES5,
|
|
38
|
+
downlevelIteration: true,
|
|
39
|
+
// the options are here, to improve the build time
|
|
40
|
+
declaration: false,
|
|
41
|
+
declarationDir: undefined,
|
|
42
|
+
skipMetadataEmit: true,
|
|
43
|
+
skipTemplateCodegen: true,
|
|
44
|
+
strictMetadataEmit: false
|
|
45
|
+
});
|
|
48
46
|
return graph;
|
|
49
47
|
}));
|
|
50
48
|
//# sourceMappingURL=compile-ngc.transform.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-ngc.transform.js","sourceRoot":"","sources":["../../../../../src/lib/ng-v5/entry-point/ts/compile-ngc.transform.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6BAA6B;AAC7B,iCAAiC;AACjC,wDAA2E;AAC3E,4EAAuE;AACvE,mDAAoE;AACpE,yCAAyC;AACzC,uCAAmF;AACnF,4EAAwE;AAE3D,QAAA,mBAAmB,GAAc,gCAAoB,CAAC,CAAM,KAAK,EAAC,EAAE;IAC/E,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,8BAAsB,EAAE,CAAmB,CAAC;IAC1E,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,oBAAY,CAAqB,CAAC;IACnE,sCAAsC;IACtC,MAAM,QAAQ,GAAG,uCAA4B,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAErF,6BAA6B;IAC7B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC;IACzE,MAAM,EAAE,qBAAqB,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;IACnD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;IAC3E,MAAM,mBAAmB,GAAG,IAAI,0CAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAEzF,MAAM,
|
|
1
|
+
{"version":3,"file":"compile-ngc.transform.js","sourceRoot":"","sources":["../../../../../src/lib/ng-v5/entry-point/ts/compile-ngc.transform.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,6BAA6B;AAC7B,iCAAiC;AACjC,wDAA2E;AAC3E,4EAAuE;AACvE,mDAAoE;AACpE,yCAAyC;AACzC,uCAAmF;AACnF,4EAAwE;AAE3D,QAAA,mBAAmB,GAAc,gCAAoB,CAAC,CAAM,KAAK,EAAC,EAAE;IAC/E,GAAG,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,8BAAsB,EAAE,CAAmB,CAAC;IAC1E,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,oBAAY,CAAqB,CAAC;IACnE,sCAAsC;IACtC,MAAM,QAAQ,GAAG,uCAA4B,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAErF,6BAA6B;IAC7B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC;IACzE,MAAM,EAAE,qBAAqB,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC;IACnD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;IAC3E,MAAM,mBAAmB,GAAG,IAAI,0CAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAEzF,MAAM,yCAAkB,CACtB,KAAK,EACL,UAAU,EACV,QAAQ,EACR,qBAAqB,EACrB,mBAAmB,EACnB;QACE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAC7B,WAAW,EAAE,IAAI;QACjB,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM;KAC/B,EACD,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAC3B,CAAC;IAEF,MAAM,yCAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,qBAAqB,EAAE,mBAAmB,EAAE;QAChG,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG;QAC3B,kBAAkB,EAAE,IAAI;QACxB,kDAAkD;QAClD,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,SAAS;QACzB,gBAAgB,EAAE,IAAI;QACtB,mBAAmB,EAAE,IAAI;QACzB,kBAAkB,EAAE,KAAK;KAC1B,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC,CAAA,CAAC,CAAC","sourcesContent":["import * as path from 'path';\nimport * as ts from 'typescript';\nimport { Transform, transformFromPromise } from '../../../brocc/transform';\nimport { compileSourceFiles } from '../../../ngc/compile-source-files';\nimport { setDependenciesTsConfigPaths } from '../../../ts/tsconfig';\nimport * as log from '../../../util/log';\nimport { isEntryPointInProgress, EntryPointNode, isEntryPoint } from '../../nodes';\nimport { StylesheetProcessor } from '../resources/stylesheet-processor';\n\nexport const compileNgcTransform: Transform = transformFromPromise(async graph => {\n log.info(`Compiling TypeScript sources through ngc`);\n const entryPoint = graph.find(isEntryPointInProgress()) as EntryPointNode;\n const entryPoints = graph.filter(isEntryPoint) as EntryPointNode[];\n // Add paths mappings for dependencies\n const tsConfig = setDependenciesTsConfigPaths(entryPoint.data.tsConfig, entryPoints);\n\n // Compile TypeScript sources\n const { esm2015, esm5, declarations } = entryPoint.data.destinationFiles;\n const { moduleResolutionCache } = entryPoint.cache;\n const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;\n const stylesheetProcessor = new StylesheetProcessor(basePath, cssUrl, styleIncludePaths);\n\n await compileSourceFiles(\n graph,\n entryPoint,\n tsConfig,\n moduleResolutionCache,\n stylesheetProcessor,\n {\n outDir: path.dirname(esm2015),\n declaration: true,\n target: ts.ScriptTarget.ES2015\n },\n path.dirname(declarations)\n );\n\n await compileSourceFiles(graph, entryPoint, tsConfig, moduleResolutionCache, stylesheetProcessor, {\n outDir: path.dirname(esm5),\n target: ts.ScriptTarget.ES5,\n downlevelIteration: true,\n // the options are here, to improve the build time\n declaration: false,\n declarationDir: undefined,\n skipMetadataEmit: true,\n skipTemplateCodegen: true,\n strictMetadataEmit: false\n });\n\n return graph;\n});\n"]}
|
|
@@ -97,12 +97,14 @@ function writePackageJson(entryPoint, pkg, additionalProperties) {
|
|
|
97
97
|
throw e;
|
|
98
98
|
}
|
|
99
99
|
// Removes scripts from package.json after build
|
|
100
|
-
if (
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
100
|
+
if (packageJson.scripts) {
|
|
101
|
+
if (pkg.keepLifecycleScripts !== true) {
|
|
102
|
+
log.info(`Removing scripts section in package.json as it's considered a potential security vulnerability.`);
|
|
103
|
+
delete packageJson.scripts;
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
log.warn(`You enabled keepLifecycleScripts explicitly. The scripts section in package.json will be published to npm.`);
|
|
107
|
+
}
|
|
106
108
|
}
|
|
107
109
|
// keep the dist package.json clean
|
|
108
110
|
// this will not throw if ngPackage field does not exist
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../src/lib/ng-v5/entry-point/write-package.transform.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,+BAA+B;AAC/B,6BAA6B;AAC7B,qDAAwE;AAGxE,0CAAiD;AACjD,8CAA2C;AAC3C,sCAAsC;AACtC,0CAA4C;AAC5C,oCAAkE;AAClE,0CAA2C;AAE9B,QAAA,qBAAqB,GAAc,gCAAoB,CAAC,CAAM,KAAK,EAAC,EAAE;IACjF,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,8BAAsB,EAAE,CAAmB,CAAC;IAC1E,MAAM,YAAY,GAAiB,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;IAC9D,MAAM,SAAS,GAAc,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,wBAAwB,CAAC,CAAC,IAAI,CAAC;IAC7F,MAAM,EAAE,gBAAgB,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC;IAE7C,sCAAsC;IACtC,GAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IACtC,6FAA6F;IAC7F,MAAM,gBAAgB,GAAG,MAAM,gBAAS,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,YAAY,EAAE;QAChG,MAAM,EAAE,CAAC,oBAAoB,EAAE,GAAG,SAAS,CAAC,IAAI,KAAK,CAAC;KACvD,CAAC,CAAC;IAEH,IAAI,gBAAgB,CAAC,MAAM,EAAE;QAC3B,MAAM,OAAO,CAAC,GAAG,CACf,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YAC3B,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;YACtE,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;YAC9E,OAAO,eAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACtC,CAAC,CAAC,CACH,CAAC;KACH;IAED,wBAAwB;IACxB,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACrC,MAAM,wBAAwB,GAAG,CAAC,QAAgB,EAAE,EAAE,CACpD,qBAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;IAExE,MAAM,gBAAgB,CAAC,YAAY,EAAE,SAAS,EAAE;QAC9C,IAAI,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,GAAG,CAAC;QACpD,MAAM,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,KAAK,CAAC;QACxD,MAAM,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAC3D,IAAI,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACrD,OAAO,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,OAAO,CAAC;QAC3D,KAAK,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,KAAK,CAAC;QACvD,QAAQ,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAC7D,OAAO,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,YAAY,CAAC;QAChE,4EAA4E;QAC5E,QAAQ,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAC7D,gFAAgF;QAChF,WAAW,EAAE,YAAY,CAAC,WAAW;KACtC,CAAC,CAAC;IAEH,GAAG,CAAC,OAAO,CAAC,SAAS,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE9C,OAAO,KAAK,CAAC;AACf,CAAC,CAAA,CAAC,CAAC;AAEH;;;;;;;;;;;;;;GAcG;AACH,SAAsB,gBAAgB,CACpC,UAAwB,EACxB,GAAc,EACd,oBAAoE;;QAEpE,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAElC,4BAA4B;QAC5B,MAAM,WAAW,qBAAQ,UAAU,CAAC,WAAW,EAAK,oBAAoB,CAAE,CAAC;QAE3E,gEAAgE;QAChE,8EAA8E;QAC9E,mFAAmF;QACnF,oCAAoC;QACpC,IAAI,CAAC,UAAU,CAAC,qBAAqB,IAAI,CAAC,CAAC,WAAW,CAAC,YAAY,IAAI,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YACtG,MAAM,EAAE,YAAY,EAAE,mBAAmB,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;YAC7F,MAAM,YAAY,GAAG,mBAAmB,CAAC,KAAK,CAAC;YAE/C,IAAI,YAAY,EAAE;gBAChB,WAAW,CAAC,YAAY,qBACnB,WAAW,CAAC,YAAY,IAC3B,KAAK,EAAE,YAAY,GACpB,CAAC;aACH;SACF;QAED,iGAAiG;QACjG,+CAA+C;QAC/C,MAAM,SAAS,GAAG,GAAG,CAAC,8BAA8B,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACrF,IAAI;YACF,wBAAwB,CAAC,WAAW,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;SAClE;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,eAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;YACzC,MAAM,CAAC,CAAC;SACT;QAED,gDAAgD;QAChD,IAAI,GAAG,CAAC,oBAAoB,KAAK,IAAI,EAAE;YACrC,GAAG,CAAC,IAAI,CAAC,iGAAiG,CAAC,CAAC;YAC5G,OAAO,WAAW,CAAC,OAAO,CAAC;SAC5B;aAAM;YACL,GAAG,CAAC,IAAI,CACN,4GAA4G,CAC7G,CAAC;SACH;QAED,mCAAmC;QACnC,wDAAwD;QACxD,OAAO,WAAW,CAAC,SAAS,CAAC;QAC7B,WAAW,CAAC,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC;QAEvC,wEAAwE;QACxE,kFAAkF;QAClF,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IACzG,CAAC;CAAA;AAtDD,4CAsDC;AAED,SAAS,wBAAwB,CAAC,WAAmC,EAAE,QAAgB,EAAE,SAAmB;IAC1G,IAAI,WAAW,CAAC,QAAQ,CAAC,EAAE;QACzB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC/C,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC5C,GAAG,CAAC,KAAK,CAAC,cAAc,GAAG,uBAAuB,QAAQ,GAAG,CAAC,CAAC;aAChE;iBAAM;gBACL,GAAG,CAAC,IAAI,CACN,mCAAmC,QAAQ,gDAAgD,GAAG,6CAA6C,QAAQ,IAAI,CACxJ,CAAC;gBACF,MAAM,IAAI,KAAK,CAAC,cAAc,GAAG,kCAAkC,CAAC,CAAC;aACtE;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC","sourcesContent":["import * as fs from 'fs-extra';\nimport * as path from 'path';\nimport { Transform, transformFromPromise } from '../../brocc/transform';\nimport { NgEntryPoint } from '../../ng-package-format/entry-point';\nimport { NgPackage } from '../../ng-package-format/package';\nimport { ensureUnixPath } from '../../util/path';\nimport { rimraf } from '../../util/rimraf';\nimport * as log from '../../util/log';\nimport { globFiles } from '../../util/glob';\nimport { EntryPointNode, isEntryPointInProgress } from '../nodes';\nimport { copyFile } from '../../util/copy';\n\nexport const writePackageTransform: Transform = transformFromPromise(async graph => {\n const entryPoint = graph.find(isEntryPointInProgress()) as EntryPointNode;\n const ngEntryPoint: NgEntryPoint = entryPoint.data.entryPoint;\n const ngPackage: NgPackage = graph.find(node => node.type === 'application/ng-package').data;\n const { destinationFiles } = entryPoint.data;\n\n // 5. COPY SOURCE FILES TO DESTINATION\n log.info('Copying declaration files');\n // we don't want to copy `dist` and 'node_modules' declaration files but only files in source\n const declarationFiles = await globFiles(`${path.dirname(ngEntryPoint.entryFilePath)}/**/*.d.ts`, {\n ignore: ['**/node_modules/**', `${ngPackage.dest}/**`]\n });\n\n if (declarationFiles.length) {\n await Promise.all(\n declarationFiles.map(value => {\n const relativePath = path.relative(ngEntryPoint.entryFilePath, value);\n const destination = path.resolve(destinationFiles.declarations, relativePath);\n return copyFile(value, destination);\n })\n );\n }\n\n // 6. WRITE PACKAGE.JSON\n log.info('Writing package metadata');\n const relativeUnixFromDestPath = (filePath: string) =>\n ensureUnixPath(path.relative(ngEntryPoint.destinationPath, filePath));\n\n await writePackageJson(ngEntryPoint, ngPackage, {\n main: relativeUnixFromDestPath(destinationFiles.umd),\n module: relativeUnixFromDestPath(destinationFiles.fesm5),\n es2015: relativeUnixFromDestPath(destinationFiles.fesm2015),\n esm5: relativeUnixFromDestPath(destinationFiles.esm5),\n esm2015: relativeUnixFromDestPath(destinationFiles.esm2015),\n fesm5: relativeUnixFromDestPath(destinationFiles.fesm5),\n fesm2015: relativeUnixFromDestPath(destinationFiles.fesm2015),\n typings: relativeUnixFromDestPath(destinationFiles.declarations),\n // XX 'metadata' property in 'package.json' is non-standard. Keep it anyway?\n metadata: relativeUnixFromDestPath(destinationFiles.metadata),\n // webpack v4+ specific flag to enable advanced optimizations and code splitting\n sideEffects: ngEntryPoint.sideEffects\n });\n\n log.success(`Built ${ngEntryPoint.moduleId}`);\n\n return graph;\n});\n\n/**\n * Creates and writes a `package.json` file of the entry point used by the `node_module`\n * resolution strategies.\n *\n * #### Example\n *\n * A consumer of the entry point depends on it by `import {..} from '@my/module/id';`.\n * The module id `@my/module/id` will be resolved to the `package.json` file that is written by\n * this build step.\n * The properties `main`, `module`, `typings` (and so on) in the `package.json` point to the\n * flattened JavaScript bundles, type definitions, (...).\n *\n * @param entryPoint An entry point of an Angular package / library\n * @param additionalProperties Additional properties, e.g. binary artefacts (bundle files), to merge into `package.json`\n */\nexport async function writePackageJson(\n entryPoint: NgEntryPoint,\n pkg: NgPackage,\n additionalProperties: { [key: string]: string | boolean | string[] }\n): Promise<void> {\n log.debug('Writing package.json');\n\n // set additional properties\n const packageJson = { ...entryPoint.packageJson, ...additionalProperties };\n\n // read tslib version from `@angular/compiler` so that our tslib\n // version at least matches that of angular if we use require('tslib').version\n // it will get what installed and not the minimum version nor if it is a `~` or `^`\n // this is only required for primary\n if (!entryPoint.isSecondaryEntryPoint && !(packageJson.dependencies && packageJson.dependencies.tslib)) {\n const { dependencies: angularDependencies = {} } = require('@angular/compiler/package.json');\n const tsLibVersion = angularDependencies.tslib;\n\n if (tsLibVersion) {\n packageJson.dependencies = {\n ...packageJson.dependencies,\n tslib: tsLibVersion\n };\n }\n }\n\n // Verify non-peerDependencies as they can easily lead to duplicate installs or version conflicts\n // in the node_modules folder of an application\n const whitelist = pkg.whitelistedNonPeerDependencies.map(value => new RegExp(value));\n try {\n checkNonPeerDependencies(packageJson, 'dependencies', whitelist);\n } catch (e) {\n await rimraf(entryPoint.destinationPath);\n throw e;\n }\n\n // Removes scripts from package.json after build\n if (pkg.keepLifecycleScripts !== true) {\n log.info(`Removing scripts section in package.json as it's considered a potential security vulnerability.`);\n delete packageJson.scripts;\n } else {\n log.warn(\n `You enabled keepLifecycleScripts explicitly. The scripts section in package.json will be published to npm.`\n );\n }\n\n // keep the dist package.json clean\n // this will not throw if ngPackage field does not exist\n delete packageJson.ngPackage;\n packageJson.name = entryPoint.moduleId;\n\n // `outputJson()` creates intermediate directories, if they do not exist\n // -- https://github.com/jprichardson/node-fs-extra/blob/master/docs/outputJson.md\n await fs.outputJson(path.join(entryPoint.destinationPath, 'package.json'), packageJson, { spaces: 2 });\n}\n\nfunction checkNonPeerDependencies(packageJson: { [key: string]: any }, property: string, whitelist: RegExp[]) {\n if (packageJson[property]) {\n Object.keys(packageJson[property]).forEach(dep => {\n if (whitelist.find(regex => regex.test(dep))) {\n log.debug(`Dependency ${dep} is whitelisted in '${property}'`);\n } else {\n log.warn(\n `Distributing npm packages with '${property}' is not recommended. Please consider adding ${dep} to 'peerDependencies' or remove it from '${property}'.`\n );\n throw new Error(`Dependency ${dep} must be explicitly whitelisted.`);\n }\n });\n }\n}\n"]}
|
|
1
|
+
{"version":3,"file":"write-package.transform.js","sourceRoot":"","sources":["../../../../src/lib/ng-v5/entry-point/write-package.transform.ts"],"names":[],"mappings":"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","sourcesContent":["import * as fs from 'fs-extra';\nimport * as path from 'path';\nimport { Transform, transformFromPromise } from '../../brocc/transform';\nimport { NgEntryPoint } from '../../ng-package-format/entry-point';\nimport { NgPackage } from '../../ng-package-format/package';\nimport { ensureUnixPath } from '../../util/path';\nimport { rimraf } from '../../util/rimraf';\nimport * as log from '../../util/log';\nimport { globFiles } from '../../util/glob';\nimport { EntryPointNode, isEntryPointInProgress } from '../nodes';\nimport { copyFile } from '../../util/copy';\n\nexport const writePackageTransform: Transform = transformFromPromise(async graph => {\n const entryPoint = graph.find(isEntryPointInProgress()) as EntryPointNode;\n const ngEntryPoint: NgEntryPoint = entryPoint.data.entryPoint;\n const ngPackage: NgPackage = graph.find(node => node.type === 'application/ng-package').data;\n const { destinationFiles } = entryPoint.data;\n\n // 5. COPY SOURCE FILES TO DESTINATION\n log.info('Copying declaration files');\n // we don't want to copy `dist` and 'node_modules' declaration files but only files in source\n const declarationFiles = await globFiles(`${path.dirname(ngEntryPoint.entryFilePath)}/**/*.d.ts`, {\n ignore: ['**/node_modules/**', `${ngPackage.dest}/**`]\n });\n\n if (declarationFiles.length) {\n await Promise.all(\n declarationFiles.map(value => {\n const relativePath = path.relative(ngEntryPoint.entryFilePath, value);\n const destination = path.resolve(destinationFiles.declarations, relativePath);\n return copyFile(value, destination);\n })\n );\n }\n\n // 6. WRITE PACKAGE.JSON\n log.info('Writing package metadata');\n const relativeUnixFromDestPath = (filePath: string) =>\n ensureUnixPath(path.relative(ngEntryPoint.destinationPath, filePath));\n\n await writePackageJson(ngEntryPoint, ngPackage, {\n main: relativeUnixFromDestPath(destinationFiles.umd),\n module: relativeUnixFromDestPath(destinationFiles.fesm5),\n es2015: relativeUnixFromDestPath(destinationFiles.fesm2015),\n esm5: relativeUnixFromDestPath(destinationFiles.esm5),\n esm2015: relativeUnixFromDestPath(destinationFiles.esm2015),\n fesm5: relativeUnixFromDestPath(destinationFiles.fesm5),\n fesm2015: relativeUnixFromDestPath(destinationFiles.fesm2015),\n typings: relativeUnixFromDestPath(destinationFiles.declarations),\n // XX 'metadata' property in 'package.json' is non-standard. Keep it anyway?\n metadata: relativeUnixFromDestPath(destinationFiles.metadata),\n // webpack v4+ specific flag to enable advanced optimizations and code splitting\n sideEffects: ngEntryPoint.sideEffects\n });\n\n log.success(`Built ${ngEntryPoint.moduleId}`);\n\n return graph;\n});\n\n/**\n * Creates and writes a `package.json` file of the entry point used by the `node_module`\n * resolution strategies.\n *\n * #### Example\n *\n * A consumer of the entry point depends on it by `import {..} from '@my/module/id';`.\n * The module id `@my/module/id` will be resolved to the `package.json` file that is written by\n * this build step.\n * The properties `main`, `module`, `typings` (and so on) in the `package.json` point to the\n * flattened JavaScript bundles, type definitions, (...).\n *\n * @param entryPoint An entry point of an Angular package / library\n * @param additionalProperties Additional properties, e.g. binary artefacts (bundle files), to merge into `package.json`\n */\nexport async function writePackageJson(\n entryPoint: NgEntryPoint,\n pkg: NgPackage,\n additionalProperties: { [key: string]: string | boolean | string[] }\n): Promise<void> {\n log.debug('Writing package.json');\n\n // set additional properties\n const packageJson = { ...entryPoint.packageJson, ...additionalProperties };\n\n // read tslib version from `@angular/compiler` so that our tslib\n // version at least matches that of angular if we use require('tslib').version\n // it will get what installed and not the minimum version nor if it is a `~` or `^`\n // this is only required for primary\n if (!entryPoint.isSecondaryEntryPoint && !(packageJson.dependencies && packageJson.dependencies.tslib)) {\n const { dependencies: angularDependencies = {} } = require('@angular/compiler/package.json');\n const tsLibVersion = angularDependencies.tslib;\n\n if (tsLibVersion) {\n packageJson.dependencies = {\n ...packageJson.dependencies,\n tslib: tsLibVersion\n };\n }\n }\n\n // Verify non-peerDependencies as they can easily lead to duplicate installs or version conflicts\n // in the node_modules folder of an application\n const whitelist = pkg.whitelistedNonPeerDependencies.map(value => new RegExp(value));\n try {\n checkNonPeerDependencies(packageJson, 'dependencies', whitelist);\n } catch (e) {\n await rimraf(entryPoint.destinationPath);\n throw e;\n }\n\n // Removes scripts from package.json after build\n if (packageJson.scripts) {\n if (pkg.keepLifecycleScripts !== true) {\n log.info(`Removing scripts section in package.json as it's considered a potential security vulnerability.`);\n delete packageJson.scripts;\n } else {\n log.warn(\n `You enabled keepLifecycleScripts explicitly. The scripts section in package.json will be published to npm.`\n );\n }\n }\n\n // keep the dist package.json clean\n // this will not throw if ngPackage field does not exist\n delete packageJson.ngPackage;\n packageJson.name = entryPoint.moduleId;\n\n // `outputJson()` creates intermediate directories, if they do not exist\n // -- https://github.com/jprichardson/node-fs-extra/blob/master/docs/outputJson.md\n await fs.outputJson(path.join(entryPoint.destinationPath, 'package.json'), packageJson, { spaces: 2 });\n}\n\nfunction checkNonPeerDependencies(packageJson: { [key: string]: any }, property: string, whitelist: RegExp[]) {\n if (packageJson[property]) {\n Object.keys(packageJson[property]).forEach(dep => {\n if (whitelist.find(regex => regex.test(dep))) {\n log.debug(`Dependency ${dep} is whitelisted in '${property}'`);\n } else {\n log.warn(\n `Distributing npm packages with '${property}' is not recommended. Please consider adding ${dep} to 'peerDependencies' or remove it from '${property}'.`\n );\n throw new Error(`Dependency ${dep} must be explicitly whitelisted.`);\n }\n });\n }\n}\n"]}
|
|
@@ -130,7 +130,7 @@ const buildTransformFactory = (project, analyseSourcesTransform, entryPointTrans
|
|
|
130
130
|
};
|
|
131
131
|
const writeNpmPackage = (pkgUri) => rxjs_1.pipe(operators_1.switchMap(graph => {
|
|
132
132
|
const { data } = graph.get(pkgUri);
|
|
133
|
-
const filesToCopy = Promise.all([`${data.src}/LICENSE`, `${data.src}/README.md`].map(src => copy_1.copyFile(src, path.join(data.dest, path.basename(src)))));
|
|
133
|
+
const filesToCopy = Promise.all([`${data.src}/LICENSE`, `${data.src}/README.md`].map(src => copy_1.copyFile(src, path.join(data.dest, path.basename(src)), { dereference: true })));
|
|
134
134
|
return rxjs_1.from(filesToCopy).pipe(operators_1.map(() => graph));
|
|
135
135
|
}));
|
|
136
136
|
const scheduleEntryPoints = (epTransform) => rxjs_1.pipe(operators_1.concatMap(graph => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package.transform.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/package.transform.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport { Observable, of as observableOf, pipe, NEVER, from } from 'rxjs';\nimport {\n concatMap,\n map,\n switchMap,\n tap,\n mapTo,\n catchError,\n startWith,\n debounceTime,\n filter,\n takeLast,\n defaultIfEmpty\n} from 'rxjs/operators';\nimport { BuildGraph } from '../brocc/build-graph';\nimport { DepthBuilder } from '../brocc/depth';\nimport { STATE_IN_PROGESS } from '../brocc/node';\nimport { Transform } from '../brocc/transform';\nimport * as log from '../util/log';\nimport { rimraf } from '../util/rimraf';\nimport {\n PackageNode,\n EntryPointNode,\n ngUrl,\n isEntryPoint,\n byEntryPoint,\n isPackage,\n fileUrl,\n fileUrlPath\n} from './nodes';\nimport { discoverPackages } from './discover-packages';\nimport { createFileWatch } from '../file/file-watcher';\nimport { NgPackagrOptions } from './options.di';\nimport { flatten } from '../util/array';\nimport { copyFile } from '../util/copy';\nimport { ensureUnixPath } from '../util/path';\n\n/**\n * A transformation for building an npm package:\n *\n * - discoverPackages\n * - options\n * - initTsConfig\n * - analyzeTsSources (thereby extracting template and stylesheet files)\n * - for each entry point\n * - run the entryPontTransform\n * - writeNpmPackage\n *\n * @param project Project token, reference to `ng-package.json`\n * @param options ng-packagr options\n * @param initTsConfigTransform Transformation initializing the tsconfig of each entry point.\n * @param analyseSourcesTransform Transformation analyzing the typescript source files of each entry point.\n * @param entryPointTransform Transformation for asset rendering and compilation of a single entry point.\n */\nexport const packageTransformFactory = (\n project: string,\n options: NgPackagrOptions,\n initTsConfigTransform: Transform,\n analyseSourcesTransform: Transform,\n entryPointTransform: Transform\n) => (source$: Observable<BuildGraph>): Observable<BuildGraph> => {\n const pkgUri = ngUrl(project);\n\n const buildTransform = options.watch\n ? watchTransformFactory(project, options, analyseSourcesTransform, entryPointTransform)\n : buildTransformFactory(project, analyseSourcesTransform, entryPointTransform);\n\n return source$.pipe(\n tap(() => log.info(`Building Angular Package`)),\n // Discover packages and entry points\n switchMap(graph => {\n const pkg = discoverPackages({ project });\n\n return from(pkg).pipe(\n map(value => {\n const ngPkg = new PackageNode(pkgUri);\n ngPkg.data = value;\n\n return graph.put(ngPkg);\n })\n );\n }),\n // Clean the primary dest folder (should clean all secondary sub-directory, as well)\n switchMap(\n graph => {\n const { dest, deleteDestPath } = graph.get(pkgUri).data;\n return from(deleteDestPath ? rimraf(dest) : Promise.resolve());\n },\n (graph, _) => graph\n ),\n // Add entry points to graph\n map(graph => {\n const ngPkg = graph.get(pkgUri) as PackageNode;\n const entryPoints = [ngPkg.data.primary, ...ngPkg.data.secondaries].map(entryPoint => {\n const { destinationFiles, moduleId } = entryPoint;\n const node = new EntryPointNode(\n ngUrl(moduleId),\n ngPkg.cache.sourcesFileCache,\n ngPkg.cache.analysisSourcesFileCache\n );\n node.data = { entryPoint, destinationFiles };\n node.state = 'dirty';\n ngPkg.dependsOn(node);\n\n return node;\n });\n\n return graph.put(entryPoints);\n }),\n // Initialize the tsconfig for each entry point\n initTsConfigTransform,\n // perform build\n buildTransform\n );\n};\n\nconst watchTransformFactory = (\n project: string,\n _options: NgPackagrOptions,\n analyseSourcesTransform: Transform,\n entryPointTransform: Transform\n) => (source$: Observable<BuildGraph>): Observable<BuildGraph> => {\n const CompleteWaitingForFileChange = '\\nCompilation complete. Watching for file changes...';\n const FileChangeDetected = '\\nFile change detected. Starting incremental compilation...';\n const FailedWaitingForFileChange = '\\nCompilation failed. Watching for file changes...';\n\n return source$.pipe(\n switchMap(graph => {\n const { data, cache } = graph.find(isPackage) as PackageNode;\n return createFileWatch(data.src, [data.dest]).pipe(\n tap(fileChange => {\n const { filePath } = fileChange;\n const { sourcesFileCache, analysisSourcesFileCache } = cache;\n const cachedSourceFile = sourcesFileCache.get(filePath);\n\n if (!cachedSourceFile) {\n return;\n }\n\n const { declarationFileName } = cachedSourceFile;\n\n const uriToClean = [filePath, declarationFileName].map(x => fileUrl(ensureUnixPath(x)));\n let nodesToClean = graph.filter(node => uriToClean.some(uri => uri === node.url));\n\n nodesToClean = flatten([\n ...nodesToClean,\n // if a non ts file changes we need to clean up it's direct dependees\n // this is mainly done for resources such as html and css\n ...nodesToClean.filter(x => !x.url.endsWith('.ts')).map(x => x.dependees)\n ]);\n\n // delete node that changes\n nodesToClean.forEach(node => {\n analysisSourcesFileCache.delete(fileUrlPath(node.url));\n sourcesFileCache.delete(fileUrlPath(node.url));\n });\n\n const entryPoints = graph.filter(isEntryPoint) as EntryPointNode[];\n entryPoints.forEach(entryPoint => {\n const isDirty = entryPoint.dependents.some(x => nodesToClean.some(node => node.url === x.url));\n if (isDirty) {\n entryPoint.state = 'dirty';\n const { metadata } = entryPoint.data.destinationFiles;\n sourcesFileCache.delete(metadata);\n }\n });\n }),\n debounceTime(200),\n tap(() => log.msg(FileChangeDetected)),\n startWith(undefined),\n mapTo(graph)\n );\n }),\n switchMap(graph => {\n return observableOf(graph).pipe(\n buildTransformFactory(project, analyseSourcesTransform, entryPointTransform),\n tap(() => log.msg(CompleteWaitingForFileChange)),\n catchError(error => {\n log.error(error);\n log.msg(FailedWaitingForFileChange);\n return NEVER;\n })\n );\n })\n );\n};\n\nconst buildTransformFactory = (project: string, analyseSourcesTransform: Transform, entryPointTransform: Transform) => (\n source$: Observable<BuildGraph>\n): Observable<BuildGraph> => {\n const pkgUri = ngUrl(project);\n return source$.pipe(\n // Analyse dependencies and external resources for each entry point\n analyseSourcesTransform,\n // Next, run through the entry point transformation (assets rendering, code compilation)\n scheduleEntryPoints(entryPointTransform),\n // Write npm package to dest folder\n writeNpmPackage(pkgUri),\n tap(graph => {\n const ngPkg = graph.get(pkgUri);\n log.success(`Built Angular Package!\n - from: ${ngPkg.data.src}\n - to: ${ngPkg.data.dest}`);\n })\n );\n};\n\nconst writeNpmPackage = (pkgUri: string): Transform =>\n pipe(\n switchMap(graph => {\n const { data } = graph.get(pkgUri);\n const filesToCopy = Promise.all(\n [`${data.src}/LICENSE`, `${data.src}/README.md`].map(src =>\n copyFile(src, path.join(data.dest, path.basename(src)))\n )\n );\n\n return from(filesToCopy).pipe(map(() => graph));\n })\n );\n\nconst scheduleEntryPoints = (epTransform: Transform): Transform =>\n pipe(\n concatMap(graph => {\n // Calculate node/dependency depth and determine build order\n const depthBuilder = new DepthBuilder();\n const entryPoints = graph.filter(isEntryPoint);\n entryPoints.forEach(entryPoint => {\n const deps = entryPoint.filter(isEntryPoint).map(ep => ep.url);\n depthBuilder.add(entryPoint.url, deps);\n });\n\n // The array index is the depth.\n const groups = depthBuilder.build();\n\n // Build entry points with lower depth values first.\n return from(flatten(groups)).pipe(\n map(epUrl => graph.find(byEntryPoint().and(ep => ep.url === epUrl)) as EntryPointNode),\n filter(entryPoint => entryPoint.state !== 'done'),\n concatMap(ep =>\n observableOf(ep).pipe(\n // Mark the entry point as 'in-progress'\n tap(entryPoint => (entryPoint.state = STATE_IN_PROGESS)),\n mapTo(graph),\n epTransform\n )\n ),\n takeLast(1), // don't use last as sometimes it this will cause 'no elements in sequence',\n defaultIfEmpty(graph)\n );\n })\n );\n"]}
|
|
1
|
+
{"version":3,"file":"package.transform.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/package.transform.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport { Observable, of as observableOf, pipe, NEVER, from } from 'rxjs';\nimport {\n concatMap,\n map,\n switchMap,\n tap,\n mapTo,\n catchError,\n startWith,\n debounceTime,\n filter,\n takeLast,\n defaultIfEmpty\n} from 'rxjs/operators';\nimport { BuildGraph } from '../brocc/build-graph';\nimport { DepthBuilder } from '../brocc/depth';\nimport { STATE_IN_PROGESS } from '../brocc/node';\nimport { Transform } from '../brocc/transform';\nimport * as log from '../util/log';\nimport { rimraf } from '../util/rimraf';\nimport {\n PackageNode,\n EntryPointNode,\n ngUrl,\n isEntryPoint,\n byEntryPoint,\n isPackage,\n fileUrl,\n fileUrlPath\n} from './nodes';\nimport { discoverPackages } from './discover-packages';\nimport { createFileWatch } from '../file/file-watcher';\nimport { NgPackagrOptions } from './options.di';\nimport { flatten } from '../util/array';\nimport { copyFile } from '../util/copy';\nimport { ensureUnixPath } from '../util/path';\n\n/**\n * A transformation for building an npm package:\n *\n * - discoverPackages\n * - options\n * - initTsConfig\n * - analyzeTsSources (thereby extracting template and stylesheet files)\n * - for each entry point\n * - run the entryPontTransform\n * - writeNpmPackage\n *\n * @param project Project token, reference to `ng-package.json`\n * @param options ng-packagr options\n * @param initTsConfigTransform Transformation initializing the tsconfig of each entry point.\n * @param analyseSourcesTransform Transformation analyzing the typescript source files of each entry point.\n * @param entryPointTransform Transformation for asset rendering and compilation of a single entry point.\n */\nexport const packageTransformFactory = (\n project: string,\n options: NgPackagrOptions,\n initTsConfigTransform: Transform,\n analyseSourcesTransform: Transform,\n entryPointTransform: Transform\n) => (source$: Observable<BuildGraph>): Observable<BuildGraph> => {\n const pkgUri = ngUrl(project);\n\n const buildTransform = options.watch\n ? watchTransformFactory(project, options, analyseSourcesTransform, entryPointTransform)\n : buildTransformFactory(project, analyseSourcesTransform, entryPointTransform);\n\n return source$.pipe(\n tap(() => log.info(`Building Angular Package`)),\n // Discover packages and entry points\n switchMap(graph => {\n const pkg = discoverPackages({ project });\n\n return from(pkg).pipe(\n map(value => {\n const ngPkg = new PackageNode(pkgUri);\n ngPkg.data = value;\n\n return graph.put(ngPkg);\n })\n );\n }),\n // Clean the primary dest folder (should clean all secondary sub-directory, as well)\n switchMap(\n graph => {\n const { dest, deleteDestPath } = graph.get(pkgUri).data;\n return from(deleteDestPath ? rimraf(dest) : Promise.resolve());\n },\n (graph, _) => graph\n ),\n // Add entry points to graph\n map(graph => {\n const ngPkg = graph.get(pkgUri) as PackageNode;\n const entryPoints = [ngPkg.data.primary, ...ngPkg.data.secondaries].map(entryPoint => {\n const { destinationFiles, moduleId } = entryPoint;\n const node = new EntryPointNode(\n ngUrl(moduleId),\n ngPkg.cache.sourcesFileCache,\n ngPkg.cache.analysisSourcesFileCache\n );\n node.data = { entryPoint, destinationFiles };\n node.state = 'dirty';\n ngPkg.dependsOn(node);\n\n return node;\n });\n\n return graph.put(entryPoints);\n }),\n // Initialize the tsconfig for each entry point\n initTsConfigTransform,\n // perform build\n buildTransform\n );\n};\n\nconst watchTransformFactory = (\n project: string,\n _options: NgPackagrOptions,\n analyseSourcesTransform: Transform,\n entryPointTransform: Transform\n) => (source$: Observable<BuildGraph>): Observable<BuildGraph> => {\n const CompleteWaitingForFileChange = '\\nCompilation complete. Watching for file changes...';\n const FileChangeDetected = '\\nFile change detected. Starting incremental compilation...';\n const FailedWaitingForFileChange = '\\nCompilation failed. Watching for file changes...';\n\n return source$.pipe(\n switchMap(graph => {\n const { data, cache } = graph.find(isPackage) as PackageNode;\n return createFileWatch(data.src, [data.dest]).pipe(\n tap(fileChange => {\n const { filePath } = fileChange;\n const { sourcesFileCache, analysisSourcesFileCache } = cache;\n const cachedSourceFile = sourcesFileCache.get(filePath);\n\n if (!cachedSourceFile) {\n return;\n }\n\n const { declarationFileName } = cachedSourceFile;\n\n const uriToClean = [filePath, declarationFileName].map(x => fileUrl(ensureUnixPath(x)));\n let nodesToClean = graph.filter(node => uriToClean.some(uri => uri === node.url));\n\n nodesToClean = flatten([\n ...nodesToClean,\n // if a non ts file changes we need to clean up it's direct dependees\n // this is mainly done for resources such as html and css\n ...nodesToClean.filter(x => !x.url.endsWith('.ts')).map(x => x.dependees)\n ]);\n\n // delete node that changes\n nodesToClean.forEach(node => {\n analysisSourcesFileCache.delete(fileUrlPath(node.url));\n sourcesFileCache.delete(fileUrlPath(node.url));\n });\n\n const entryPoints = graph.filter(isEntryPoint) as EntryPointNode[];\n entryPoints.forEach(entryPoint => {\n const isDirty = entryPoint.dependents.some(x => nodesToClean.some(node => node.url === x.url));\n if (isDirty) {\n entryPoint.state = 'dirty';\n const { metadata } = entryPoint.data.destinationFiles;\n sourcesFileCache.delete(metadata);\n }\n });\n }),\n debounceTime(200),\n tap(() => log.msg(FileChangeDetected)),\n startWith(undefined),\n mapTo(graph)\n );\n }),\n switchMap(graph => {\n return observableOf(graph).pipe(\n buildTransformFactory(project, analyseSourcesTransform, entryPointTransform),\n tap(() => log.msg(CompleteWaitingForFileChange)),\n catchError(error => {\n log.error(error);\n log.msg(FailedWaitingForFileChange);\n return NEVER;\n })\n );\n })\n );\n};\n\nconst buildTransformFactory = (project: string, analyseSourcesTransform: Transform, entryPointTransform: Transform) => (\n source$: Observable<BuildGraph>\n): Observable<BuildGraph> => {\n const pkgUri = ngUrl(project);\n return source$.pipe(\n // Analyse dependencies and external resources for each entry point\n analyseSourcesTransform,\n // Next, run through the entry point transformation (assets rendering, code compilation)\n scheduleEntryPoints(entryPointTransform),\n // Write npm package to dest folder\n writeNpmPackage(pkgUri),\n tap(graph => {\n const ngPkg = graph.get(pkgUri);\n log.success(`Built Angular Package!\n - from: ${ngPkg.data.src}\n - to: ${ngPkg.data.dest}`);\n })\n );\n};\n\nconst writeNpmPackage = (pkgUri: string): Transform =>\n pipe(\n switchMap(graph => {\n const { data } = graph.get(pkgUri);\n const filesToCopy = Promise.all(\n [`${data.src}/LICENSE`, `${data.src}/README.md`].map(src =>\n copyFile(src, path.join(data.dest, path.basename(src)), {dereference: true})\n )\n );\n\n return from(filesToCopy).pipe(map(() => graph));\n })\n );\n\nconst scheduleEntryPoints = (epTransform: Transform): Transform =>\n pipe(\n concatMap(graph => {\n // Calculate node/dependency depth and determine build order\n const depthBuilder = new DepthBuilder();\n const entryPoints = graph.filter(isEntryPoint);\n entryPoints.forEach(entryPoint => {\n const deps = entryPoint.filter(isEntryPoint).map(ep => ep.url);\n depthBuilder.add(entryPoint.url, deps);\n });\n\n // The array index is the depth.\n const groups = depthBuilder.build();\n\n // Build entry points with lower depth values first.\n return from(flatten(groups)).pipe(\n map(epUrl => graph.find(byEntryPoint().and(ep => ep.url === epUrl)) as EntryPointNode),\n filter(entryPoint => entryPoint.state !== 'done'),\n concatMap(ep =>\n observableOf(ep).pipe(\n // Mark the entry point as 'in-progress'\n tap(entryPoint => (entryPoint.state = STATE_IN_PROGESS)),\n mapTo(graph),\n epTransform\n )\n ),\n takeLast(1), // don't use last as sometimes it this will cause 'no elements in sequence',\n defaultIfEmpty(graph)\n );\n })\n );\n"]}
|
package/lib/ng-v5/packagr.js
CHANGED
|
@@ -101,7 +101,7 @@ class NgPackagr {
|
|
|
101
101
|
return rxjs_1.of(new build_graph_1.BuildGraph()).pipe(buildTransformOperator, operators_1.catchError(err => {
|
|
102
102
|
// Report error and re-throw to subscribers
|
|
103
103
|
log.error(err);
|
|
104
|
-
|
|
104
|
+
return rxjs_1.throwError(err);
|
|
105
105
|
}), operators_1.map(() => undefined));
|
|
106
106
|
}
|
|
107
107
|
}
|
package/lib/ng-v5/packagr.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packagr.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/packagr.ts"],"names":[],"mappings":";;AAAA,+CAA4E;AAE5E,+
|
|
1
|
+
{"version":3,"file":"packagr.js","sourceRoot":"","sources":["../../../src/lib/ng-v5/packagr.ts"],"names":[],"mappings":";;AAAA,+CAA4E;AAE5E,+BAAkE;AAClE,8CAAiD;AACjD,sDAAkD;AAElD,mCAAmC;AACnC,8DAA0D;AAC1D,qDAAyD;AACzD,6CAAoE;AACpE,6CAA8C;AAC9C,6CAAgE;AAEhE;;;;;;GAMG;AACH,MAAa,SAAS;IAGpB,YAAoB,SAAqB;QAArB,cAAS,GAAT,SAAS,CAAY;QAFjC,mBAAc,GAA8B,8BAAiB,CAAC,OAAO,CAAC;IAElC,CAAC;IAE7C;;;;;OAKG;IACI,WAAW,CAAC,OAAyB;QAC1C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,UAAU,CAAC,OAAe;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACI,aAAa,CAAC,SAAqB;QACxC,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAAC,aAA2C;QAC7D,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAe,CAAC,aAAa,CAAC,CAAC,CAAC;QAEpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACI,kBAAkB,CAAC,SAAoC;QAC5D,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAEhC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACI,KAAK;QACV,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,2BAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAErD,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAClC,CAAC;IAED;;;;OAIG;IACI,iBAAiB;QACtB,MAAM,QAAQ,GAAG,iCAAkB,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrE,MAAM,sBAAsB,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAEjE,OAAO,SAAY,CAAC,IAAI,wBAAU,EAAE,CAAC,CAAC,IAAI,CACxC,sBAAsB,EACtB,sBAAU,CAAC,GAAG,CAAC,EAAE;YACf,2CAA2C;YAC3C,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACf,OAAO,iBAAU,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CACrB,CAAC;IACJ,CAAC;CACF;AAzGD,8BAyGC;AAEY,QAAA,SAAS,GAAG,GAAc,EAAE,CACvC,IAAI,SAAS,CAAC;IACZ,sCAAsC;IACtC,GAAG,8BAAiB;IACpB,GAAG,sCAAqB;CACzB,CAAC,CAAC","sourcesContent":["import { InjectionToken, Provider, ReflectiveInjector } from 'injection-js';\nimport { ParsedConfiguration } from '@angular/compiler-cli';\nimport { of as observableOf, Observable, throwError } from 'rxjs';\nimport { map, catchError } from 'rxjs/operators';\nimport { BuildGraph } from '../brocc/build-graph';\nimport { Transform } from '../brocc/transform';\nimport * as log from '../util/log';\nimport { provideTsConfig } from './init/init-tsconfig.di';\nimport { ENTRY_POINT_PROVIDERS } from './entry-point.di';\nimport { PACKAGE_TRANSFORM, PACKAGE_PROVIDERS } from './package.di';\nimport { provideProject } from './project.di';\nimport { provideOptions, NgPackagrOptions } from './options.di';\n\n/**\n * The original ng-packagr implemented on top of a rxjs-ified and di-jectable transformation pipeline.\n *\n * See the `docs/transformations.md` for more prose description.\n *\n * @link https://github.com/dherges/ng-packagr/pull/572\n */\nexport class NgPackagr {\n private buildTransform: InjectionToken<Transform> = PACKAGE_TRANSFORM.provide;\n\n constructor(private providers: Provider[]) {}\n\n /**\n * Adds options to ng-packagr\n *\n * @param options Ng Packagr Options\n * @return Self instance for fluent API\n */\n public withOptions(options: NgPackagrOptions): NgPackagr {\n this.providers.push(provideOptions(options));\n\n return this;\n }\n\n /**\n * Sets the path to the user's \"ng-package\" file (either `package.json`, `ng-package.json`, or `ng-package.js`)\n *\n * @param project File path\n * @return Self instance for fluent API\n */\n public forProject(project: string): NgPackagr {\n this.providers.push(provideProject(project));\n\n return this;\n }\n\n /**\n * Adds dependency injection providers.\n *\n * @param providers\n * @return Self instance for fluent API\n * @link https://github.com/mgechev/injection-js\n */\n public withProviders(providers: Provider[]): NgPackagr {\n this.providers = [...this.providers, ...providers];\n\n return this;\n }\n\n /**\n * Overwrites the default TypeScript configuration.\n *\n * @param defaultValues A tsconfig providing default values to the compilation.\n * @return Self instance for fluent API\n */\n public withTsConfig(defaultValues: ParsedConfiguration | string): NgPackagr {\n this.providers.push(provideTsConfig(defaultValues));\n\n return this;\n }\n\n /**\n * Overwrites the 'build' transform.\n *\n * @param transform\n * @return Self intance for fluent API\n */\n public withBuildTransform(transform: InjectionToken<Transform>): NgPackagr {\n this.buildTransform = transform;\n\n return this;\n }\n\n /**\n * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n *\n * @return A promisified result of the transformation pipeline.\n */\n public build(): Promise<void> {\n return this.buildAsObservable().toPromise();\n }\n\n /**\n * Builds and watch for changes by kick-starting the 'watch' transform over an (initially) empty `BuildGraph``\n *\n * @return An observable result of the transformation pipeline.\n */\n public watch(): Observable<void> {\n this.providers.push(provideOptions({ watch: true }));\n\n return this.buildAsObservable();\n }\n\n /**\n * Builds the project by kick-starting the 'build' transform over an (initially) empty `BuildGraph``\n *\n * @return An observable result of the transformation pipeline.\n */\n public buildAsObservable(): Observable<void> {\n const injector = ReflectiveInjector.resolveAndCreate(this.providers);\n const buildTransformOperator = injector.get(this.buildTransform);\n\n return observableOf(new BuildGraph()).pipe(\n buildTransformOperator,\n catchError(err => {\n // Report error and re-throw to subscribers\n log.error(err);\n return throwError(err);\n }),\n map(() => undefined)\n );\n }\n}\n\nexport const ngPackagr = (): NgPackagr =>\n new NgPackagr([\n // Add default providers to this list.\n ...PACKAGE_PROVIDERS,\n ...ENTRY_POINT_PROVIDERS\n ]);\n"]}
|
|
@@ -40,6 +40,7 @@ function compileSourceFiles(graph, entryPoint, tsConfig, moduleResolutionCache,
|
|
|
40
40
|
log.debug(`ngc program structure is reused: ${oldProgram ? oldProgram.getTsProgram().structureIsReused : 'No old program'}`);
|
|
41
41
|
cache.oldPrograms = Object.assign({}, cache.oldPrograms, { [scriptTarget]: ngProgram });
|
|
42
42
|
const allDiagnostics = [
|
|
43
|
+
...ngProgram.getTsOptionDiagnostics(),
|
|
43
44
|
...ngProgram.getNgOptionDiagnostics(),
|
|
44
45
|
...ngProgram.getTsSyntacticDiagnostics(),
|
|
45
46
|
...ngProgram.getTsSemanticDiagnostics(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../src/lib/ngc/compile-source-files.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"compile-source-files.js","sourceRoot":"","sources":["../../../src/lib/ngc/compile-source-files.ts"],"names":[],"mappings":"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","sourcesContent":["import * as ng from '@angular/compiler-cli';\nimport * as ts from 'typescript';\nimport * as log from '../util/log';\nimport { createEmitCallback } from './create-emit-callback';\nimport { redirectWriteFileCompilerHost } from '../ts/redirect-write-file-compiler-host';\nimport { cacheCompilerHost } from '../ts/cache-compiler-host';\nimport { StylesheetProcessor } from '../ng-v5/entry-point/resources/stylesheet-processor';\nimport { BuildGraph } from '../brocc/build-graph';\nimport { EntryPointNode } from '../ng-v5/nodes';\n\nexport async function compileSourceFiles(\n graph: BuildGraph,\n entryPoint: EntryPointNode,\n tsConfig: ng.ParsedConfiguration,\n moduleResolutionCache: ts.ModuleResolutionCache,\n stylesheetProcessor: StylesheetProcessor,\n extraOptions?: Partial<ng.CompilerOptions>,\n declarationDir?: string\n) {\n log.debug(`ngc (v${ng.VERSION.full})`);\n\n const tsConfigOptions: ng.CompilerOptions = { ...tsConfig.options, ...extraOptions };\n\n let tsCompilerHost = cacheCompilerHost(\n graph,\n entryPoint,\n tsConfigOptions,\n moduleResolutionCache,\n stylesheetProcessor\n );\n if (declarationDir) {\n tsCompilerHost = redirectWriteFileCompilerHost(tsCompilerHost, tsConfigOptions.basePath, declarationDir);\n }\n\n // ng.CompilerHost\n const ngCompilerHost = ng.createCompilerHost({\n options: tsConfigOptions,\n tsHost: tsCompilerHost\n });\n\n const emitFlags = tsConfigOptions.declaration ? tsConfig.emitFlags : ng.EmitFlags.JS;\n\n const scriptTarget = tsConfigOptions.target;\n const cache = entryPoint.cache;\n const oldProgram = cache.oldPrograms && (cache.oldPrograms[scriptTarget] as ng.Program | undefined);\n\n const ngProgram = ng.createProgram({\n rootNames: tsConfig.rootNames,\n options: tsConfigOptions,\n host: ngCompilerHost,\n oldProgram\n });\n\n await ngProgram.loadNgStructureAsync();\n\n log.debug(\n `ngc program structure is reused: ${\n oldProgram ? (oldProgram.getTsProgram() as any).structureIsReused : 'No old program'\n }`\n );\n\n cache.oldPrograms = { ...cache.oldPrograms, [scriptTarget]: ngProgram };\n\n const allDiagnostics = [\n ...ngProgram.getTsOptionDiagnostics(),\n ...ngProgram.getNgOptionDiagnostics(),\n ...ngProgram.getTsSyntacticDiagnostics(),\n ...ngProgram.getTsSemanticDiagnostics(),\n ...ngProgram.getNgSemanticDiagnostics(),\n ...ngProgram.getNgStructuralDiagnostics()\n ];\n\n // if we have an error we don't want to transpile.\n const hasError = ng.exitCodeFromResult(allDiagnostics) > 0;\n if (!hasError) {\n // certain errors are only emitted by a compilation hence append to previous diagnostics\n const { diagnostics } = ngProgram.emit({\n emitCallback: createEmitCallback(tsConfigOptions),\n emitFlags\n });\n\n allDiagnostics.push(...diagnostics);\n }\n\n if (allDiagnostics.length === 0) {\n return;\n }\n\n const exitCode = ng.exitCodeFromResult(allDiagnostics);\n const formattedDiagnostics = ng.formatDiagnostics(allDiagnostics);\n if (exitCode !== 0) {\n throw new Error(formattedDiagnostics);\n } else {\n log.msg(formattedDiagnostics);\n }\n}\n"]}
|
package/lib/util/log.js
CHANGED
|
@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const chalk_1 = require("chalk");
|
|
4
4
|
exports.error = (err) => {
|
|
5
5
|
if (err instanceof Error) {
|
|
6
|
-
console.
|
|
7
|
-
console.
|
|
8
|
-
|
|
6
|
+
console.error('\n' + chalk_1.default.red('BUILD ERROR'));
|
|
7
|
+
console.error(chalk_1.default.red(err.message));
|
|
8
|
+
if (process.env.DEBUG) {
|
|
9
|
+
console.error(chalk_1.default.red(err.stack) + '\n');
|
|
10
|
+
}
|
|
9
11
|
}
|
|
10
12
|
else {
|
|
11
|
-
console.
|
|
13
|
+
console.error(chalk_1.default.red(err));
|
|
12
14
|
}
|
|
13
15
|
};
|
|
14
16
|
exports.warn = (msg) => {
|
|
15
|
-
console.
|
|
17
|
+
console.warn(chalk_1.default.yellow(msg));
|
|
16
18
|
};
|
|
17
19
|
exports.success = (msg) => {
|
|
18
20
|
console.log(chalk_1.default.green(msg));
|
package/lib/util/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/lib/util/log.ts"],"names":[],"mappings":";;AAAA,iCAA0B;AAEb,QAAA,KAAK,GAAG,CAAC,GAAmB,EAAE,EAAE;IAC3C,IAAI,GAAG,YAAY,KAAK,EAAE;QACxB,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/lib/util/log.ts"],"names":[],"mappings":";;AAAA,iCAA0B;AAEb,QAAA,KAAK,GAAG,CAAC,GAAmB,EAAE,EAAE;IAC3C,IAAI,GAAG,YAAY,KAAK,EAAE;QACxB,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,eAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;QAC/C,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAEtC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;YACrB,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;SAC5C;KACF;SAAM;QACL,OAAO,CAAC,KAAK,CAAC,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;KAC/B;AACH,CAAC,CAAC;AAEW,QAAA,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;IAClC,OAAO,CAAC,IAAI,CAAC,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAEW,QAAA,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;IACrC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC;AAEW,QAAA,IAAI,GAAG,CAAC,GAAW,EAAE,EAAE;IAClC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEW,QAAA,GAAG,GAAG,CAAC,GAAW,EAAE,EAAE;IACjC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAChC,CAAC,CAAC;AAEW,QAAA,KAAK,GAAG,CAAC,GAAW,EAAE,EAAE;IACnC,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC,CAAC,CAAC;KACnD;AACH,CAAC,CAAC","sourcesContent":["import chalk from 'chalk';\n\nexport const error = (err: string | Error) => {\n if (err instanceof Error) {\n console.error('\\n' + chalk.red('BUILD ERROR'));\n console.error(chalk.red(err.message));\n\n if (process.env.DEBUG) {\n console.error(chalk.red(err.stack) + '\\n');\n }\n } else {\n console.error(chalk.red(err));\n }\n};\n\nexport const warn = (msg: string) => {\n console.warn(chalk.yellow(msg));\n};\n\nexport const success = (msg: string) => {\n console.log(chalk.green(msg));\n};\n\nexport const info = (msg: string) => {\n console.log(chalk.blue(msg));\n};\n\nexport const msg = (msg: string) => {\n console.log(chalk.white(msg));\n};\n\nexport const debug = (msg: string) => {\n if (process.env.DEBUG) {\n console.log(chalk.inverse.cyan(`[debug] ${msg}`));\n }\n};\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ng-packagr",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.3.0",
|
|
4
4
|
"description": "Compile and package a TypeScript library to Angular Package Format",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"angular",
|
|
@@ -28,39 +28,38 @@
|
|
|
28
28
|
"typings": "./public_api.d.ts",
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@ngtools/json-schema": "^1.1.0",
|
|
31
|
-
"autoprefixer": "^9.
|
|
31
|
+
"autoprefixer": "^9.6.0",
|
|
32
32
|
"browserslist": "^4.0.0",
|
|
33
33
|
"chalk": "^2.3.1",
|
|
34
|
-
"chokidar": "^
|
|
34
|
+
"chokidar": "^3.0.0",
|
|
35
35
|
"clean-css": "^4.1.11",
|
|
36
36
|
"commander": "^2.12.0",
|
|
37
|
-
"fs-extra": "^
|
|
37
|
+
"fs-extra": "^8.0.0",
|
|
38
38
|
"glob": "^7.1.2",
|
|
39
39
|
"injection-js": "^2.2.1",
|
|
40
40
|
"less": "^3.8.0",
|
|
41
41
|
"less-plugin-npm-import": "^2.1.0",
|
|
42
42
|
"node-sass-tilde-importer": "^1.0.0",
|
|
43
|
-
"opencollective-postinstall": "^2.0.1",
|
|
44
43
|
"postcss": "^7.0.0",
|
|
45
44
|
"postcss-url": "^8.0.0",
|
|
46
45
|
"read-pkg-up": "^5.0.0",
|
|
47
46
|
"rimraf": "^2.6.1",
|
|
48
|
-
"rollup": "^1.
|
|
49
|
-
"rollup-plugin-commonjs": "^
|
|
47
|
+
"rollup": "^1.12.1",
|
|
48
|
+
"rollup-plugin-commonjs": "^10.0.0",
|
|
50
49
|
"rollup-plugin-json": "^4.0.0",
|
|
51
|
-
"rollup-plugin-node-resolve": "^
|
|
50
|
+
"rollup-plugin-node-resolve": "^5.0.0",
|
|
52
51
|
"rollup-plugin-sourcemaps": "^0.4.2",
|
|
53
52
|
"rxjs": "^6.0.0",
|
|
54
53
|
"sass": "^1.17.3",
|
|
55
54
|
"stylus": "^0.54.5",
|
|
56
|
-
"terser": "^
|
|
57
|
-
"update-notifier": "^
|
|
55
|
+
"terser": "^4.0.0",
|
|
56
|
+
"update-notifier": "^3.0.0"
|
|
58
57
|
},
|
|
59
58
|
"peerDependencies": {
|
|
60
|
-
"@angular/compiler": "^6.0.0 || ^7.0.0 || ^8.0.0-beta.0",
|
|
61
|
-
"@angular/compiler-cli": "^6.0.0 || ^7.0.0 || ^8.0.0-beta.0",
|
|
59
|
+
"@angular/compiler": "^6.0.0 || ^7.0.0 || ^8.0.0-beta.0 || ^8.1.0-beta.0",
|
|
60
|
+
"@angular/compiler-cli": "^6.0.0 || ^7.0.0 || ^8.0.0-beta.0 || ^8.1.0-beta.0",
|
|
62
61
|
"tslib": "^1.9.0",
|
|
63
|
-
"typescript": ">=2.7 < 3.
|
|
62
|
+
"typescript": ">=2.7 < 3.5"
|
|
64
63
|
},
|
|
65
64
|
"collective": {
|
|
66
65
|
"type": "opencollective",
|
|
@@ -73,7 +72,5 @@
|
|
|
73
72
|
"pre-commit": "pretty-quick --staged"
|
|
74
73
|
}
|
|
75
74
|
},
|
|
76
|
-
"scripts": {
|
|
77
|
-
"postinstall": "opencollective-postinstall"
|
|
78
|
-
}
|
|
75
|
+
"scripts": {}
|
|
79
76
|
}
|