Fixes yarnpkg/pnp build

bertho-zero · Dec 6, 2019 · 1742ed1 · 1742ed1
1 parent 883be78
commit 1742ed1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/packages/yarnpkg-pnp/package.json b/packages/yarnpkg-pnp/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "build:pnp:hook": "run pnpify webpack-cli --config webpack.config.hook.js",
     "build:pnp": "run pnpify webpack-cli --config webpack.config.pkg.js",
-    "postpack": "find lib -mindepth 1 ! -path 'lib/hook.js' -exec rm -rf '{}' +",
+    "postpack": "rm -rf lib",
     "prepack": "run build:pnp && run build:compile packages/yarnpkg-pnp --emitDeclarationOnly --declaration",
     "release": "yarn npm publish",
     "update-local": "run build:pnp:hook"

diff --git a/packages/yarnpkg-pnp/sources/generatePnpScript.ts b/packages/yarnpkg-pnp/sources/generatePnpScript.ts
@@ -1,8 +1,7 @@
-// @ts-ignore
-import template                  from '@yarnpkg/pnp/lib/hook';
-
 import {generatePrettyJson}      from './generatePrettyJson';
 import {generateSerializedState} from './generateSerializedState';
+// @ts-ignore
+import template                  from './hook';
 import {SerializedState}         from './types';
 import {PnpSettings}             from './types';
 

diff --git a/packages/yarnpkg-pnp/lib/hook.js → packages/yarnpkg-pnp/sources/hook.js b/packages/yarnpkg-pnp/lib/hook.js → packages/yarnpkg-pnp/sources/hook.js
diff --git a/packages/yarnpkg-pnp/webpack.config.hook.js b/packages/yarnpkg-pnp/webpack.config.hook.js
@@ -6,7 +6,7 @@ module.exports = makeConfig({
 
   mode: 'production',
   optimization: {
-    minimize: false
+    minimize: false,
   },
 
   entry: {
@@ -15,14 +15,14 @@ module.exports = makeConfig({
 
   output: {
     filename: `[name].js`,
-    path: `${__dirname}/lib`,
+    path: `${__dirname}/sources`,
     libraryExport: `default`,
     libraryTarget: `umd`,
     library: `pnpHook`,
   },
 
   plugins: [
-    { apply: compiler => {
+    {apply: compiler => {
       compiler.hooks.compilation.tap(`MyPlugin`, compilation => {
         compilation.hooks.optimizeChunkAssets.tap(`MyPlugin`, chunks => {
           for (const chunk of chunks) {
@@ -34,6 +34,6 @@ module.exports = makeConfig({
           }
         });
       });
-    } },
+    }},
   ],
 });
diff --git a/packages/yarnpkg-pnp/webpack.config.pkg.js b/packages/yarnpkg-pnp/webpack.config.pkg.js
@@ -5,7 +5,7 @@ module.exports = makeConfig({
 
   mode: `production`,
   optimization: {
-    minimize: false
+    minimize: false,
   },
 
   entry: {