Skip to content

Commit c86bba5

Browse files
Merge pull request Azure#46 from Azure/v3
Merge All to master
2 parents fe0a657 + 60611fa commit c86bba5

File tree

292 files changed

+4436
-7388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

292 files changed

+4436
-7388
lines changed

.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Don't allow people to merge changes to these generated files, because the result
2+
# may be invalid. You need to run "rush update" again.
3+
shrinkwrap.yaml merge=binary
4+
npm-shrinkwrap.json merge=binary
5+
yarn.lock merge=binary
6+
7+
* text=auto eol=lf

.gitignore

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ __pycache__/
287287
*.odx.cs
288288
*.xsd.cs
289289

290-
dist/*
290+
**/dist/*
291291
node_modules/*
292292
package-lock.json
293293
generated/*
@@ -299,4 +299,70 @@ package/*
299299
generated*/*
300300
petstore*/*
301301

302-
**/generated*/*
302+
**/generated*/*
303+
304+
305+
# Logs
306+
*.log
307+
npm-debug.log*
308+
yarn-debug.log*
309+
yarn-error.log*
310+
311+
# Runtime data
312+
*.pid
313+
*.seed
314+
*.pid.lock
315+
316+
# Directory for instrumented libs generated by jscoverage/JSCover
317+
lib-cov
318+
319+
# Coverage directory used by tools like istanbul
320+
coverage
321+
322+
# nyc test coverage
323+
.nyc_output
324+
325+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
326+
.grunt
327+
328+
# Bower dependency directory (https://bower.io/)
329+
bower_components
330+
331+
# node-waf configuration
332+
.lock-wscript
333+
334+
# Compiled binary addons (https://nodejs.org/api/addons.html)
335+
build/Release
336+
337+
# Dependency directories
338+
node_modules/
339+
jspm_packages/
340+
341+
# Optional npm cache directory
342+
.npm
343+
344+
# Optional eslint cache
345+
.eslintcache
346+
347+
# Optional REPL history
348+
.node_repl_history
349+
350+
# Output of 'npm pack'
351+
*.tgz
352+
353+
# Yarn Integrity file
354+
.yarn-integrity
355+
356+
# dotenv environment variables file
357+
.env
358+
359+
# next.js build output
360+
.next
361+
362+
# Common toolchain intermediate files
363+
temp
364+
365+
# Rush files
366+
common/temp/**
367+
package-deps.json
368+
/common/config/rush/shrinkwrap.yaml

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "perks"]
2+
path = perks
3+
url = https://github.com/azure/perks

.scripts/publish.js

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
11
const semver = require("semver");
22
const util = require("util");
3-
const cp= require("child_process");
4-
const exec=util.promisify(cp.exec);
3+
const cp = require("child_process");
4+
const exec = util.promisify(cp.exec);
55

6-
async function getTag(package_json) {
7-
for( const each of process.argv ) {
8-
if( each.startsWith("--tag=")) {
6+
async function getTag(packageJson) {
7+
for ( const each of process.argv ) {
8+
if ( each.startsWith("--tag=")) {
99
const tag = each.substr(6);
10-
if( tag ) {
10+
if ( tag ) {
1111
return tag;
1212
}
1313
}
1414
}
15-
16-
const suffix = semver.parse((package_json.version).trim()).prerelease.join(".");
17-
if( suffix ) {
18-
return suffix;
15+
16+
const suffix = semver.parse((packageJson.version).trim()).prerelease.join(".");
17+
if ( suffix ) {
18+
return suffix;
1919
}
2020

21-
if( process.env.BUILD_SOURCEBRANCHNAME ) {
22-
return process.env.BUILD_SOURCEBRANCHNAME === "master" || process.env.BUILD_SOURCEBRANCHNAME ==="HEAD" ? "preview" : process.env.BUILD_SOURCEBRANCHNAME;
21+
if ( process.env.BUILD_SOURCEBRANCHNAME ) {
22+
return process.env.BUILD_SOURCEBRANCHNAME === "master" || process.env.BUILD_SOURCEBRANCHNAME === "HEAD" ?
23+
"preview" :
24+
process.env.BUILD_SOURCEBRANCHNAME;
2325
}
2426

2527
const branch = (await exec("git rev-parse --abbrev-ref HEAD")).stdout.trim();
2628
return !branch || branch === "master" ? "preview" : branch;
2729
}
2830

2931
async function main() {
30-
const package_json = require("../package.json");
31-
const baseVersion = (package_json.version).trim()
32+
const packageJson = require("../package.json");
33+
const baseVersion = (packageJson.version).trim();
3234

33-
tag =await getTag(package_json);
35+
tag = await getTag(packageJson);
3436

35-
3637
const v = (await exec("git rev-list --parents HEAD --count --full-history")).stdout.trim();
3738

38-
const version = `${semver.major(baseVersion)}.${semver.minor(baseVersion)}.${v}`
39+
const version = `${semver.major(baseVersion)}.${semver.minor(baseVersion)}.${v}`;
3940

4041
console.log(`Using version ${version}, tag ${tag}`);
41-
process.argv.push(`publish`,`--access`,`public`,`--tag`,tag,`--new-version`,`${version}`, `--no-git-tag-version`);
42+
process.argv.push(`publish`, `--access`,
43+
`public`, `--tag`, tag, `--new-version`, `${version}`, `--no-git-tag-version`);
4244
// now, on with the publish...
4345
require( "yarn/lib/cli.js" );
4446
}

.vscode/launch.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
2-
// Use IntelliSense to learn about possible attributes.
3-
// Hover to view descriptions of existing attributes.
4-
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5-
"version": "0.2.0",
6-
"configurations": [
7-
{
8-
"type": "node",
9-
"request": "attach",
10-
"name": "Attach",
11-
"address": "127.0.0.1",
12-
"port": 9229,
13-
"localRoot": "${workspaceFolder}"
14-
}
15-
]
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"type": "node",
9+
"request": "attach",
10+
"name": "Attach",
11+
"address": "127.0.0.1",
12+
"port": 9229,
13+
"localRoot": "${workspaceFolder}",
14+
"remoteRoot": "${workspaceFolder}"
15+
}
16+
]
1617
}

.vscode/settings.json

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,49 @@
1-
// Place your settings in this file to overwrite default and user settings.
2-
{
3-
"files.eol": "\n",
4-
"files.exclude": {
5-
"node_modules/**": true,
6-
"dist/**": true,
7-
"generated/**": true,
8-
"generated": true,
9-
"ps-generated/**": true,
10-
"generated2/**": true,
11-
"**/node_modules/**": true,
12-
"**/*.js.map": true,
13-
"**/*.js": {
14-
"when": "$(basename).ts"
15-
},
16-
"**/*.d.ts": {
17-
"when": "$(basename).ts"
18-
},
19-
"**/.git": true,
20-
"**/.svn": true,
21-
"**/.hg": true,
22-
"**/.DS_Store": true,
23-
"**/obj/**": true,
24-
"**/bin/**": true
25-
},
26-
"[typescript]": {
27-
"editor.formatOnSave": true,
28-
"editor.formatOnPaste": true,
29-
"editor.tabSize": 2,
30-
"editor.detectIndentation": false
31-
},
32-
"[json]": {
33-
"editor.formatOnSave": true,
34-
"editor.formatOnPaste": true,
35-
"editor.tabSize": 2,
36-
"editor.detectIndentation": false
37-
},
38-
"[csharp]": {
39-
"editor.formatOnSave": true,
40-
"editor.formatOnPaste": true,
41-
"editor.tabSize": 4,
42-
"editor.detectIndentation": false
43-
},
44-
"typescript.tsdk": "node_modules\\typescript\\lib",
1+
// Place your settings in this file to overwrite default and user settings.
2+
{
3+
"files.eol": "\n",
4+
"files.exclude": {
5+
"**/node_modules/**": true,
6+
"**/dist/**": true,
7+
"generated/**": true,
8+
"generated": true,
9+
"ps-generated/**": true,
10+
"generated2/**": true,
11+
"**/*.js.map": true,
12+
"**/*.js": {
13+
"when": "$(basename).ts"
14+
},
15+
"**/*.d.ts": {
16+
"when": "$(basename).ts"
17+
},
18+
"**/.git": true,
19+
"**/.svn": true,
20+
"**/.hg": true,
21+
"**/.DS_Store": true,
22+
"**/obj/**": true,
23+
"**/bin/**": true
24+
},
25+
"[typescript]": {
26+
"editor.formatOnSave": true,
27+
"editor.formatOnPaste": true,
28+
"editor.tabSize": 2,
29+
"editor.detectIndentation": false,
30+
},
31+
"[json]": {
32+
"editor.formatOnSave": true,
33+
"editor.formatOnPaste": true,
34+
"editor.tabSize": 2,
35+
"editor.detectIndentation": false
36+
},
37+
"[csharp]": {
38+
"editor.formatOnSave": true,
39+
"editor.formatOnPaste": true,
40+
"editor.tabSize": 4,
41+
"editor.detectIndentation": false
42+
},
43+
"typescript.tsdk": "node_modules\\typescript\\lib",
44+
"files.associations": {
45+
"rush.json": "jsonc",
46+
"command-line.json": "jsonc",
47+
"common-versions.json": "jsonc"
48+
},
4549
}

