Merge pull request #12052 from bjester/pnpm-peeer

Resolve webpack loaders and dependencies relative to kolibri-tools

packages/kolibri-tools/lib/alias_import_resolver.js

@@ -1,4 +1,4 @@
-var path = require('path');
+var path = require('node:path');
 var resolve = require('resolve');
 var coreAliases = require('./apiSpecExportTools').coreAliases();
 var coreExternals = require('./apiSpecExportTools').coreExternals();

packages/kolibri-tools/lib/apiSpecExportTools.js

@@ -1,6 +1,6 @@
 /* eslint-disable */
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const resolve = require('resolve');
 const espree = require('espree');
 const escodegen = require('escodegen');

packages/kolibri-tools/lib/clean.js

@@ -1,5 +1,5 @@
-var path = require('path');
-var fs = require('fs');
+var path = require('node:path');
+var fs = require('node:fs');
 var logging = require('./logging');
 
 var deleteRecursive = function(p) {

packages/kolibri-tools/lib/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const program = require('commander');
 const checkVersion = require('check-node-version');
 const ini = require('ini');

packages/kolibri-tools/lib/compress.js

@@ -1,5 +1,5 @@
-const { constants, createGzip } = require('zlib');
-const { pipeline } = require('stream');
+const { constants, createGzip } = require('node:zlib');
+const { pipeline } = require('node:stream');
 const { createReadStream, createWriteStream } = require('fs');
 const logger = require('./logging');
 

packages/kolibri-tools/lib/ensureDist.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 
 function ensureDist() {
   fs.mkdirSync(path.resolve(__dirname, '../dist'), { recursive: true });

packages/kolibri-tools/lib/lint.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const prettier = require('prettier');
 const compiler = require('vue-template-compiler');
 const ESLintCLIEngine = require('eslint').CLIEngine;

packages/kolibri-tools/lib/read_webpack_json.js

@@ -1,6 +1,6 @@
-const fs = require('fs');
-const execSync = require('child_process').execSync;
-const path = require('path');
+const fs = require('node:fs');
+const execSync = require('node:child_process').execSync;
+const path = require('node:path');
 const temp = require('temp').track();
 
 const webpack_json = path.resolve(path.dirname(__filename), './webpack_json.py');

packages/kolibri-tools/lib/version.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const execSync = require('child_process').execSync;
+const fs = require('node:fs');
+const execSync = require('node:child_process').execSync;
 const temp = require('temp').track();
 const readlineSync = require('readline-sync');
 const semver = require('semver');

packages/kolibri-tools/lib/webpack.config.base.js

@@ -1,4 +1,4 @@
-const path = require('path');
+const path = require('node:path');
 const { VueLoaderPlugin } = require('vue-loader');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
@@ -17,28 +17,33 @@ module.exports = ({ mode = 'development', hot = false, cache = false, transpile
   const base_dir = path.join(__dirname, '..');
 
   const postCSSLoader = {
-    loader: 'postcss-loader',
+    loader: require.resolve('postcss-loader'),
     options: {
       postcssOptions: {
-        plugins: [['autoprefixer']],
+        plugins: [[require.resolve('autoprefixer')]],
       },
       sourceMap: !production,
     },
   };
 
   const cssLoader = {
-    loader: 'css-loader',
+    loader: require.resolve('css-loader'),
     options: { sourceMap: !production },
   };
 
   // for scss blocks
-  const sassLoaders = [cssInsertionLoader, cssLoader, postCSSLoader, 'sass-loader'];
+  const sassLoaders = [
+    cssInsertionLoader,
+    cssLoader,
+    postCSSLoader,
+    require.resolve('sass-loader'),
+  ];
 
   const rules = [
     // Transpilation and code loading rules
     {
       test: /\.vue$/,
-      loader: 'vue-loader',
+      loader: require.resolve('vue-loader'),
       options: {
         compilerOptions: {
           preserveWhitespace: false,
@@ -70,7 +75,7 @@ module.exports = ({ mode = 'development', hot = false, cache = false, transpile
   if (transpile) {
     rules.push({
       test: /\.(js|mjs)$/,
-      loader: 'babel-loader',
+      loader: require.resolve('babel-loader'),
       exclude: [
         // From: https://webpack.js.org/loaders/babel-loader/#exclude-libraries-that-should-not-be-transpiled
         // \\ for Windows, / for macOS and Linux
@@ -143,7 +148,7 @@ module.exports = ({ mode = 'development', hot = false, cache = false, transpile
         'process.server': JSON.stringify(false),
       }),
       new webpack.ProvidePlugin({
-        process: 'process/browser',
+        process: require.resolve('process/browser'),
       }),
     ],
     devtool: production ? 'source-map' : 'cheap-module-source-map',

packages/kolibri-tools/lib/webpack.config.plugin.js

@@ -7,7 +7,7 @@
  * to add test specific features.
  */
 
-const path = require('path');
+const path = require('node:path');
 const webpack = require('webpack');
 const { merge } = require('webpack-merge');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');

packages/kolibri-tools/lib/webpackBundleTracker.js

@@ -20,9 +20,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-const path = require('path');
-const fs = require('fs');
-const crypto = require('crypto');
+const path = require('node:path');
+const fs = require('node:fs');
+const crypto = require('node:crypto');
 
 const defaults = require('lodash/defaults');
 const assign = require('lodash/assign');

packages/kolibri-tools/lib/webpackRtlPlugin.js

@@ -13,7 +13,7 @@
 // DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // Vendored and simplified from https://github.com/romainberger/webpack-rtl-plugin/blob/master/src/index.js
-const path = require('path');
+const path = require('node:path');
 const rtlcss = require('rtlcss');
 const webpack = require('webpack');