Skip to content

Commit 43d152a

Browse files
chore(build): use SNAPSHOT-{YYYMMDD} set package.json version to tag name. do not commit yarn lock file
1 parent dcd1cda commit 43d152a

File tree

2 files changed

+64
-13
lines changed

2 files changed

+64
-13
lines changed

scripts/artifact_tagging.js

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,19 @@ if (isNarrow && readlineSync.keyInYN('Widen @uirouter/core dependency from ' + c
2323
widen = false;
2424
}
2525

26-
let tagname = `${version}+hybrid-${hybridVersion}`;
26+
const YYYYMMDD = (function() {
27+
var year = date.getFullYear();
28+
29+
var month = date.getMonth() + 1;
30+
month = (month < 10 ? "0" : "") + month;
31+
32+
var day = date.getDate();
33+
day = (day < 10 ? "0" : "") + day;
34+
35+
return year + month + day;
36+
})();
37+
38+
let tagname = `SNAPSHOT-${YYYYMMDD}`;
2739
tagname += readlineSync.question(`Suffix for tag ${tagname} (optional)?`);
2840

2941
if (!readlineSync.keyInYN(`Ready to publish ${tagname} tag?`)) {
@@ -36,12 +48,16 @@ util.ensureCleanMaster('master');
3648
_exec(`git checkout -b ${tagname}-prep`);
3749

3850
pkg.dependencies['@uirouter/core'] = widenedDep;
51+
pkg.version = tagname;
52+
3953
fs.writeFileSync("package.json", JSON.stringify(pkg, undefined, 2));
4054
_exec('git commit -m "Widening @uirouter/core dependency range to ' + widenedDep + '" package.json');
4155

4256
_exec('npm run package');
4357

44-
_exec(`git add --force lib _bundles`);
58+
_exec(`git add --force lib _bundles package.json`);
59+
_exec(`git rm yarn.lock`);
60+
4561
_exec(`git commit -m 'chore(*): commiting build files'`);
4662
_exec(`git tag ${tagname}`);
4763
_exec(`git push -u origin ${tagname}`);

yarn.lock

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,7 @@
8181
version "2.0.29"
8282
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-2.0.29.tgz#5002e14f75e2d71e564281df0431c8c1b4a2a36a"
8383

84-
"@types/node@*":
85-
version "7.0.13"
86-
resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.13.tgz#1b0a53fe9ef9c3a5d061b126cc9b915bca43a3f5"
87-
88-
"@types/node@^6.0.46":
84+
"@types/node@*", "@types/node@^6.0.46":
8985
version "6.0.73"
9086
resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.73.tgz#85dc4bb6f125377c75ddd2519a1eeb63f0a4ed70"
9187

@@ -99,9 +95,17 @@
9995
version "5.0.1"
10096
resolved "https://registry.yarnpkg.com/@uirouter/core/-/core-5.0.1.tgz#dfcdae07f74feab80b44109c407396d950390799"
10197

102-
"@uirouter/rx@=0.3.2":
103-
version "0.3.2"
104-
resolved "https://registry.yarnpkg.com/@uirouter/rx/-/rx-0.3.2.tgz#bbe2b4144d29ef9a0d27412cef7e346fbb271181"
98+
"@uirouter/rx@=0.4.1":
99+
version "0.4.1"
100+
resolved "https://registry.yarnpkg.com/@uirouter/rx/-/rx-0.4.1.tgz#658c9e58e860ae3132faf4c71a6bed7e91de02f3"
101+
dependencies:
102+
rollup "^0.41.6"
103+
rollup-plugin-commonjs "^8.0.2"
104+
rollup-plugin-node-resolve "^3.0.0"
105+
rollup-plugin-progress "^0.2.1"
106+
rollup-plugin-sourcemaps "^0.4.2"
107+
rollup-plugin-uglify "^1.0.2"
108+
rollup-plugin-visualizer "^0.2.1"
105109

106110
JSONStream@^1.0.4:
107111
version "1.3.1"
@@ -2055,6 +2059,10 @@ is-glob@^3.1.0:
20552059
dependencies:
20562060
is-extglob "^2.1.0"
20572061

2062+
is-module@^1.0.0:
2063+
version "1.0.0"
2064+
resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
2065+
20582066
is-my-json-valid@^2.12.4:
20592067
version "2.16.0"
20602068
resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
@@ -3297,6 +3305,16 @@ rollup-plugin-commonjs@^7.0.0:
32973305
resolve "^1.1.7"
32983306
rollup-pluginutils "^2.0.1"
32993307

3308+
rollup-plugin-commonjs@^8.0.2:
3309+
version "8.0.2"
3310+
resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.0.2.tgz#98b1589bfe32a6c0f67790b60c0b499972afed89"
3311+
dependencies:
3312+
acorn "^4.0.1"
3313+
estree-walker "^0.3.0"
3314+
magic-string "^0.19.0"
3315+
resolve "^1.1.7"
3316+
rollup-pluginutils "^2.0.1"
3317+
33003318
rollup-plugin-node-resolve@^2.0.0:
33013319
version "2.1.1"
33023320
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-2.1.1.tgz#cbb783b0d15b02794d58915350b2f0d902b8ddc8"
@@ -3305,21 +3323,30 @@ rollup-plugin-node-resolve@^2.0.0:
33053323
builtin-modules "^1.1.0"
33063324
resolve "^1.1.6"
33073325

3326+
rollup-plugin-node-resolve@^3.0.0:
3327+
version "3.0.0"
3328+
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
3329+
dependencies:
3330+
browser-resolve "^1.11.0"
3331+
builtin-modules "^1.1.0"
3332+
is-module "^1.0.0"
3333+
resolve "^1.1.6"
3334+
33083335
rollup-plugin-progress@^0.2.1:
33093336
version "0.2.1"
33103337
resolved "https://registry.yarnpkg.com/rollup-plugin-progress/-/rollup-plugin-progress-0.2.1.tgz#e3c932a0316374daaf37f471c86d4adfb9caee57"
33113338
dependencies:
33123339
chalk "^1.1.3"
33133340
rollup-pluginutils "^1.5.1"
33143341

3315-
rollup-plugin-sourcemaps@^0.4.1:
3342+
rollup-plugin-sourcemaps@^0.4.1, rollup-plugin-sourcemaps@^0.4.2:
33163343
version "0.4.2"
33173344
resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz#62125aa94087aadf7b83ef4dfaf629b473135e87"
33183345
dependencies:
33193346
rollup-pluginutils "^2.0.1"
33203347
source-map-resolve "^0.5.0"
33213348

3322-
rollup-plugin-uglify@^1.0.1:
3349+
rollup-plugin-uglify@^1.0.1, rollup-plugin-uglify@^1.0.2:
33233350
version "1.0.2"
33243351
resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-1.0.2.tgz#d4aa6f5df13522eae1ba17780c7c4c7096038359"
33253352
dependencies:
@@ -3329,6 +3356,10 @@ rollup-plugin-visualizer@^0.2.0:
33293356
version "0.2.0"
33303357
resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-0.2.0.tgz#bdd895d009144e1aab65a6caca07a7a9416e1d31"
33313358

3359+
rollup-plugin-visualizer@^0.2.1:
3360+
version "0.2.1"
3361+
resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-0.2.1.tgz#f8ce144a23f3f41d6bc930066119b47f1415d4ab"
3362+
33323363
rollup-pluginutils@^1.5.1:
33333364
version "1.5.2"
33343365
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
@@ -3343,7 +3374,7 @@ rollup-pluginutils@^2.0.1:
33433374
estree-walker "^0.3.0"
33443375
micromatch "^2.3.11"
33453376

3346-
rollup@^0.41.4:
3377+
rollup@^0.41.4, rollup@^0.41.6:
33473378
version "0.41.6"
33483379
resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.6.tgz#e0d05497877a398c104d816d2733a718a7a94e2a"
33493380
dependencies:
@@ -3825,6 +3856,10 @@ tsickle@^0.21.0:
38253856
source-map "^0.5.6"
38263857
source-map-support "^0.4.2"
38273858

3859+
tslib@^1.7.1:
3860+
version "1.7.1"
3861+
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.7.1.tgz#bc8004164691923a79fe8378bbeb3da2017538ec"
3862+
38283863
tslint@=2.5.0:
38293864
version "2.5.0"
38303865
resolved "https://registry.yarnpkg.com/tslint/-/tslint-2.5.0.tgz#9c7ba48c5da7aba97d8b761a7bd722da7e140f3b"

0 commit comments

Comments
 (0)