Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: angular/angular-cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.1.3
Choose a base ref
...
head repository: angular/angular-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v7.1.4
Choose a head ref
  • 9 commits
  • 9 files changed
  • 6 contributors

Commits on Dec 13, 2018

  1. docs(@schematics/angular): add note about older chrome in polyfills

    Add note about polyfills being required in older chrome environments.
    Addresses confusion seen in Ionic projects that are loaded in an Android
    5 emulator, but has chrome 37.
    mhartington authored and mgechev committed Dec 13, 2018
    Copy the full SHA
    7026eee View commit details
  2. build: update path to install snapshots

    Alan Agius authored and mgechev committed Dec 13, 2018
    Copy the full SHA
    b17bc89 View commit details

Commits on Dec 14, 2018

  1. fix(@angular/cli): remove redundant period in deprecation warning

    As `parser.ts` currently always adds a period at the end of the warning message and the `x-deprecated` messages also have one, this removes the always added one to avoid a double period in the warning message.
    
    Fixes:
    
        Option "styleext" is deprecated: Use "style" instead..
    
    to:
    
        Option "styleext" is deprecated: Use "style" instead.
    cexbrayat authored and mgechev committed Dec 14, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    970f24d View commit details
  2. fix(@schematics/angular): cannot create pipe in sub-directory if modu…

    …le is in different sub-directory
    
    Similar to other schematics, `findModuleFromOptions` should happen prior to `parseName` that modifies the name and path.
    
    Fixes #13182
    Alan authored and mgechev committed Dec 14, 2018
    Copy the full SHA
    b480dea View commit details

Commits on Dec 18, 2018

  1. style(@schematics/angular): format jsdoc in polyfills.ts

    This line makes the `jsdoc-format` tslint rule fails if activated as it is not a correct JSDoc formating.
    cexbrayat authored and mgechev committed Dec 18, 2018
    Copy the full SHA
    d529a12 View commit details

Commits on Dec 19, 2018

  1. Copy the full SHA
    3c57071 View commit details
  2. fix(@angular-devkit/build-angular): remove circular dependencies warn…

    …ings in ngfactory files
    
    Fixes #11135
    ahasall authored and mgechev committed Dec 19, 2018
    Copy the full SHA
    38f21be View commit details
  3. refactor: fix bad merge commit

    PR #13196
    Merge commit b480dea
    mgechev committed Dec 19, 2018
    Copy the full SHA
    791229a View commit details
  4. release: v7.1.4

    mgechev committed Dec 19, 2018
    Copy the full SHA
    1c96c85 View commit details
