From 495d956cd0f8dc796d46240b5fa966827476845d Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Mon, 23 Mar 2020 18:33:48 -0500 Subject: [PATCH 1/2] fix(packages): make packages have correct main paths to index --- packages/generate-plugin/package.json | 3 +- packages/info/package.json | 2 +- packages/init/package.json | 3 +- packages/migrate/package.json | 4 +-- packages/serve/package.json | 4 +-- yarn.lock | 48 +++++++++++++-------------- 6 files changed, 33 insertions(+), 31 deletions(-) diff --git a/packages/generate-plugin/package.json b/packages/generate-plugin/package.json index d5b696ed820..1822191b67a 100644 --- a/packages/generate-plugin/package.json +++ b/packages/generate-plugin/package.json @@ -2,7 +2,8 @@ "name": "@webpack-cli/generate-plugin", "version": "1.0.1-alpha.5", "description": "A scaffold for generating a plugin", - "main": "src/index.js", + "main": "lib/index.js", + "types": "lib/index.d.ts", "directories": { "example": "examples", "test": "test" diff --git a/packages/info/package.json b/packages/info/package.json index 5c91e993860..b73839431b3 100644 --- a/packages/info/package.json +++ b/packages/info/package.json @@ -3,7 +3,7 @@ "version": "1.0.1-alpha.4", "description": "Outputs info about system and webpack config", "main": "lib/index.js", - "type": "lib/index.d.ts", + "types": "lib/index.d.ts", "author": "", "license": "MIT", "publishConfig": { diff --git a/packages/init/package.json b/packages/init/package.json index c20c9779c44..036d33b8b70 100644 --- a/packages/init/package.json +++ b/packages/init/package.json @@ -2,7 +2,8 @@ "name": "@webpack-cli/init", "version": "1.0.1-alpha.5", "description": "init command for webpack-cli", - "main": "index.js", + "main": "lib/index.js", + "types": "lib/index.d.ts", "author": "", "license": "MIT", "publishConfig": { diff --git a/packages/migrate/package.json b/packages/migrate/package.json index 0cb74010886..f42d8c53524 100644 --- a/packages/migrate/package.json +++ b/packages/migrate/package.json @@ -2,8 +2,8 @@ "name": "@webpack-cli/migrate", "version": "1.0.1-alpha.5", "description": "Migrate command for webpack-cli", - "main": "index.js", - "types": "index.d.ts", + "main": "lib/index.js", + "types": "lib/index.d.ts", "author": "", "license": "MIT", "publishConfig": { diff --git a/packages/serve/package.json b/packages/serve/package.json index b94c639bae6..bc987e5ad8a 100644 --- a/packages/serve/package.json +++ b/packages/serve/package.json @@ -2,8 +2,8 @@ "name": "@webpack-cli/serve", "version": "1.0.1-alpha.5", "description": "", - "main": "./lib/index.js", - "types": "./lib/index.d.ts", + "main": "lib/index.js", + "types": "lib/index.d.ts", "keywords": [], "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index 1b341a13070..53c3928242e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12467,80 +12467,80 @@ webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.0.tgz#06cc4fc2f440428508d0e9770da1fef10e5ef28d" - integrity sha512-Hs8K9yI6pyMvGkaPTeTonhD6JXVsigXDApYk9JLW4M7viVBspQvb1WdAcWxqtmttxNW4zf2UFLsLNe0y87pIGQ== +webpack-dev-server@3.10.3: + version "3.10.3" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0" + integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" - chokidar "^2.1.6" + chokidar "^2.1.8" compression "^1.7.4" connect-history-api-fallback "^1.6.0" debug "^4.1.1" del "^4.1.1" express "^4.17.1" html-entities "^1.2.1" - http-proxy-middleware "^0.19.1" + http-proxy-middleware "0.19.1" import-local "^2.0.0" internal-ip "^4.3.0" ip "^1.1.5" - is-absolute-url "^3.0.0" + is-absolute-url "^3.0.3" killable "^1.0.1" - loglevel "^1.6.3" + loglevel "^1.6.6" opn "^5.5.0" p-retry "^3.0.1" - portfinder "^1.0.21" + portfinder "^1.0.25" schema-utils "^1.0.0" - selfsigned "^1.10.4" + selfsigned "^1.10.7" semver "^6.3.0" serve-index "^1.9.1" sockjs "0.3.19" - sockjs-client "1.3.0" + sockjs-client "1.4.0" spdy "^4.0.1" strip-ansi "^3.0.1" supports-color "^6.1.0" url "^0.11.0" - webpack-dev-middleware "^3.7.0" + webpack-dev-middleware "^3.7.2" webpack-log "^2.0.0" ws "^6.2.1" yargs "12.0.5" -webpack-dev-server@^3.9.0: - version "3.10.3" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0" - integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ== +webpack-dev-server@3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.0.tgz#06cc4fc2f440428508d0e9770da1fef10e5ef28d" + integrity sha512-Hs8K9yI6pyMvGkaPTeTonhD6JXVsigXDApYk9JLW4M7viVBspQvb1WdAcWxqtmttxNW4zf2UFLsLNe0y87pIGQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" - chokidar "^2.1.8" + chokidar "^2.1.6" compression "^1.7.4" connect-history-api-fallback "^1.6.0" debug "^4.1.1" del "^4.1.1" express "^4.17.1" html-entities "^1.2.1" - http-proxy-middleware "0.19.1" + http-proxy-middleware "^0.19.1" import-local "^2.0.0" internal-ip "^4.3.0" ip "^1.1.5" - is-absolute-url "^3.0.3" + is-absolute-url "^3.0.0" killable "^1.0.1" - loglevel "^1.6.6" + loglevel "^1.6.3" opn "^5.5.0" p-retry "^3.0.1" - portfinder "^1.0.25" + portfinder "^1.0.21" schema-utils "^1.0.0" - selfsigned "^1.10.7" + selfsigned "^1.10.4" semver "^6.3.0" serve-index "^1.9.1" sockjs "0.3.19" - sockjs-client "1.4.0" + sockjs-client "1.3.0" spdy "^4.0.1" strip-ansi "^3.0.1" supports-color "^6.1.0" url "^0.11.0" - webpack-dev-middleware "^3.7.2" + webpack-dev-middleware "^3.7.0" webpack-log "^2.0.0" ws "^6.2.1" yargs "12.0.5" From 179bc90a0455d695bb212aa6df45d018f1bd1e82 Mon Sep 17 00:00:00 2001 From: Kirill Nagaitsev Date: Tue, 24 Mar 2020 10:58:50 -0500 Subject: [PATCH 2/2] misc(lock): revert yarn lock file --- yarn.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/yarn.lock b/yarn.lock index 53c3928242e..1b341a13070 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12467,80 +12467,80 @@ webpack-dev-middleware@^3.7.0, webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.10.3: - version "3.10.3" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0" - integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ== +webpack-dev-server@3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.0.tgz#06cc4fc2f440428508d0e9770da1fef10e5ef28d" + integrity sha512-Hs8K9yI6pyMvGkaPTeTonhD6JXVsigXDApYk9JLW4M7viVBspQvb1WdAcWxqtmttxNW4zf2UFLsLNe0y87pIGQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" - chokidar "^2.1.8" + chokidar "^2.1.6" compression "^1.7.4" connect-history-api-fallback "^1.6.0" debug "^4.1.1" del "^4.1.1" express "^4.17.1" html-entities "^1.2.1" - http-proxy-middleware "0.19.1" + http-proxy-middleware "^0.19.1" import-local "^2.0.0" internal-ip "^4.3.0" ip "^1.1.5" - is-absolute-url "^3.0.3" + is-absolute-url "^3.0.0" killable "^1.0.1" - loglevel "^1.6.6" + loglevel "^1.6.3" opn "^5.5.0" p-retry "^3.0.1" - portfinder "^1.0.25" + portfinder "^1.0.21" schema-utils "^1.0.0" - selfsigned "^1.10.7" + selfsigned "^1.10.4" semver "^6.3.0" serve-index "^1.9.1" sockjs "0.3.19" - sockjs-client "1.4.0" + sockjs-client "1.3.0" spdy "^4.0.1" strip-ansi "^3.0.1" supports-color "^6.1.0" url "^0.11.0" - webpack-dev-middleware "^3.7.2" + webpack-dev-middleware "^3.7.0" webpack-log "^2.0.0" ws "^6.2.1" yargs "12.0.5" -webpack-dev-server@3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.8.0.tgz#06cc4fc2f440428508d0e9770da1fef10e5ef28d" - integrity sha512-Hs8K9yI6pyMvGkaPTeTonhD6JXVsigXDApYk9JLW4M7viVBspQvb1WdAcWxqtmttxNW4zf2UFLsLNe0y87pIGQ== +webpack-dev-server@^3.9.0: + version "3.10.3" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz#f35945036813e57ef582c2420ef7b470e14d3af0" + integrity sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" - chokidar "^2.1.6" + chokidar "^2.1.8" compression "^1.7.4" connect-history-api-fallback "^1.6.0" debug "^4.1.1" del "^4.1.1" express "^4.17.1" html-entities "^1.2.1" - http-proxy-middleware "^0.19.1" + http-proxy-middleware "0.19.1" import-local "^2.0.0" internal-ip "^4.3.0" ip "^1.1.5" - is-absolute-url "^3.0.0" + is-absolute-url "^3.0.3" killable "^1.0.1" - loglevel "^1.6.3" + loglevel "^1.6.6" opn "^5.5.0" p-retry "^3.0.1" - portfinder "^1.0.21" + portfinder "^1.0.25" schema-utils "^1.0.0" - selfsigned "^1.10.4" + selfsigned "^1.10.7" semver "^6.3.0" serve-index "^1.9.1" sockjs "0.3.19" - sockjs-client "1.3.0" + sockjs-client "1.4.0" spdy "^4.0.1" strip-ansi "^3.0.1" supports-color "^6.1.0" url "^0.11.0" - webpack-dev-middleware "^3.7.0" + webpack-dev-middleware "^3.7.2" webpack-log "^2.0.0" ws "^6.2.1" yargs "12.0.5"