Skip to content

Commit 36d8cc8

Browse files
committed
fixing comments
1 parent f4015e5 commit 36d8cc8

File tree

7 files changed

+8
-14
lines changed

7 files changed

+8
-14
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"devDependencies": {
120120
"@types/chai": "^3.4.32",
121121
"@types/chalk": "^0.4.28",
122-
"@types/common-tags": "^1.2.3",
122+
"@types/common-tags": "^1.2.4",
123123
"@types/denodeify": "^1.2.29",
124124
"@types/express": "^4.0.32",
125125
"@types/fs-extra": "^0.0.31",

packages/angular-cli/addon/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module.exports = {
2424
'init': require('../commands/init').default,
2525
'test': require('../commands/test').default,
2626
'e2e': require('../commands/e2e').default,
27+
'help': require('../commands/help').default,
2728
'lint': require('../commands/lint').default,
2829
'version': require('../commands/version').default,
2930
'completion': require('../commands/completion').default,
File renamed without changes.

packages/angular-cli/tsconfig.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
}
2626
},
2727
"exclude": [
28-
"blueprints/*/files/**/*",
29-
"**/*.spec.ts"
28+
"blueprints/*/files/**/*"
3029
]
3130
}

plugins/karma.js

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
// This file is necessary when using a linked angular-cli to this repo, meaning that
2+
// require('angular-cli/plugins/karma') will load this file, and we just forward to
3+
// the actual published file.
14
module.exports = require('../packages/angular-cli/plugins/karma');

scripts/publish/build.js

+1-10
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,10 @@ function copy(from, to) {
3030
}
3131

3232

33-
function patch() {
34-
const filePath = path.join(__dirname, '../../node_modules/@types/common-tags/common-tags.d.ts');
35-
const content = fs.readFileSync(filePath, 'utf8')
36-
.replace(/literals: string\[\]/, 'literals: TemplateStringsArray');
37-
fs.writeFileSync(filePath, content, 'utf8');
38-
}
39-
4033
// First delete the dist folder.
4134
Promise.resolve()
4235
.then(() => console.log('Deleting dist folder...'))
4336
.then(() => rimraf(dist))
44-
.then(() => console.log('Patching node_modules typings...'))
45-
.then(() => patch())
4637
.then(() => console.log('Compiling packages...'))
4738
.then(() => {
4839
const packages = require('../../lib/packages');
@@ -64,7 +55,7 @@ Promise.resolve()
6455
return files
6556
.map((fileName) => path.relative(packagesRoot, fileName))
6657
.filter((fileName) => {
67-
if (/^angular-cli.blueprints/.test(fileName)) {
58+
if (/^angular-cli[\\\/]blueprints/.test(fileName)) {
6859
return true;
6960
}
7061
if (/\.d\.ts$/.test(fileName)) {

tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"moduleResolution": "node",
77
"noEmitOnError": true,
88
"noImplicitAny": true,
9-
"outDir": "./dist/asd",
9+
"outDir": "./dist",
1010
"rootDir": ".",
1111
"sourceMap": true,
1212
"sourceRoot": "",

0 commit comments

Comments
 (0)