Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get web-build-tools using PNPM #383

Merged
merged 50 commits into from
Jan 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
2b2f79e
Delete old shrinkwrap
nickpape-msft Aug 18, 2017
4b3894b
Fix rush.json
nickpape-msft Aug 18, 2017
5224bbf
Testing
nickpape-msft Aug 28, 2017
0fbd740
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Sep 8, 2017
579d458
yaml
nickpape-msft Sep 15, 2017
3024c90
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Sep 27, 2017
99891bd
Get PNPM to compile!
nickpape-msft Sep 28, 2017
f7f26c3
Update version
nickpape-msft Sep 28, 2017
4418976
Install
nickpape-msft Nov 3, 2017
bed05c0
Update Jest
nickpape-msft Nov 3, 2017
3beef2c
Generate
nickpape-msft Nov 16, 2017
963eeb9
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Nov 16, 2017
4d0ba25
Rush check
nickpape-msft Nov 16, 2017
84d8a06
Generate
nickpape-msft Nov 17, 2017
fe537ac
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Nov 20, 2017
ff2a06b
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Nov 27, 2017
0d1c3ad
Merge branch 'master' into nickpape/test-pnpm
nickpape Nov 30, 2017
0128f18
delte
nickpape Nov 30, 2017
aa08fd0
Generate
nickpape Nov 30, 2017
43ea3d1
Merge branch 'master' into nickpape/test-pnpm
nickpape Dec 1, 2017
4d61258
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Dec 6, 2017
bf7f3e2
Rush generate
nickpape-msft Dec 6, 2017
d0aa89a
Generate
nickpape-msft Dec 11, 2017
9c577aa
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Dec 11, 2017
7fbf0b8
Add a pnpmfile to add slash dependency
nickpape-msft Dec 11, 2017
efa1871
Update node types
nickpape-msft Dec 11, 2017
b2251f0
Regenerate with new node
nickpape-msft Dec 11, 2017
37fdeb9
Gets everything building
nickpape-msft Dec 15, 2017
a42679b
Rush generate
nickpape-msft Dec 15, 2017
08d0c41
Merge branch 'nickpape/test-pnpm' of https://github.com/Microsoft/web…
nickpape-msft Dec 15, 2017
f2e5ae2
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Dec 15, 2017
edf15fd
Merge branch 'master' into nickpape/test-pnpm
nickpape Jan 4, 2018
78b2b74
Update PNPM version
nickpape Jan 4, 2018
734c99a
Update gulp-core-build and node-library-build
nickpape Jan 5, 2018
4b9d612
Merge branch 'master' into nickpape/test-pnpm
nickpape Jan 5, 2018
b98f42b
move things into appropriate list
nickpape Jan 5, 2018
c093b77
Merge branch 'master' into nickpape/test-pnpm
nickpape Jan 5, 2018
98dbbb6
Bump gulp-core-build and node-library-build versions
nickpape Jan 5, 2018
e0f6e05
Generate
nickpape Jan 5, 2018
1f421bc
Revert @types/nodejs change
nickpape Jan 5, 2018
cd0bbd3
Remove unnecessary pnpmfile.js
nickpape Jan 5, 2018
dec99f4
Revert launchfile
nickpape Jan 5, 2018
705faa4
Revert @types/gulp @types/orchestrator and GulpProxy changes
nickpape Jan 5, 2018
63f96b2
Re-add GulpProxy to GulpTask
nickpape-msft Jan 5, 2018
0fe08d2
Missed a couple api files
nickpape-msft Jan 5, 2018
f132110
Changefiles
nickpape-msft Jan 5, 2018
ced1169
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Jan 8, 2018
7695a12
Bump rush to 4.1.1
nickpape-msft Jan 9, 2018
af2bb30
Merge branch 'master' into nickpape/test-pnpm
nickpape-msft Jan 9, 2018
b2f081f
generate
nickpape-msft Jan 9, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/rush-lib/src/cli/actions/BaseRushAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export abstract class BaseRushAction extends CommandLineAction {

private _ensureEnvironment(): void {
/* tslint:disable-next-line:no-string-literal */
let environmentPath: string = process.env['PATH'];
let environmentPath: string | undefined = process.env['PATH'];
environmentPath = path.join(this.rushConfiguration.commonTempFolder, 'node_modules', '.bin') +
path.delimiter + environmentPath;
/* tslint:disable-next-line:no-string-literal */
Expand Down
4 changes: 2 additions & 2 deletions apps/rush-lib/src/cli/actions/PublishAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ export default class PublishAction extends BaseRushAction {
}

private _npmPublish(packageName: string, packagePath: string): void {
const env: { [key: string]: string } = PublishUtilities.getEnvArgs();
const env: { [key: string]: string | undefined } = PublishUtilities.getEnvArgs();
const args: string[] = ['publish'];

if (this.rushConfiguration.projectsByName.get(packageName)!.shouldPublish) {
Expand Down Expand Up @@ -291,7 +291,7 @@ export default class PublishAction extends BaseRushAction {
}

private _packageExists(packageConfig: RushConfigurationProject): boolean {
const env: { [key: string]: string } = PublishUtilities.getEnvArgs();
const env: { [key: string]: string | undefined } = PublishUtilities.getEnvArgs();
if (this._registryUrl.value) {
env['npm_config_registry'] = this._registryUrl.value; // tslint:disable-line:no-string-literal
}
Expand Down
8 changes: 4 additions & 4 deletions apps/rush-lib/src/cli/utilities/PublishUtilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ export default class PublishUtilities {
return LOOSE_PKG_REGEX.test(version);
}

public static getEnvArgs(): { [key: string]: string } {
const env: { [key: string]: string } = {};
public static getEnvArgs(): { [key: string]: string | undefined } {
const env: { [key: string]: string | undefined } = {};

// Copy existing process.env values (for nodist)
Object.keys(process.env).forEach((key: string) => {
Expand All @@ -186,11 +186,11 @@ export default class PublishUtilities {
command: string,
args: string[] = [],
workingDirectory: string = process.cwd(),
env?: { [key: string]: string }
env?: { [key: string]: string | undefined }
): void {

let relativeDirectory: string = path.relative(process.cwd(), workingDirectory);
const envArgs: { [key: string]: string } = PublishUtilities.getEnvArgs();
const envArgs: { [key: string]: string | undefined } = PublishUtilities.getEnvArgs();

if (relativeDirectory) {
relativeDirectory = `(${relativeDirectory})`;
Expand Down
3 changes: 2 additions & 1 deletion apps/rush-lib/src/data/RushConfiguration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@ export default class RushConfiguration {
* this looks something like "/usr/username/"
*/
public static getHomeDirectory(): string {
const unresolvedUserFolder: string = process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
const unresolvedUserFolder: string | undefined
= process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
const homeFolder: string = path.resolve(unresolvedUserFolder);
if (!fsx.existsSync(homeFolder)) {
throw new Error('Unable to determine the current user\'s home directory');
Expand Down
2 changes: 1 addition & 1 deletion apps/rush-lib/src/utilities/Npm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default class Npm {
public static publishedVersions(
packageName: string,
cwd: string,
env: { [key: string]: string }
env: { [key: string]: string | undefined }
): string[] {
const versions: string[] = [];
try {
Expand Down
10 changes: 5 additions & 5 deletions apps/rush-lib/src/utilities/Utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ export default class Utilities {
* The current directory will be set to the specified workingDirectory.
*/
public static executeCommand(command: string, args: string[], workingDirectory: string,
suppressOutput: boolean = false, environmentVariables?: { [key: string]: string }): void {
suppressOutput: boolean = false, environmentVariables?: { [key: string]: string | undefined }): void {

Utilities._executeCommandInternal(command, args, workingDirectory,
suppressOutput ? undefined : [0, 1, 2],
Expand All @@ -224,7 +224,7 @@ export default class Utilities {
* The current directory will be set to the specified workingDirectory.
*/
public static executeCommandAndCaptureOutput(command: string, args: string[], workingDirectory: string,
environmentVariables?: { [key: string]: string }): string {
environmentVariables?: { [key: string]: string | undefined }): string {

const result: child_process.SpawnSyncReturns<Buffer>
= Utilities._executeCommandInternal(command, args, workingDirectory,
Expand Down Expand Up @@ -301,7 +301,7 @@ export default class Utilities {
public static executeShellCommand(
command: string,
workingDirectory: string,
environmentVariables?: { [key: string]: string },
environmentVariables?: { [key: string]: string | undefined },
captureOutput: boolean = false
): child_process.SpawnSyncReturns<Buffer> {
let shellCommand: string = process.env.comspec || 'cmd';
Expand Down Expand Up @@ -337,7 +337,7 @@ export default class Utilities {
public static executeShellCommandAsync(
command: string,
workingDirectory: string,
environmentVariables?: { [key: string]: string },
environmentVariables?: { [key: string]: string | undefined },
captureOutput: boolean = false
): child_process.ChildProcess {
let shellCommand: string = process.env.comspec || 'cmd';
Expand Down Expand Up @@ -423,7 +423,7 @@ export default class Utilities {
private static _executeCommandInternal(
command: string, args: string[], workingDirectory: string,
stdio: (string|number)[] | undefined,
environmentVariables: { [key: string]: string } | undefined): child_process.SpawnSyncReturns<Buffer> {
environmentVariables: { [key: string]: string | undefined } | undefined): child_process.SpawnSyncReturns<Buffer> {

const options: child_process.SpawnSyncOptions = {
cwd: workingDirectory,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/api-extractor",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/api-extractor",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/gulp-core-build-karma",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/gulp-core-build-karma",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/gulp-core-build-mocha",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/gulp-core-build-mocha",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/gulp-core-build-sass",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/gulp-core-build-sass",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/gulp-core-build-serve",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/gulp-core-build-serve",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/gulp-core-build-typescript",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/gulp-core-build-typescript",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/gulp-core-build-webpack",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/gulp-core-build-webpack",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/gulp-core-build",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/gulp-core-build",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/node-core-library",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/node-core-library",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/set-webpack-public-path-plugin",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/set-webpack-public-path-plugin",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@microsoft/ts-command-line",
"comment": "Get web-build-tools building with pnpm",
"type": "patch"
}
],
"packageName": "@microsoft/ts-command-line",
"email": "[email protected]"
}
4 changes: 4 additions & 0 deletions common/config/rush/nonbrowser-approved-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,10 @@
"name": "jest-cli",
"allowedCategories": [ "libraries", "other" ]
},
{
"name": "jest-resolve",
"allowedCategories": [ "libraries" ]
},
{
"name": "jju",
"allowedCategories": [ "libraries" ]
Expand Down
Loading