@embroider/webpack 3.2.2-unstable.ecb0185 → 3.2.2-unstable.f361b71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/webpack",
-  "version": "3.2.2-unstable.ecb0185",
+  "version": "3.2.2-unstable.f361b71",
   "private": false,
   "description": "Builds EmberJS apps with Webpack",
   "repository": {
@@ -19,9 +19,9 @@
   "scripts": {},
   "dependencies": {
     "@babel/core": "^7.14.5",
-    "@embroider/babel-loader-9": "3.1.2-unstable.ecb0185",
-    "@embroider/hbs-loader": "3.0.4-unstable.ecb0185",
-    "@embroider/shared-internals": "2.5.2-unstable.ecb0185",
+    "@embroider/babel-loader-9": "3.1.2-unstable.f361b71",
+    "@embroider/hbs-loader": "3.0.4-unstable.f361b71",
+    "@embroider/shared-internals": "2.5.2-unstable.f361b71",
     "@types/supports-color": "^8.1.0",
     "assert-never": "^1.2.1",
     "babel-loader": "^8.2.2",
@@ -42,7 +42,7 @@
     "thread-loader": "^3.0.4"
   },
   "devDependencies": {
-    "@embroider/core": "3.4.4-unstable.ecb0185",
+    "@embroider/core": "3.4.4-unstable.f361b71",
     "@types/csso": "^3.5.1",
     "@types/debug": "^4.1.5",
     "@types/fs-extra": "^9.0.12",
@@ -54,7 +54,7 @@
     "webpack": "^5.38.1"
   },
   "peerDependencies": {
-    "@embroider/core": "3.4.4-unstable.ecb0185",
+    "@embroider/core": "3.4.4-unstable.f361b71",
     "webpack": "^5.0.0"
   },
   "engines": {

package/src/virtual-loader.d.ts

@@ -1,2 +1,2 @@
 import type { LoaderContext } from 'webpack';
-export default function virtualLoader(this: LoaderContext<unknown>): string;
+export default function virtualLoader(this: LoaderContext<unknown>): string | undefined;

package/src/virtual-loader.js

@@ -18,7 +18,7 @@ function virtualLoader() {
         }
         let { resolver } = setup(appRoot);
         this.resourcePath = filename;
-        return (0, core_1.virtualContent)(filename, resolver);
+        return (0, core_1.virtualContent)(filename, resolver).src;
     }
     throw new Error(`@embroider/webpack/src/virtual-loader received unexpected request: ${this.query}`);
 }

package/src/virtual-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"virtual-loader.js","sourceRoot":"","sources":["virtual-loader.ts"],"names":[],"mappings":";;AAAA,0CAAiE;AAGjE,IAAI,cAA0C,CAAC;AAE/C,SAAS,KAAK,CAAC,OAAe;IAC5B,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,MAAK,OAAO,EAAE;QACvC,cAAc,GAAG,IAAI,qBAAc,CAAC,OAAO,CAAC,CAAC;KAC9C;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,SAAwB,aAAa;IACnC,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QAC3D,IAAI,MAAM,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,qEAAqE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;SACpG;QACD,IAAI,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;QAC7B,OAAO,IAAA,qBAAc,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;KAC3C;IACD,MAAM,IAAI,KAAK,CAAC,sEAAsE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;AACtG,CAAC;AAbD,gCAaC","sourcesContent":["import { ResolverLoader, virtualContent } from '@embroider/core';\nimport type { LoaderContext } from 'webpack';\n\nlet resolverLoader: ResolverLoader | undefined;\n\nfunction setup(appRoot: string): ResolverLoader {\n  if (resolverLoader?.appRoot !== appRoot) {\n    resolverLoader = new ResolverLoader(appRoot);\n  }\n  return resolverLoader;\n}\n\nexport default function virtualLoader(this: LoaderContext<unknown>) {\n  if (typeof this.query === 'string' && this.query[0] === '?') {\n    let params = new URLSearchParams(this.query);\n    let filename = params.get('f');\n    let appRoot = params.get('a');\n    if (!filename || !appRoot) {\n      throw new Error(`bug in @embroider/webpack virtual loader, cannot locate params in ${this.query}`);\n    }\n    let { resolver } = setup(appRoot);\n    this.resourcePath = filename;\n    return virtualContent(filename, resolver);\n  }\n  throw new Error(`@embroider/webpack/src/virtual-loader received unexpected request: ${this.query}`);\n}\n"]}
+{"version":3,"file":"virtual-loader.js","sourceRoot":"","sources":["virtual-loader.ts"],"names":[],"mappings":";;AAAA,0CAAiE;AAGjE,IAAI,cAA0C,CAAC;AAE/C,SAAS,KAAK,CAAC,OAAe;IAC5B,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,OAAO,MAAK,OAAO,EAAE;QACvC,cAAc,GAAG,IAAI,qBAAc,CAAC,OAAO,CAAC,CAAC;KAC9C;IACD,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,SAAwB,aAAa;IACnC,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QAC3D,IAAI,MAAM,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE;YACzB,MAAM,IAAI,KAAK,CAAC,qEAAqE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;SACpG;QACD,IAAI,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;QAC7B,OAAO,IAAA,qBAAc,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC;KAC/C;IACD,MAAM,IAAI,KAAK,CAAC,sEAAsE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;AACtG,CAAC;AAbD,gCAaC","sourcesContent":["import { ResolverLoader, virtualContent } from '@embroider/core';\nimport type { LoaderContext } from 'webpack';\n\nlet resolverLoader: ResolverLoader | undefined;\n\nfunction setup(appRoot: string): ResolverLoader {\n  if (resolverLoader?.appRoot !== appRoot) {\n    resolverLoader = new ResolverLoader(appRoot);\n  }\n  return resolverLoader;\n}\n\nexport default function virtualLoader(this: LoaderContext<unknown>): string | undefined {\n  if (typeof this.query === 'string' && this.query[0] === '?') {\n    let params = new URLSearchParams(this.query);\n    let filename = params.get('f');\n    let appRoot = params.get('a');\n    if (!filename || !appRoot) {\n      throw new Error(`bug in @embroider/webpack virtual loader, cannot locate params in ${this.query}`);\n    }\n    let { resolver } = setup(appRoot);\n    this.resourcePath = filename;\n    return virtualContent(filename, resolver).src;\n  }\n  throw new Error(`@embroider/webpack/src/virtual-loader received unexpected request: ${this.query}`);\n}\n"]}