Merge pull request #156 from pustovalov/yarn2

Yarn 2 support
ai · Jan 31, 2020 · ad7dbd3 · ad7dbd3
2 parents 91a9dc5 + 10f74ae
commit ad7dbd3
Show file tree

Hide file tree

Showing 38 changed files with 191 additions and 50 deletions.
diff --git a/packages/size-limit/create-help.js b/packages/size-limit/create-help.js
@@ -71,7 +71,7 @@ module.exports = process => {
   }
 
   function showMigrationGuide (pkg) {
-    let { add, rm } = npmCommands(pkg)
+    let { add } = npmCommands(pkg)
     printError(
       chalk.red('Install Size Limit preset depends on type of the project'),
       '',
@@ -81,24 +81,24 @@ module.exports = process => {
       '  ' + y(add + '@size-limit/preset-big-lib'),
       'For small (< 10 KB) libraries',
       '  ' + y(add + '@size-limit/preset-small-lib'),
-      'Check out docs for more comlicated cases',
+      'Check out docs for more complicated cases',
       '  ' + y('https://github.com/ai/size-limit/')
     )
     let devDependencies = pkg.packageJson.devDependencies
-    if (devDependencies && devDependencies['size-limit']) {
+    if (devDependencies && !devDependencies['size-limit']) {
       printError(
         '',
-        `You can remove size-limit dependency: ${ y(rm + 'size-limit') }`
+        `You need to add size-limit dependency: ${ y(add + 'size-limit') }`
       )
     }
   }
 
   function warnAboutDep (pkg) {
-    let { rm } = npmCommands(pkg)
+    let { add } = npmCommands(pkg)
     printError(
-      chalk.bgYellow.black(' WARN ') + ' You can remove size-limit dependency',
-      '       All plugins and presets already contain it as own dependency',
-      '       ' + y(rm + 'size-limit'),
+      chalk.bgYellow.black(' WARN ') + ' You need to add size-limit dependency',
+      '       In order for the plugins to work correctly',
+      '       ' + y(add + 'size-limit'),
       ''
     )
   }

diff --git a/packages/size-limit/run.js b/packages/size-limit/run.js
@@ -44,7 +44,7 @@ module.exports = async process => {
       return process.exit(1)
     }
 
-    if (devDeps(pkg)['size-limit'] && !hasArg('--json')) {
+    if (!devDeps(pkg)['size-limit'] && !hasArg('--json')) {
       help.warnAboutDep(pkg)
     }
 

diff --git a/packages/size-limit/size-limit-error.js b/packages/size-limit/size-limit-error.js
@@ -1,10 +1,10 @@
 const MESSAGES = {
   noPackage: () => (
-    'Size Limit did’t find *package.json*. ' +
+    'Size Limit didn’t find *package.json*. ' +
     'Create npm package and run Size Limit there.'
   ),
   unknownArg: arg => (
-    `Uknown argument *${ arg }*. Check command for typo and read docs.`
+    `Unknown argument *${ arg }*. Check command for typo and read docs.`
   ),
   argWithoutWebpack: arg => (
     `Argument *--${ arg }* works only with *@size-limit/webpack* plugin` +

diff --git a/packages/size-limit/test/__snapshots__/run.test.js.snap b/packages/size-limit/test/__snapshots__/run.test.js.snap
@@ -139,7 +139,7 @@ exports[`shows debug on error 1`] = `
     {
       \\"limit\\": \\"200 s\\",
       \\"path\\": [
-        \\"/packages/size-limit/test/fixtures/interal-error/index.js\\"
+        \\"/packages/size-limit/test/fixtures/internal-error/index.js\\"
       ],
       \\"name\\": \\"index.js\\",
       \\"timeLimit\\": 200
@@ -151,7 +151,7 @@ exports[`shows debug on error 1`] = `
 `;
 
 exports[`shows error on missed package.json 1`] = `
-"[41m[30m ERROR [39m[49m [31mSize Limit did’t find [33mpackage.json[39m[31m.[39m
+"[41m[30m ERROR [39m[49m [31mSize Limit didn’t find [33mpackage.json[39m[31m.[39m
 [31m        Create npm package and run Size Limit there.[39m
 "
 `;
@@ -197,11 +197,35 @@ For frameworks, components and big libraries
   [33mnpm install --save-dev @size-limit/preset-big-lib[39m
 For small (< 10 KB) libraries
   [33mnpm install --save-dev @size-limit/preset-small-lib[39m
-Check out docs for more comlicated cases
+Check out docs for more complicated cases
   [33mhttps://github.com/ai/size-limit/[39m
 "
 `;
 
+exports[`shows migration guide for npm users: config 1, dep 0 1`] = `
+"[31mInstall Size Limit preset depends on type of the project[39m
+
+For application, where you send JS bundle directly to users
+  [33mnpm install --save-dev @size-limit/preset-app[39m
+For frameworks, components and big libraries
+  [33mnpm install --save-dev @size-limit/preset-big-lib[39m
+For small (< 10 KB) libraries
+  [33mnpm install --save-dev @size-limit/preset-small-lib[39m
+Check out docs for more complicated cases
+  [33mhttps://github.com/ai/size-limit/[39m
+
+You need to add size-limit dependency: [33mnpm install --save-dev size-limit[39m
+"
+`;
+
+exports[`shows migration guide for npm users: without sl dev dep 1`] = `
+"[43m[30m WARN [39m[49m You need to add size-limit dependency
+       In order for the plugins to work correctly
+       [33mnpm install --save-dev size-limit[39m
+
+"
+`;
+
 exports[`shows migration guide for yarn users 1`] = `
 "[31mInstall Size Limit preset depends on type of the project[39m
 
@@ -211,21 +235,37 @@ For frameworks, components and big libraries
   [33myarn add --dev @size-limit/preset-big-lib[39m
 For small (< 10 KB) libraries
   [33myarn add --dev @size-limit/preset-small-lib[39m
-Check out docs for more comlicated cases
+Check out docs for more complicated cases
   [33mhttps://github.com/ai/size-limit/[39m
+"
+`;
 
-You can remove size-limit dependency: [33myarn remove size-limit[39m
+exports[`shows migration guide for yarn users: config 1, dep 0 1`] = `
+"[31mInstall Size Limit preset depends on type of the project[39m
+
+For application, where you send JS bundle directly to users
+  [33myarn add --dev @size-limit/preset-app[39m
+For frameworks, components and big libraries
+  [33myarn add --dev @size-limit/preset-big-lib[39m
+For small (< 10 KB) libraries
+  [33myarn add --dev @size-limit/preset-small-lib[39m
+Check out docs for more complicated cases
+  [33mhttps://github.com/ai/size-limit/[39m
+
+You need to add size-limit dependency: [33myarn add --dev size-limit[39m
 "
 `;
 
-exports[`shows size-limit dependency warning 1`] = `
-"[43m[30m WARN [39m[49m You can remove size-limit dependency
-       All plugins and presets already contain it as own dependency
-       [33mnpm remove size-limit[39m
+exports[`shows migration guide for yarn users: without sl dev dep 1`] = `
+"[43m[30m WARN [39m[49m You need to add size-limit dependency
+       In order for the plugins to work correctly
+       [33myarn add --dev size-limit[39m
 
 "
 `;
 
+exports[`shows size-limit dependency warning 1`] = `""`;
+
 exports[`shows webpack-related help 1`] = `
 "[33msize-limit [OPTION]… [FILE]…[39m
 Check the real performance cost of your front-end project to users
@@ -343,7 +383,7 @@ exports[`throws on time limit without time plugin 1`] = `
 `;
 
 exports[`throws on unknown argument 1`] = `
-"[41m[30m ERROR [39m[49m [31mUknown argument [33m--unknown[39m[31m.[39m
+"[41m[30m ERROR [39m[49m [31mUnknown argument [33m--unknown[39m[31m.[39m
 [31m        Check command for typo and read docs.[39m
 "
 `;
@@ -394,7 +434,7 @@ Check the real performance cost of your front-end project to users
 "
 `;
 
-exports[`works in intergration test with JSON 1`] = `
+exports[`works in integration test with JSON 1`] = `
 "[
   {
     \\"name\\": \\"index.js\\",
@@ -407,7 +447,7 @@ exports[`works in intergration test with JSON 1`] = `
 "
 `;
 
-exports[`works in intergration test with size 1`] = `
+exports[`works in integration test with size 1`] = `
 "  
   Size limit:   [32m[1m200 B[22m[39m
   Size:         [32m[1m31 B [22m[39m [90mwith all dependencies, minified and gzipped[39m
@@ -418,7 +458,7 @@ exports[`works in intergration test with size 1`] = `
 "
 `;
 
-exports[`works in intergration test with time 1`] = `
+exports[`works in integration test with time 1`] = `
 "  
   Time limit:   [32m[1m2 s[22m[39m
   Size:         [32m[1m31 B [22m[39m [90mwith all dependencies, minified and gzipped[39m

diff --git a/packages/size-limit/test/fixtures/empty/package.json b/packages/size-limit/test/fixtures/empty/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": []
 }
diff --git a/packages/size-limit/test/fixtures/file/package.json b/packages/size-limit/test/fixtures/file/package.json
@@ -2,6 +2,7 @@
   "name": "file",
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   }
 }
diff --git a/packages/size-limit/test/fixtures/globby/package.json b/packages/size-limit/test/fixtures/globby/package.json
@@ -2,7 +2,8 @@
   "name": "file",
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/packages/size-limit/test/fixtures/integration/package.json b/packages/size-limit/test/fixtures/integration/package.json
@@ -2,7 +2,8 @@
   "name": "intergration",
   "private": true,
   "devDependencies": {
-    "@size-limit/preset-big-lib": ">= 0.0.0"
+    "@size-limit/preset-big-lib": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/...imit/test/fixtures/interal-error/index.js → ...mit/test/fixtures/internal-error/index.js b/...imit/test/fixtures/interal-error/index.js → ...mit/test/fixtures/internal-error/index.js
diff --git a/...-limit/test/fixtures/interal-error/lib.js → ...limit/test/fixtures/internal-error/lib.js b/...-limit/test/fixtures/interal-error/lib.js → ...limit/test/fixtures/internal-error/lib.js
diff --git a/.../test/fixtures/interal-error/package.json → ...test/fixtures/internal-error/package.json b/.../test/fixtures/interal-error/package.json → ...test/fixtures/internal-error/package.json
@@ -2,7 +2,8 @@
   "name": "intergration",
   "private": true,
   "devDependencies": {
-    "@size-limit/time": ">= 0.0.0"
+    "@size-limit/time": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/packages/size-limit/test/fixtures/non-array/package.json b/packages/size-limit/test/fixtures/non-array/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": { }
 }
diff --git a/packages/size-limit/test/fixtures/non-gzip/package.json b/packages/size-limit/test/fixtures/non-gzip/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/time": ">= 0.0.0"
+    "@size-limit/time": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/packages/size-limit/test/fixtures/non-object/package.json b/packages/size-limit/test/fixtures/non-object/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   }
 }
diff --git a/packages/size-limit/test/fixtures/non-string-entry/package.json b/packages/size-limit/test/fixtures/non-string-entry/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   }
 }
diff --git a/packages/size-limit/test/fixtures/non-string/package.json b/packages/size-limit/test/fixtures/non-string/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   }
 }
diff --git a/packages/size-limit/test/fixtures/non-time/package.json b/packages/size-limit/test/fixtures/non-time/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/packages/size-limit/test/fixtures/non-webpack-config/package.json b/packages/size-limit/test/fixtures/non-webpack-config/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/packages/size-limit/test/fixtures/non-webpack-ignore/package.json b/packages/size-limit/test/fixtures/non-webpack-ignore/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/packages/size-limit/test/fixtures/non-webpack/package.json b/packages/size-limit/test/fixtures/non-webpack/package.json
@@ -1,7 +1,8 @@
 {
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/packages/size-limit/test/fixtures/npm-with-config-without-dev/index.js b/packages/size-limit/test/fixtures/npm-with-config-without-dev/index.js
diff --git a/packages/size-limit/test/fixtures/npm-with-config-without-dev/package.json b/packages/size-limit/test/fixtures/npm-with-config-without-dev/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "file",
+  "private": true,
+  "devDependencies": {},
+  "size-limit": [
+    {
+      "path": "index.js",
+      "limit": "1 KB",
+      "running": false
+    }
+  ]
+}
diff --git a/packages/size-limit/test/fixtures/npm-without-dev-dep/index.js b/packages/size-limit/test/fixtures/npm-without-dev-dep/index.js
diff --git a/packages/size-limit/test/fixtures/npm-without-dev-dep/package.json b/packages/size-limit/test/fixtures/npm-without-dev-dep/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "file",
+  "private": true,
+  "devDependencies": {
+    "@size-limit/preset-big-lib": ">= 0.0.0"
+  },
+  "size-limit": [
+    {
+      "path": "index.js",
+      "limit": "1 KB",
+      "running": false
+    }
+  ]
+}
diff --git a/packages/size-limit/test/fixtures/peer/package.json b/packages/size-limit/test/fixtures/peer/package.json
@@ -2,7 +2,8 @@
   "name": "file",
   "private": true,
   "devDependencies": {
-    "@size-limit/webpack": ">= 0.0.0"
+    "@size-limit/webpack": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "peerDependencies": {
     "a": ">= 0.0.0"

diff --git a/packages/size-limit/test/fixtures/simple/package.json b/packages/size-limit/test/fixtures/simple/package.json
@@ -2,7 +2,8 @@
   "name": "file",
   "private": true,
   "devDependencies": {
-    "@size-limit/file": ">= 0.0.0"
+    "@size-limit/file": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {

diff --git a/packages/size-limit/test/fixtures/time/package.json b/packages/size-limit/test/fixtures/time/package.json
@@ -2,7 +2,8 @@
   "name": "file",
   "private": true,
   "devDependencies": {
-    "@size-limit/time": ">= 0.0.0"
+    "@size-limit/time": ">= 0.0.0",
+    "size-limit": ">= 0.0.0"
   },
   "size-limit": [
     {