Skip to content

Commit c23f629

Browse files
author
Angular Builds
committed
54f7ea2 fix(@angular-devkit/schematics): throw InvalidCollectionJsonException when collection file is invalid
1 parent 1dafc82 commit c23f629

File tree

8 files changed

+96
-134
lines changed

8 files changed

+96
-134
lines changed

‎package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"typings": "src/index.d.ts",
77
"builders": "builders.json",
88
"dependencies": {
9-
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#ee7603f",
10-
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#ee7603f",
11-
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#ee7603f",
12-
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#ee7603f",
13-
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#ee7603f",
9+
"@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#54f7ea2",
10+
"@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#54f7ea2",
11+
"@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#54f7ea2",
12+
"@angular-devkit/core": "github:angular/angular-devkit-core-builds#54f7ea2",
13+
"@ngtools/webpack": "github:angular/ngtools-webpack-builds#54f7ea2",
1414
"ajv": "~6.4.0",
1515
"autoprefixer": "^8.4.1",
1616
"circular-dependency-plugin": "^5.0.2",
@@ -34,7 +34,6 @@
3434
"postcss": "^6.0.22",
3535
"postcss-import": "^11.1.0",
3636
"postcss-loader": "^2.1.5",
37-
"postcss-url": "^7.3.2",
3837
"raw-loader": "^0.5.1",
3938
"rxjs": "~6.2.0",
4039
"sass-loader": "^7.1.0",

‎src/angular-cli-files/models/webpack-configs/styles.d.ts

+13
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@
77
*/
88
import * as webpack from 'webpack';
99
import { WebpackConfigOptions } from '../build-options';
10+
/**
11+
* Enumerate loaders and their dependencies from this file to let the dependency validator
12+
* know they are used.
13+
*
14+
* require('style-loader')
15+
* require('postcss-loader')
16+
* require('stylus')
17+
* require('stylus-loader')
18+
* require('less')
19+
* require('less-loader')
20+
* require('node-sass')
21+
* require('sass-loader')
22+
*/
1023
export declare function getStylesConfig(wco: WebpackConfigOptions): {
1124
entry: {
1225
[key: string]: string[];

‎src/angular-cli-files/models/webpack-configs/styles.js

+46-117
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/angular-cli-files/plugins/postcss-cli-resources.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as postcss from 'postcss';
22
import * as webpack from 'webpack';
33
export interface PostcssCliResourcesOptions {
4+
baseHref?: string;
45
deployUrl?: string;
56
filename: string;
67
loader: webpack.loader.LoaderContext;

‎src/angular-cli-files/plugins/postcss-cli-resources.js

+26-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/angular-cli-files/plugins/webpack.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ export { CleanCssWebpackPlugin, CleanCssWebpackPluginOptions } from './cleancss-
1010
export { BundleBudgetPlugin, BundleBudgetPluginOptions } from './bundle-budget';
1111
export { ScriptsWebpackPlugin, ScriptsWebpackPluginOptions } from './scripts-webpack-plugin';
1212
export { SuppressExtractedTextChunksWebpackPlugin } from './suppress-entry-chunks-webpack-plugin';
13+
export { RemoveHashPlugin, RemoveHashPluginOptions } from './remove-hash-plugin';
1314
export { default as PostcssCliResources, PostcssCliResourcesOptions, } from './postcss-cli-resources';
1415
export declare const RawCssLoader: string;

‎src/angular-cli-files/plugins/webpack.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎uniqueId

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Thu Sep 06 2018 16:18:33 GMT+0000 (UTC)
1+
Thu Sep 06 2018 18:23:19 GMT+0000 (UTC)

0 commit comments

Comments
 (0)