Skip to content

Commit afd89e7

Browse files
committed
chore(build): update build scripts
1 parent 7c935e3 commit afd89e7

8 files changed

Lines changed: 203 additions & 1045 deletions

File tree

packages/angular/package-lock.json

Lines changed: 111 additions & 981 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/angular/package.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@
2020
},
2121
"scripts": {
2222
"build": "npm run clean && npm run compile && npm run clean-generated",
23-
"clean": "rm -rf dist",
24-
"clean-generated": "node ./scripts/clean.js",
23+
"clean": "node scripts/clean.js",
24+
"clean-generated": "node ./scripts/clean-generated.js",
2525
"compile": "./node_modules/.bin/ngc",
26-
"deploy": "npm run build && np --any-branch",
26+
"deploy": "node scripts/deploy.js",
2727
"lint": "tslint --project .",
28+
"prepare.deploy": "node scripts/deploy.js --prepare",
2829
"tsc": "tsc -p ."
2930
},
3031
"main": "./dist/index.js",
@@ -43,10 +44,15 @@
4344
"@angular/platform-browser-dynamic": "latest",
4445
"@angular/router": "latest",
4546
"@ionic/core": "next",
47+
"chalk": "^2.3.2",
48+
"execa": "^0.9.0",
49+
"fs-extra": "^5.0.0",
4650
"glob": "7.1.2",
47-
"np": "^2.20.1",
51+
"inquirer": "^5.1.0",
52+
"listr": "^0.13.0",
4853
"rimraf": "^2.6.2",
4954
"rxjs": "5.5.2",
55+
"semver": "^5.5.0",
5056
"tslint": "^5.8.0",
5157
"tslint-ionic-rules": "0.0.13",
5258
"typescript": "latest",

packages/angular/scripts/README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
# Deploy
12

2-
## To Build
3-
4-
1. run `npm run build` to build a distro to `dist`
5-
6-
## Publishing
7-
8-
1. Run `npm run deploy`
9-
2. Commit and push any outstanding changes
3+
1. `npm run prepare.deploy`
4+
2. Review/update changelog
5+
3. Commit updates using the package name and version number as the commit message.
6+
4. `npm run deploy`
7+
5. :tada:
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
const path = require('path');
2+
const cwd = process.cwd();
3+
4+
const glob = require('glob');
5+
const rimRaf = require('rimraf');
6+
7+
const distDir = path.join(cwd, 'dist');
8+
9+
const distGeneratedNodeModules = path.join(distDir, 'node_modules');
10+
11+
function rimRafAsync(dir) {
12+
return new Promise((resolve, reject) => {
13+
rimRaf(dir, {}, err => {
14+
if (err) {
15+
return reject(err);
16+
}
17+
resolve();
18+
})
19+
});
20+
}
21+
22+
function doGlob(globString) {
23+
return new Promise((resolve, reject) => {
24+
glob(globString, (err, matches) => {
25+
if (err) {
26+
return reject(err);
27+
}
28+
resolve(matches);
29+
})
30+
});
31+
}
32+
33+
function getCodegenedFilesToDelete() {
34+
const ngFactoryGlob = path.join(distDir, '**', '*ngfactory*');
35+
const ngSummaryGlob = path.join(distDir, '**', '*ngsummary*');
36+
const promises = [];
37+
promises.push(doGlob(ngFactoryGlob));
38+
promises.push(doGlob(ngSummaryGlob));
39+
return Promise.all(promises).then(listOfGlobResults => {
40+
const deleteFilePromises = [];
41+
listOfGlobResults.forEach(fileMatches => {
42+
fileMatches.forEach(filePath => {
43+
deleteFilePromises.push(rimRafAsync(filePath));
44+
})
45+
})
46+
return Promise.all(deleteFilePromises);
47+
});
48+
}
49+
50+
const taskPromises = [];
51+
taskPromises.push(getCodegenedFilesToDelete());
52+
taskPromises.push(rimRafAsync(distGeneratedNodeModules));
53+
54+
return Promise.all(taskPromises);

packages/angular/scripts/clean.js

Lines changed: 8 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,12 @@
1+
const fs = require('fs-extra');
12
const path = require('path');
2-
const cwd = process.cwd();
33

4-
const glob = require('glob');
5-
const rimRaf = require('rimraf');
64

7-
const distDir = path.join(cwd, 'dist');
5+
const cleanDirs = [
6+
'dist'
7+
];
88

9-
const distGeneratedNodeModules = path.join(distDir, 'node_modules');
10-
11-
function rimRafAsync(dir) {
12-
return new Promise((resolve, reject) => {
13-
rimRaf(dir, {}, err => {
14-
if (err) {
15-
return reject(err);
16-
}
17-
resolve();
18-
})
19-
});
20-
}
21-
22-
function doGlob(globString) {
23-
return new Promise((resolve, reject) => {
24-
glob(globString, (err, matches) => {
25-
if (err) {
26-
return reject(err);
27-
}
28-
resolve(matches);
29-
})
30-
});
31-
}
32-
33-
function getCodegenedFilesToDelete() {
34-
const ngFactoryGlob = path.join(distDir, '**', '*ngfactory*');
35-
const ngSummaryGlob = path.join(distDir, '**', '*ngsummary*');
36-
const promises = [];
37-
promises.push(doGlob(ngFactoryGlob));
38-
promises.push(doGlob(ngSummaryGlob));
39-
return Promise.all(promises).then(listOfGlobResults => {
40-
const deleteFilePromises = [];
41-
listOfGlobResults.forEach(fileMatches => {
42-
fileMatches.forEach(filePath => {
43-
deleteFilePromises.push(rimRafAsync(filePath));
44-
})
45-
})
46-
return Promise.all(deleteFilePromises);
47-
});
48-
}
49-
50-
const taskPromises = [];
51-
taskPromises.push(getCodegenedFilesToDelete());
52-
taskPromises.push(rimRafAsync(distGeneratedNodeModules));
53-
54-
return Promise.all(taskPromises);
9+
cleanDirs.forEach(dir => {
10+
const cleanDir = path.join(__dirname, '../', dir);
11+
fs.removeSync(cleanDir);
12+
});

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"scripts": {
4242
"build": "npm run clean && stencil build --docs",
4343
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
44-
"clean": "rm -rf dist",
44+
"clean": "node scripts/clean.js",
4545
"deploy": "node scripts/deploy.js",
4646
"dev": "sd concurrent \"stencil build --dev --watch --docs\" \"stencil-dev-server\"",
4747
"devapp": "sd concurrent \"stencil build --dev --watch --docs\" \"stencil-dev-server --broadcast\"",

packages/core/scripts/clean.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
const fs = require('fs-extra');
2+
const path = require('path');
3+
4+
5+
const cleanDirs = [
6+
'dist'
7+
];
8+
9+
cleanDirs.forEach(dir => {
10+
const cleanDir = path.join(__dirname, '../', dir);
11+
fs.removeSync(cleanDir);
12+
});

packages/core/scripts/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
1. `npm run prepare.deploy`
44
2. Review/update changelog
5-
3. Commit updates using the version number as the commit message.
5+
3. Commit updates using the package name and version number as the commit message.
66
4. `npm run deploy`
77
5. :tada:

0 commit comments

Comments
 (0)