Change base module ModuleDependency -> Dependency (#1)

.npmignore

@@ -1,6 +1,7 @@
 .github
 .vscode
 .yarn
+test
 .yarnrc.yml
 .pnp.js
 yarn.lock

.vscode/extensions.json

@@ -1,3 +1,6 @@
 {
-  "recommendations": ["arcanis.vscode-zipfs", "esbenp.prettier-vscode"]
+  "recommendations": [
+    "arcanis.vscode-zipfs",
+    "esbenp.prettier-vscode"
+  ]
 }

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "pwa-node",
+      "request": "launch",
+      "name": "Test",
+      "skipFiles": ["<node_internals>/**"],
+      "runtimeExecutable": "yarn",
+      "runtimeArgs": ["jest"]
+    }
+  ]
+}

.yarn/sdks/prettier/index.js

@@ -2,7 +2,7 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve, dirname} = require(`path`);
+const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../.pnp.js";
 
@@ -14,16 +14,6 @@ if (existsSync(absPnpApiPath)) {
     // Setup the environment to be able to require prettier/index.js
     require(absPnpApiPath).setup();
   }
-
-  const pnpifyResolution = require.resolve(`@yarnpkg/pnpify`, {paths: [dirname(absPnpApiPath)]});
-  if (typeof global[`__yarnpkg_sdk_is_using_pnpify__`] === `undefined`) {
-    Object.defineProperty(global, `__yarnpkg_sdk_is_using_pnpify__`, {configurable: true, value: true});
-
-    process.env.NODE_OPTIONS += ` -r ${pnpifyResolution}`;
-
-    // Apply PnPify to the current process
-    absRequire(pnpifyResolution).patchFs();
-  }
 }
 
 // Defer to the real prettier/index.js your application uses

.yarn/sdks/typescript/lib/tsserver.js