76 changes: 38 additions & 38 deletions .monorepo.json
Original file line number Diff line number Diff line change
@@ -42,16 +42,16 @@
},
"packages": {
"@_/benchmark": {
"version": "0.11.3",
"hash": "6d499b7cc1fecfdca1ee530d68af2743"
"version": "0.11.4",
"hash": "4eecb4a76317039defc5c2b4bd31e4f9"
},
"@_/builders": {
"version": "0.11.3",
"hash": "a365103b30adf919f51d22b50194fdac"
"version": "0.11.4",
"hash": "796f00a3b325334632fd8bb9d1b46b02"
},
"devkit": {
"version": "0.11.3",
"hash": "58d7c14f5b79b0190757b45b0c893c4b"
"version": "0.11.4",
"hash": "41573426d76e924a5cdd590dd03f14db"
},
"@angular/cli": {
"name": "Angular CLI",
@@ -62,15 +62,15 @@
"url": "/packages/angular/cli/README.md"
}
],
"version": "7.1.3",
"version": "7.1.4",
"snapshotRepo": "angular/cli-builds",
"hash": "18ef152f669972f829533dcc92349474"
"hash": "697acb7a2965a0eb549d3d70d6baca6e"
},
"@angular/pwa": {
"name": "Angular PWA Schematics",
"section": "Schematics",
"version": "0.11.3",
"hash": "fcc19d834c5487df192288a52e6c27a1",
"version": "0.11.4",
"hash": "8dfc94084f8dee26af6ef77e08c8c0f4",
"snapshotRepo": "angular/angular-pwa-builds"
},
"@angular-devkit/architect": {
@@ -81,21 +81,21 @@
"url": "/packages/angular_devkit/architect/README.md"
}
],
"version": "0.11.3",
"hash": "2c3aad37776983135646399152c2287b",
"version": "0.11.4",
"hash": "6dc4fb691ad50d08eacd64b1bc351906",
"snapshotRepo": "angular/angular-devkit-architect-builds"
},
"@angular-devkit/architect-cli": {
"name": "Architect CLI",
"version": "0.11.3",
"hash": "2b155c677f420bbdf288df6a4f0e87b9",
"version": "0.11.4",
"hash": "8d55b5e2a4ac068114a747c1cadb1d8b",
"snapshotRepo": "angular/angular-devkit-architect-cli-builds"
},
"@angular-devkit/benchmark": {
"name": "Benchmark",
"section": "Tooling",
"version": "1.0.3",
"hash": "d0b5fd683b5b40b722410b59a5c90a40"
"version": "1.0.4",
"hash": "e36f143d472675a24d29601ed1b8c671"
},
"@angular-devkit/build-optimizer": {
"name": "Build Optimizer",
@@ -105,8 +105,8 @@
"url": "/packages/angular_devkit/build_optimizer/README.md"
}
],
"version": "0.11.3",
"hash": "5ed5a3e74be6f6185bbbfda81d510004",
"version": "0.11.4",
"hash": "be4ff02b13c8e11fa3207b4f4e9475f0",
"snapshotRepo": "angular/angular-devkit-build-optimizer-builds"
},
"@angular-devkit/build-ng-packagr": {
@@ -117,8 +117,8 @@
"url": "/packages/angular_devkit/build_ng_packagr/README.md"
}
],
"version": "0.11.3",
"hash": "9c961c6f827df8e288398381463e4633",
"version": "0.11.4",
"hash": "24db32df6d20d10864597c2ff7dc0900",
"snapshotRepo": "angular/angular-devkit-build-ng-packagr-builds"
},
"@angular-devkit/build-angular": {
@@ -129,8 +129,8 @@
"url": "/packages/angular_devkit/build_angular/README.md"
}
],
"version": "0.11.3",
"hash": "a5d10b83b15c89119652be4c381d8389",
"version": "0.11.4",
"hash": "7115bf67108f2136ea41e679138ce2d5",
"snapshotRepo": "angular/angular-devkit-build-angular-builds"
},
"@angular-devkit/build-webpack": {
@@ -141,9 +141,9 @@
"url": "/packages/angular_devkit/build_webpack/README.md"
}
],
"version": "0.11.3",
"version": "0.11.4",
"snapshotRepo": "angular/angular-devkit-build-webpack-builds",
"hash": "f621d2282eb99f87d028a6571d771fa0"
"hash": "c17684526c4f579fc4e7ac62d0d357ff"
},
"@angular-devkit/core": {
"name": "Core",
@@ -153,8 +153,8 @@
"url": "/packages/angular_devkit/core/README.md"
}
],
"version": "7.1.3",
"hash": "b5af4acdf96f48907c383516f312cf72",
"version": "7.1.4",
"hash": "256f92dd1f0b49db48fd8c1ece0faa2c",
"snapshotRepo": "angular/angular-devkit-core-builds"
},
"@angular-devkit/schematics": {
@@ -165,43 +165,43 @@
"url": "/packages/angular_devkit/schematics/README.md"
}
],
"version": "7.1.3",
"hash": "d4c5a9e08594d39231da81fbac8dc9b3",
"version": "7.1.4",
"hash": "fd7bc740825e731312bc5efa6e692513",
"snapshotRepo": "angular/angular-devkit-schematics-builds"
},
"@angular-devkit/schematics-cli": {
"name": "Schematics CLI",
"section": "Tooling",
"version": "0.11.3",
"hash": "a0c7b5ff77b63f7e798557ac039f9124",
"version": "0.11.4",
"hash": "7b1cf02e5a8f1c8d4a0eedd5c0e2f5a3",
"snapshotRepo": "angular/angular-devkit-schematics-cli-builds"
},
"@ngtools/webpack": {
"name": "Webpack Angular Plugin",
"version": "7.1.3",
"version": "7.1.4",
"section": "Misc",
"hash": "cfc98e7721956e723ac1ad889ff12d2f",
"hash": "54d9426dec50871c68626a5de6d40f21",
"snapshotRepo": "angular/ngtools-webpack-builds"
},
"@schematics/angular": {
"name": "Angular Schematics",
"section": "Schematics",
"version": "7.1.3",
"hash": "b6c95f1c207e4bdc4d8b194d7e0225d3",
"version": "7.1.4",
"hash": "d399791bc6e93978812103444ebeec16",
"snapshotRepo": "angular/schematics-angular-builds"
},
"@schematics/schematics": {
"name": "Schematics Schematics",
"version": "0.11.3",
"version": "0.11.4",
"section": "Schematics",
"hash": "2d5ac0030a18491d0956fc6efdc101c0",
"hash": "85c452bd52304c6f6702495e91b87c2b",
"snapshotRepo": "angular/schematics-schematics-builds"
},
"@schematics/update": {
"name": "Package Update Schematics",
"version": "0.11.3",
"version": "0.11.4",
"section": "Schematics",
"hash": "db19c0dd86785ce5fa91a5c9dc8c761d",
"hash": "d8a5f02a59a78af20237823f13e22c12",
"snapshotRepo": "angular/schematics-update-builds"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@
"@types/copy-webpack-plugin": "^4.4.1",
"@types/express": "^4.16.0",
"@types/glob": "^5.0.35",
"@types/inquirer": "^0.0.42",
"@types/inquirer": "^0.0.43",
"@types/istanbul": "^0.4.30",
"@types/jasmine": "^2.8.8",
"@types/loader-utils": "^1.1.3",
2 changes: 1 addition & 1 deletion packages/angular/cli/models/parser.ts
Original file line number Diff line number Diff line change
@@ -193,7 +193,7 @@ function _assignOption(

if (option.deprecated !== undefined && option.deprecated !== false) {
deprecations.push(`Option ${JSON.stringify(option.name)} is deprecated${
typeof option.deprecated == 'string' ? ': ' + option.deprecated : ''}.`);
typeof option.deprecated == 'string' ? ': ' + option.deprecated : '.'}`);
}
} else {
let error = `Argument ${key} could not be parsed using value ${JSON.stringify(value)}.`;
Original file line number Diff line number Diff line change
@@ -149,7 +149,7 @@ export function getCommonConfig(wco: WebpackConfigOptions) {

if (buildOptions.showCircularDependencies) {
extraPlugins.push(new CircularDependencyPlugin({
exclude: /[\\\/]node_modules[\\\/]/,
exclude: /([\\\/]node_modules[\\\/])|(ngfactory\.js$)/,
}));
}

14 changes: 5 additions & 9 deletions packages/schematics/angular/application/files/src/polyfills.ts
Original file line number Diff line number Diff line change
@@ -18,7 +18,10 @@
* BROWSER POLYFILLS
*/

/** IE9, IE10 and IE11 requires all of the following polyfills. **/
/** IE9, IE10, IE11, and Chrome <55 requires all of the following polyfills.
* This also includes Android Emulators with older versions of Chrome and Google Search/Googlebot
*/

// import 'core-js/es6/symbol';
// import 'core-js/es6/object';
// import 'core-js/es6/function';
@@ -34,13 +37,6 @@
// import 'core-js/es6/weak-map';
// import 'core-js/es6/set';

/**
* If the application will be indexed by Google Search, the following is required.
* Googlebot uses a renderer based on Chrome 41.
* https://developers.google.com/search/docs/guides/rendering
**/
// import 'core-js/es6/array';

/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.

@@ -51,7 +47,7 @@
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
**/
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.

/**
4 changes: 2 additions & 2 deletions packages/schematics/angular/pipe/index.ts
Original file line number Diff line number Diff line change
@@ -96,12 +96,12 @@ export default function (options: PipeOptions): Rule {
options.path = buildDefaultPath(project);
}

options.module = findModuleFromOptions(host, options);

const parsedPath = parseName(options.path, options.name);
options.name = parsedPath.name;
options.path = parsedPath.path;

options.module = findModuleFromOptions(host, options);

const templateSource = apply(url('./files'), [
options.spec ? noop() : filter(path => !path.endsWith('.spec.ts')),
template({
14 changes: 14 additions & 0 deletions packages/schematics/angular/pipe/index_spec.ts
Original file line number Diff line number Diff line change
@@ -79,6 +79,20 @@ describe('Pipe Schematic', () => {
expect(thrownError).toBeDefined();
});

it('should handle a path in the name and module options', () => {
appTree = schematicRunner.runSchematic(
'module',
{ name: 'admin/module', project: 'bar' },
appTree,
);

const options = { ...defaultOptions, module: 'admin/module' };
appTree = schematicRunner.runSchematic('pipe', options, appTree);

const content = appTree.readContent('/projects/bar/src/app/admin/module/module.module.ts');
expect(content).toMatch(/import { FooPipe } from '\.\.\/\.\.\/foo.pipe'/);
});

it('should export the pipe', () => {
const options = { ...defaultOptions, export: true };

2 changes: 1 addition & 1 deletion scripts/snapshots.ts
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ released version of this package.
To test this snapshot in your own project, use
\`\`\`bash
npm install github.com/${pkg.snapshotRepo}
npm install git+https://github.com/${pkg.snapshotRepo}.git
\`\`\`
----
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -320,10 +320,10 @@
"@types/events" "*"
"@types/node" "*"

"@types/inquirer@^0.0.42":
version "0.0.42"
resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.42.tgz#2310fd8623053bead72247adae416aa32bacdf0c"
integrity sha512-flMaNWU2g9NrtZ4bIV+7SEY2W7OdWNNhmJ0rE1lWVxGrkp3TfFGMcFCxRIBmGWigI8e6n+2HqLjizTTfgcpHLg==
"@types/inquirer@^0.0.43":
version "0.0.43"
resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-0.0.43.tgz#1eb0bbb4648e6cc568bd396c1e989f620ad01273"
integrity sha512-xgyfKZVMFqE8aIKy1xfFVsX2MxyXUNgjgmbF6dRbR3sL+ZM5K4ka/9L4mmTwX8eTeVYtduyXu0gUVwVJa1HbNw==
dependencies:
"@types/rx" "*"
"@types/through" "*"