From f88612bb6a657171e8844c26246f207ac50dc9e1 Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 08:47:40 -0700 Subject: [PATCH 1/9] Only use our npm for @salesforce packages This makes it fetch from the public npm for the public packages, possibly reducing any mirroring issues. --- .npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index 6659b35b85..65cbf19f19 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1 @@ -registry=https://npm.lwcjs.org/ \ No newline at end of file +@salesforce:registry=https://npm.lwcjs.org/ From 9180947d746021f4e683780260a7798f4b902740 Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 08:57:21 -0700 Subject: [PATCH 2/9] Update .npmrc --- .npmrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index 65cbf19f19..b0c801c720 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1,3 @@ -@salesforce:registry=https://npm.lwcjs.org/ +registry=https://npm.lwcjs.org/ +@types:registry = "https://registry.npmjs.org/" +@babel:registry = "https://registry.npmjs.org/" From 93410b1240cf7e4998edb3f9860e2046924d3f1b Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 09:03:13 -0700 Subject: [PATCH 3/9] Change ordering so that scoped types are fetch first --- .npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index b0c801c720..520992fa11 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,3 @@ -registry=https://npm.lwcjs.org/ @types:registry = "https://registry.npmjs.org/" @babel:registry = "https://registry.npmjs.org/" +registry=https://npm.lwcjs.org/ From edb5ed90be645fadcf79c9cc832c77a94b683ca7 Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 09:09:20 -0700 Subject: [PATCH 4/9] Update .npmrc --- .npmrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.npmrc b/.npmrc index 520992fa11..3c2817536f 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,3 @@ -@types:registry = "https://registry.npmjs.org/" -@babel:registry = "https://registry.npmjs.org/" -registry=https://npm.lwcjs.org/ +@types:registry=https://registry.npmjs.org/ +@babel:registry=https://registry.npmjs.org/ +registry=https://registry.npmjs.org/ From 1c266b0c59e10e4de9e890b8c9154525e270edf5 Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 09:15:45 -0700 Subject: [PATCH 5/9] Update .npmrc --- .npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index 3c2817536f..27bdbb90a1 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1,3 @@ @types:registry=https://registry.npmjs.org/ @babel:registry=https://registry.npmjs.org/ -registry=https://registry.npmjs.org/ +registry=https://npm.lwcjs.org/ From b37330305e8696060922c06eb6a0aa3d2f9130c3 Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 10:14:25 -0700 Subject: [PATCH 6/9] Use direct tar ball reference in package.json --- .npmrc | 4 +--- packages/salesforcedx-vscode-lwc-next/package.json | 7 ++++--- packages/salesforcedx-vscode-lwc/package.json | 6 ++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.npmrc b/.npmrc index 27bdbb90a1..5660f81af2 100644 --- a/.npmrc +++ b/.npmrc @@ -1,3 +1 @@ -@types:registry=https://registry.npmjs.org/ -@babel:registry=https://registry.npmjs.org/ -registry=https://npm.lwcjs.org/ +registry=https://registry.npmjs.org/ \ No newline at end of file diff --git a/packages/salesforcedx-vscode-lwc-next/package.json b/packages/salesforcedx-vscode-lwc-next/package.json index 3aee692acc..c54c02bb87 100644 --- a/packages/salesforcedx-vscode-lwc-next/package.json +++ b/packages/salesforcedx-vscode-lwc-next/package.json @@ -25,9 +25,10 @@ "dependencies": { "@salesforce/salesforcedx-utils-vscode": "43.14.0", "ajv": "^6.1.1", - "eslint": "4.16.0", - "eslint-plugin-lwc": "0.4.0", - "lwc-language-server": "1.6.6", + "eslint-plugin-lwc": + "http://npm.lwcjs.org/eslint-plugin-lwc/-/eslint-plugin-lwc-0.4.0/643f5e18247ca8c0a60bf972f4d3795c97e8e6fe.tgz", + "lwc-language-server": + "http://npm.lwcjs.org/lwc-language-server/-/lwc-language-server-1.6.1/48af811b08f90d445c0a5185071129d29df73d39.tgz", "rxjs": "^5.4.1", "vscode-extension-telemetry": "0.0.17", "vscode-languageclient": "3.5.1" diff --git a/packages/salesforcedx-vscode-lwc/package.json b/packages/salesforcedx-vscode-lwc/package.json index f58279e58f..3c73501e76 100644 --- a/packages/salesforcedx-vscode-lwc/package.json +++ b/packages/salesforcedx-vscode-lwc/package.json @@ -26,8 +26,10 @@ "@salesforce/salesforcedx-utils-vscode": "43.14.0", "ajv": "^6.1.1", "eslint": "4.16.0", - "eslint-plugin-lwc": "0.3.2", - "lwc-language-server": "1.5.1", + "eslint-plugin-lwc": + "http://npm.lwcjs.org/eslint-plugin-lwc/-/eslint-plugin-lwc-0.3.2/1265d7c33e7c3b01d6b01aabbc6ae8e6023f87b1.tgz", + "lwc-language-server": + "http://npm.lwcjs.org/lwc-language-server/-/lwc-language-server-1.5.1/bf8dd827a1649f8a48654f9b4db7d6d3ae5844d9.tgz", "rxjs": "^5.4.1", "vscode-extension-telemetry": "0.0.17", "vscode-languageclient": "3.5.1" From 54ffbcac89436a0c225fceff13a20247493f551f Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 10:21:27 -0700 Subject: [PATCH 7/9] Include eslint again --- packages/salesforcedx-vscode-lwc-next/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/salesforcedx-vscode-lwc-next/package.json b/packages/salesforcedx-vscode-lwc-next/package.json index c54c02bb87..f5a9be7d81 100644 --- a/packages/salesforcedx-vscode-lwc-next/package.json +++ b/packages/salesforcedx-vscode-lwc-next/package.json @@ -25,6 +25,7 @@ "dependencies": { "@salesforce/salesforcedx-utils-vscode": "43.14.0", "ajv": "^6.1.1", + "eslint": "4.16.0", "eslint-plugin-lwc": "http://npm.lwcjs.org/eslint-plugin-lwc/-/eslint-plugin-lwc-0.4.0/643f5e18247ca8c0a60bf972f4d3795c97e8e6fe.tgz", "lwc-language-server": From cf0a41802f7f30707280240cd1c5d86ff11f3e80 Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 11:04:24 -0700 Subject: [PATCH 8/9] Use 1.6.6 instead of 1.6.1 --- packages/salesforcedx-vscode-lwc-next/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/salesforcedx-vscode-lwc-next/package.json b/packages/salesforcedx-vscode-lwc-next/package.json index f5a9be7d81..7b8df0387e 100644 --- a/packages/salesforcedx-vscode-lwc-next/package.json +++ b/packages/salesforcedx-vscode-lwc-next/package.json @@ -29,7 +29,7 @@ "eslint-plugin-lwc": "http://npm.lwcjs.org/eslint-plugin-lwc/-/eslint-plugin-lwc-0.4.0/643f5e18247ca8c0a60bf972f4d3795c97e8e6fe.tgz", "lwc-language-server": - "http://npm.lwcjs.org/lwc-language-server/-/lwc-language-server-1.6.1/48af811b08f90d445c0a5185071129d29df73d39.tgz", + "http://npm.lwcjs.org/lwc-language-server/-/lwc-language-server-1.6.6/b07449a69636eeb8b511a432af2be911a6d06118.tgz", "rxjs": "^5.4.1", "vscode-extension-telemetry": "0.0.17", "vscode-languageclient": "3.5.1" From 6860b0bd17ad1dcb10cc3756b5a3eff9ab36f354 Mon Sep 17 00:00:00 2001 From: Nick Chen Date: Fri, 31 Aug 2018 11:46:39 -0700 Subject: [PATCH 9/9] Update to lwc-language-server@1.6.6 --- packages/salesforcedx-vscode-lwc-next/package.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/salesforcedx-vscode-lwc-next/package.json b/packages/salesforcedx-vscode-lwc-next/package.json index 7b8df0387e..043a65a3ec 100644 --- a/packages/salesforcedx-vscode-lwc-next/package.json +++ b/packages/salesforcedx-vscode-lwc-next/package.json @@ -28,8 +28,22 @@ "eslint": "4.16.0", "eslint-plugin-lwc": "http://npm.lwcjs.org/eslint-plugin-lwc/-/eslint-plugin-lwc-0.4.0/643f5e18247ca8c0a60bf972f4d3795c97e8e6fe.tgz", + "babel-plugin-transform-proxy-compat": + "http://npm.lwcjs.org/babel-plugin-transform-proxy-compat/-/babel-plugin-transform-proxy-compat-0.18.11/6c2567c41831f58de3c91cb98920b9276bcb61fc.tgz", + "babel-preset-compat": + "http://npm.lwcjs.org/babel-preset-compat/-/babel-preset-compat-0.18.11/68d54e19fcd4df57ddec0762f71ca405986be080.tgz", + "babel-plugin-transform-lwc-class": + "http://npm.lwcjs.org/babel-plugin-transform-lwc-class/-/babel-plugin-transform-lwc-class-0.24.20/d0400eb432808ab6e89a9cab52b6c43a409b460d.tgz", "lwc-language-server": "http://npm.lwcjs.org/lwc-language-server/-/lwc-language-server-1.6.6/b07449a69636eeb8b511a432af2be911a6d06118.tgz", + "lwc-engine": + "http://npm.lwcjs.org/lwc-engine/-/lwc-engine-0.24.20/6d6c999babafd4ca506d7a7a843b81fb92b2ef64.tgz", + "postcss-plugin-lwc": + "http://npm.lwcjs.org/postcss-plugin-lwc/-/postcss-plugin-lwc-0.24.20/94f003d93978779dd0f4a1dbe3aaf8a7eb7aaeb9.tgz", + "lwc-compiler": + "http://npm.lwcjs.org/lwc-compiler/-/lwc-compiler-0.24.20/21aadd85a0e74cfa6567c5860a7ef025676e2c1b.tgz", + "lwc-template-compiler": + "http://npm.lwcjs.org/lwc-template-compiler/-/lwc-template-compiler-0.24.20/023c8b989a055534edbdf7b9f32c2be6906dc4bb.tgz", "rxjs": "^5.4.1", "vscode-extension-telemetry": "0.0.17", "vscode-languageclient": "3.5.1"