@@ -23,7 +23,7 @@ const moduleWrapper = tsserver => {
 
   function toEditorPath(str) {
     // We add the `zip:` prefix to both `.zip/` paths and virtual paths
-    if (isAbsolute(str) && !str.match(/^\^zip:/) && (str.match(/\.zip\//) || str.match(/\$\$virtual\//))) {
+    if (isAbsolute(str) && !str.match(/^\^zip:/) && (str.match(/\.zip\//) || str.match(/\/(\$\$virtual|__virtual__)\//))) {
       // We also take the opportunity to turn virtual paths into physical ones;
       // this makes is much easier to work with workspaces that list peer
       // dependencies, since otherwise Ctrl+Click would bring us to the virtual
@@ -66,6 +66,20 @@ const moduleWrapper = tsserver => {
       : str.replace(/^\^?zip:/, ``);
   }
 
+  // Force enable 'allowLocalPluginLoads'
+  // TypeScript tries to resolve plugins using a path relative to itself
+  // which doesn't work when using the global cache
+  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+  // TypeScript already does local loads and if this code is running the user trusts the workspace
+  // https://github.com/microsoft/vscode/issues/45856
+  const ConfiguredProject = tsserver.server.ConfiguredProject;
+  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+    this.projectService.allowLocalPluginLoads = true;
+    return originalEnablePluginsWithOptions.apply(this, arguments);
+  };
+
   // And here is the point where we hijack the VSCode <-> TS communications
   // by adding ourselves in the middle. We locate everything that looks
   // like an absolute path of ours and normalize it.

.yarn/sdks/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.1.5-pnpify",
+  "version": "4.2.4-pnpify",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }

.yarnrc.yml

@@ -1 +1 @@
-yarnPath: .yarn/releases/yarn-2.4.0.cjs
+yarnPath: .yarn/releases/yarn-2.4.1.cjs

IgnoreAsyncImportsPlugin.js

@@ -1,16 +1,15 @@
-/**
- * @copyright 2021-present Kriasoft (https://git.io/JtoKE)
- *
- * @typedef {import("webpack").Compiler} Compiler
- * @typedef {import("webpack").javascript.JavascriptParser} JavascriptParser
- */
+/* SPDX-FileCopyrightText: 2021-present Kriasoft <[email protected]> */
+/* SPDX-License-Identifier: MIT */
 
 const path = require("path");
 const webpack = require("webpack");
 const ImportDependency = require("./ImportDependency");
 
 /**
  * Excludes dynamically imported dependencies from the output bundle.
+ *
+ * @typedef {import("webpack").Compiler} Compiler
+ * @typedef {import("webpack").javascript.JavascriptParser} JavascriptParser
  */
 class IgnoreAsyncImportsPlugin {
   /**
@@ -67,7 +66,7 @@ class IgnoreAsyncImportsPlugin {
       const dep = new ImportDependency(expr.source.value, expr.range);
       dep.loc = expr.loc;
       parser.state.module.addDependency(dep);
-      return true;
+      return false;
     });
   }
 }

ImportDependency.js

@@ -1,22 +1,22 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Florent Cailhol @ooflorent
-*/
+/* SPDX-FileCopyrightText: 2021-present Kriasoft <[email protected]> */
+/* SPDX-License-Identifier: MIT */
 
 "use strict";
 
 const InitFragment = require("webpack/lib/InitFragment");
-const ModuleDependency = require("webpack/lib/dependencies/ModuleDependency");
+const Dependency = require("webpack/lib/Dependency");
+const DependencyTemplate = require("webpack/lib/DependencyTemplate");
 
 /** @typedef {import("webpack").sources.ReplaceSource} ReplaceSource */
 /** @typedef {import("webpack").ChunkGraph} ChunkGraph */
 /** @typedef {import("webpack").Dependency} Dependency */
 /** @typedef {import("webpack").Dependency.UpdateHashContext} UpdateHashContext */
 /** @typedef {import("webpack").util.Hash} Hash */
 
-class ImportDependency extends ModuleDependency {
+class ImportDependency extends Dependency {
   constructor(request, range) {
-    super(request);
+    super();
+    this.request = request;
     this.range = range;
   }
 
@@ -41,21 +41,19 @@ class ImportDependency extends ModuleDependency {
   serialize(context) {
     const { write } = context;
     write(this.request);
-    write(this.userRequest);
     write(this.range);
     super.serialize(context);
   }
 
   deserialize(context) {
     const { read } = context;
     this.request = read();
-    this.userRequest = read();
     this.range = read();
     super.deserialize(context);
   }
 }
 
-class ImportDependencyTemplate extends ModuleDependency.Template {
+class ImportDependencyTemplate extends DependencyTemplate {
   /**
    * @param {Dependency} dependency the dependency for which the template should be applied
    * @param {ReplaceSource} source the current replace source which can be modified

README.md

@@ -35,7 +35,8 @@ will be replaced with `Promise.resolve(...)`.
 
 ## Related Projects
 
-- [Node.js API Starter](https://github.com/kriasoft/nodejs-api-starter) - Monorepo project template based on Yarn v2, GraphQL.js, React, and Relay.
+- [GraphQL API and Relay Starter Kit](https://github.com/kriasoft/graphql-starter) - Monorepo template pre-configured with GraphQL API, React, and Relay.
+- [Node.js API Starter Kit](https://github.com/kriasoft/node-starter-kit) - Project template pre-configured with PostgreSQL, OAuth, emails, and unit tests.
 
 ## Copyright
 

index.js

@@ -1,6 +1,5 @@
-/**
- * @copyright 2021-present Kriasoft (https://git.io/JtoKE)
- */
+/* SPDX-FileCopyrightText: 2021-present Kriasoft <[email protected]> */
+/* SPDX-License-Identifier: MIT */
 
 const IgnoreAsyncImportsPlugin = require("./IgnoreAsyncImportsPlugin");
 

package.json

@@ -1,10 +1,10 @@
 {
   "name": "ignore-webpack-plugin",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Excludes dynamically imported dependencies from the output bundle.",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   },
   "repository": "kriasoft/ignore-webpack-plugin",
   "keywords": [
@@ -28,7 +28,13 @@
     "webpack": ">=5.0.0"
   },
   "devDependencies": {
+    "@yarnpkg/pnpify": "^3.0.0-rc.3",
+    "jest": "^26.6.3",
     "prettier": "^2.2.1",
-    "typescript": "^4.1.5"
+    "typescript": "^4.2.4",
+    "webpack": "^5.36.2"
+  },
+  "jest": {
+    "testEnvironment": "node"
   }
 }

test/app.bundle.js

@@ -0,0 +1,52 @@
+/******/ (() => { // webpackBootstrap
+/******/ 	var __webpack_modules__ = ({
+
+/***/ 50:
+/***/ ((module) => {
+
+/* SPDX-FileCopyrightText: 2021-present Kriasoft <[email protected]> */
+/* SPDX-License-Identifier: MIT */
+
+module.exports = async function () {
+  const module = await Promise.resolve({});
+  console.log(module);
+};
+
+
+/***/ })
+
+/******/ 	});
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/ 	
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/ 	
+/******/ 		// Execute the module function
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/ 	
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/ 	
+/************************************************************************/
+/******/ 	
+/******/ 	// startup
+/******/ 	// Load entry module and return exports
+/******/ 	// This entry module is referenced by other modules so it can't be inlined
+/******/ 	var __webpack_exports__ = __webpack_require__(50);
+/******/ 	
+/******/ })()
+;

test/app.chunk.js

@@ -0,0 +1,4 @@
+/* SPDX-FileCopyrightText: 2021-present Kriasoft <[email protected]> */
+/* SPDX-License-Identifier: MIT */
+
+module.exports = "external";

test/app.main.js

@@ -0,0 +1,7 @@
+/* SPDX-FileCopyrightText: 2021-present Kriasoft <[email protected]> */
+/* SPDX-License-Identifier: MIT */
+
+module.exports = async function () {
+  const module = await import("./app.chunk");
+  console.log(module);
+};

test/bundle.test.js

@@ -0,0 +1,19 @@
+/* SPDX-FileCopyrightText: 2021-present Kriasoft <[email protected]> */
+/* SPDX-License-Identifier: MIT */
+
+const { readFileSync } = require("fs");
+const { webpack } = require("webpack");
+const config = require("./webpack.config");
+
+test("bundle", function (done) {
+  const compiler = webpack(config, function (err, stats) {
+    expect(err).toBeNull();
+    expect(stats.compilation.errors).toMatchInlineSnapshot(`Array []`);
+
+    const bundle = readFileSync("./test/app.bundle.js", "utf-8");
+    expect(bundle.includes("external")).toBe(false);
+    expect(bundle.includes("Promise.resolve({})")).toBe(true);
+
+    done();
+  });
+});

test/webpack.config.js

@@ -0,0 +1,24 @@
+/* SPDX-FileCopyrightText: 2021-present Kriasoft <[email protected]> */
+/* SPDX-License-Identifier: MIT */
+
+const { IgnoreAsyncImportsPlugin } = require("..");
+
+module.exports = {
+  entry: {
+    main: "./app.main",
+  },
+
+  context: __dirname,
+
+  output: {
+    path: __dirname,
+    filename: "app.bundle.js",
+    chunkFilename: "app.bundle.[name].js",
+  },
+
+  optimization: {
+    minimize: false,
+  },
+
+  plugins: [new IgnoreAsyncImportsPlugin()],
+};