Commit 275b5e7

clydinalan-agius4

authored and

committed

refactor(@angular-devkit/schematics-cli): rename schematic template files with a template extension

Files that contain template instructions should include a `.template` extension to prevent them from being treated as TypeScript/JSON/etc. files. Not doing so can result in parse errors or other failures when the files are incorrectly processed by other tools.

1 parent a5e8ac5 commit 275b5e7Copy full SHA for 275b5e7

File tree

8 files changed

-5

lines changed

packages/angular_devkit/schematics_cli
- blank
  - factory.ts
  - project-files
    - .gitignore.template
    - .npmignore.template
  - schematic-files/src/__name@dasherize__
    - index.ts.template
    - index_spec.ts.template
- schematic
  - factory.ts
  - files
    - .gitignore.template
    - .npmignore.template

8 files changed

-5

lines changed

`‎packages/angular_devkit/schematics_cli/blank/factory.ts‎`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,10 @@ import {`
`13`	`13`	`SchematicsException,`
`14`	`14`	`Tree,`
`15`	`15`	`apply,`
	`16`	`+ applyTemplates,`
`16`	`17`	`chain,`
`17`	`18`	`mergeWith,`
`18`	`19`	`move,`
`19`		`- template,`
`20`	`20`	`url,`
`21`	`21`	`} from '@angular-devkit/schematics';`
`22`	`22`	`import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';`
`@@ -63,7 +63,7 @@ export default function (options: Schema): Rule {`
`63`	`63`	`} catch {}`
`64`	`64`
`65`	`65`	`let source = apply(url('./schematic-files'), [`
`66`		`- template({`
	`66`	`+ applyTemplates({`
`67`	`67`	`...options,`
`68`	`68`	`coreVersion,`
`69`	`69`	`schematicsVersion,`
`@@ -77,7 +77,8 @@ export default function (options: Schema): Rule {`
`77`	`77`	`if (!collectionPath) {`
`78`	`78`	`collectionPath = normalize('/' + options.name + '/src/collection.json');`
`79`	`79`	`source = apply(url('./project-files'), [`
`80`		`- template({`
	`80`	`+ move('package.json', 'package.json.template'),`
	`81`	`+ applyTemplates({`
`81`	`82`	`...(options as object),`
`82`	`83`	`coreVersion,`
`83`	`84`	`schematicsVersion,`

`‎packages/angular_devkit/schematics_cli/blank/project-files/dotgitignore‎ renamed to ‎packages/angular_devkit/schematics_cli/blank/project-files/.gitignore.template‎`

File renamed without changes.

`‎packages/angular_devkit/schematics_cli/blank/project-files/dotnpmignore‎ renamed to ‎packages/angular_devkit/schematics_cli/blank/project-files/.npmignore.template‎`

File renamed without changes.

`‎packages/angular_devkit/schematics_cli/blank/schematic-files/src/name@dasherize/index.ts‎ renamed to ‎packages/angular_devkit/schematics_cli/blank/schematic-files/src/name@dasherize/index.ts.template‎`

File renamed without changes.

`‎packages/angular_devkit/schematics_cli/blank/schematic-files/src/name@dasherize/index_spec.ts‎ renamed to ‎packages/angular_devkit/schematics_cli/blank/schematic-files/src/name@dasherize/index_spec.ts.template‎`

File renamed without changes.

`‎packages/angular_devkit/schematics_cli/schematic/factory.ts‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ import { strings } from '@angular-devkit/core';`
`10`	`10`	`import {`
`11`	`11`	`Rule,`
`12`	`12`	`apply,`
	`13`	`+ applyTemplates,`
`13`	`14`	`mergeWith,`
`14`	`15`	`move,`
`15`	`16`	`partitionApplyMerge,`
`16`		`- template,`
`17`	`17`	`url,`
`18`	`18`	`} from '@angular-devkit/schematics';`
`19`	`19`	`import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';`
`@@ -28,9 +28,11 @@ export default function (options: Schema): Rule {`
`28`	`28`
`29`	`29`	`return mergeWith(`
`30`	`30`	`apply(url('./files'), [`
	`31`	+ // The `package.json` name is kept to allow renovate to update the dependency versions
	`32`	`+ move('package.json', 'package.json.template'),`
`31`	`33`	`partitionApplyMerge(`
`32`	`34`	`(p) => !/\/src\/.*?\/files\//.test(p),`
`33`		`- template({`
	`35`	`+ applyTemplates({`
`34`	`36`	`...options,`
`35`	`37`	`coreVersion,`
`36`	`38`	`schematicsVersion,`

`‎packages/angular_devkit/schematics_cli/schematic/files/dotgitignore‎ renamed to ‎packages/angular_devkit/schematics_cli/schematic/files/.gitignore.template‎`

File renamed without changes.

`‎packages/angular_devkit/schematics_cli/schematic/files/dotnpmignore‎ renamed to ‎packages/angular_devkit/schematics_cli/schematic/files/.npmignore.template‎`

File renamed without changes.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 275b5e7

File tree

8 files changed

8 files changed

`‎packages/angular_devkit/schematics_cli/blank/factory.ts‎`

`‎packages/angular_devkit/schematics_cli/blank/project-files/dotgitignore‎ renamed to ‎packages/angular_devkit/schematics_cli/blank/project-files/.gitignore.template‎`

`‎packages/angular_devkit/schematics_cli/blank/project-files/dotnpmignore‎ renamed to ‎packages/angular_devkit/schematics_cli/blank/project-files/.npmignore.template‎`

`‎packages/angular_devkit/schematics_cli/blank/schematic-files/src/name@dasherize/index.ts‎ renamed to ‎packages/angular_devkit/schematics_cli/blank/schematic-files/src/name@dasherize/index.ts.template‎`

`‎packages/angular_devkit/schematics_cli/blank/schematic-files/src/name@dasherize/index_spec.ts‎ renamed to ‎packages/angular_devkit/schematics_cli/blank/schematic-files/src/name@dasherize/index_spec.ts.template‎`

`‎packages/angular_devkit/schematics_cli/schematic/factory.ts‎`

`‎packages/angular_devkit/schematics_cli/schematic/files/dotgitignore‎ renamed to ‎packages/angular_devkit/schematics_cli/schematic/files/.gitignore.template‎`

`‎packages/angular_devkit/schematics_cli/schematic/files/dotnpmignore‎ renamed to ‎packages/angular_devkit/schematics_cli/schematic/files/.npmignore.template‎`

0 commit comments