Examples/TimesWire/readme.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

common/config/rush/.npmrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Rush uses this file to configure the package registry, regardless of whether the
2+
# package manager is PNPM, NPM, or Yarn. Prior to invoking the package manager,
3+
# Rush will always copy this file to the folder where installation is performed.
4+
# When NPM is the package manager, Rush works around NPM's processing of
5+
# undefined environment variables by deleting any lines that reference undefined
6+
# environment variables.
7+
#
8+
# DO NOT SPECIFY AUTHENTICATION CREDENTIALS IN THIS FILE. It should only be used
9+
# to configure registry sources.
10+
11+
registry=https://registry.npmjs.org/
12+
always-auth=false
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"$schema": "https://developer.microsoft.com/json-schemas/rush/v5/command-line.schema.json",
3+
"commands": [
4+
{
5+
"commandKind": "bulk",
6+
"name": "set-version",
7+
"summary": "set the version in the package.json files",
8+
"enableParallelism": true,
9+
"ignoreMissingScript": true
10+
},
11+
{
12+
"commandKind": "global",
13+
"name": "sync-versions",
14+
"summary": "sync versions of sibling projects",
15+
"shellCommand": "node common/scripts/sync-versions.js"
16+
},
17+
{
18+
"commandKind": "global",
19+
"name": "watch",
20+
"summary": "run npm watch on all projects",
21+
"shellCommand": "node common/scripts/watch.js"
22+
},
23+
{
24+
"commandKind": "global",
25+
"name": "clean",
26+
"summary": "run npm clean on all projects",
27+
"shellCommand": "node common/scripts/clean.js"
28+
}
29+
],
30+
"parameters": []
31+
}

0 commit comments

Comments
 (0)