@web/dev-server-rollup - npm Package Compare versions

Comparing version 0.1.2 to 0.1.3

CHANGELOG.md

 # @web/dev-server-rollup
 
+## 0.1.3
+
+### Patch Changes
+
+- f9dfcd3: improve rollup syntax error logging
+- Updated dependencies [8596276]
+  - @web/dev-server-core@0.1.5
+
 ## 0.1.2
@@ -4,0 +12,0 @@

dist/rollupAdapter.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"rollupAdapter.d.ts","sourceRoot":"","sources":["../src/rollupAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,IAAI,SAAS,EAAkC,MAAM,sBAAsB,CAAC;AAE3F,OAAO,EAAE,MAAM,IAAI,YAAY,EAA0B,MAAM,QAAQ,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AActC,wBAAgB,aAAa,CAC3B,YAAY,EAAE,YAAY,EAC1B,kBAAkB,GAAE,OAAO,CAAC,YAAY,CAAM,GAC7C,SAAS,CA+LX"}
+{"version":3,"file":"rollupAdapter.d.ts","sourceRoot":"","sources":["../src/rollupAdapter.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,IAAI,SAAS,EAMpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,IAAI,YAAY,EAA0B,MAAM,QAAQ,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAoCtC,wBAAgB,aAAa,CAC3B,YAAY,EAAE,YAAY,EAC1B,kBAAkB,GAAE,OAAO,CAAC,YAAY,CAAM,GAC7C,SAAS,CA4MX"}

dist/rollupAdapter.js

@@ -10,3 +10,5 @@ "use strict";
 const whatwg_url_1 = __importDefault(require("whatwg-url"));
+const dev_server_core_1 = require("@web/dev-server-core");
 const url_1 = require("url");
+const chalk_1 = require("chalk");
 const utils_1 = require("./utils");
@@ -16,3 +18,3 @@ const createRollupPluginContextAdapter_1 = require("./createRollupPluginContextAdapter");
 const NULL_BYTE_PARAM = 'web-dev-server-rollup-null-byte';
-const VIRTUAL_FILE_PREFIX = '/__web-dev-server__';
+const VIRTUAL_FILE_PREFIX = '/__web-dev-server__/rollup';
 function resolveFilePath(rootDir, path) {
@@ -22,2 +24,17 @@ const fileUrl = new url_1.URL(`.${path}`, `${url_1.pathToFileURL(rootDir)}/`);
 }
+/**
+ * Wraps rollup error in a custom error for web dev server.
+ */
+function wrapRollupError(filePath, context, error) {
+    var _a, _b;
+    if (typeof error == null || typeof error !== 'object') {
+        return error;
+    }
+    if (typeof ((_a = error === null || error === void 0 ? void 0 : error.loc) === null || _a === void 0 ? void 0 : _a.line) === 'number' && typeof ((_b = error === null || error === void 0 ? void 0 : error.loc) === null || _b === void 0 ? void 0 : _b.column) === 'number') {
+        return new dev_server_core_1.PluginSyntaxError(
+        // replace file path in error message since it will be reported be the dev server
+        error.message.replace(new RegExp(`(\\s*in\\s*)?(${filePath})`), ''), filePath, context.body, error.loc.line, error.loc.column);
+    }
+    return error;
+}
 function rollupAdapter(rollupPlugin, rollupInputOptions = {}) {
@@ -54,57 +71,57 @@ const transformedFiles = new Set();
             const filePath = resolveFilePath(rootDir, requestedFile);
-            const rollupPluginContext = createRollupPluginContextAdapter_1.createRollupPluginContextAdapter(rollupPluginContexts.pluginContext, wdsPlugin, config, fileWatcher, context);
-            let resolvableImport = source;
-            let importSuffix = '';
-            // we have to special case node-resolve because it doesn't support resolving
-            // with hash/params at the moment
-            if (rollupPlugin.name === 'node-resolve') {
-                const [withoutHash, hash] = source.split('#');
-                const [importPath, params] = withoutHash.split('?');
-                importSuffix = `${params ? `?${params}` : ''}${hash ? `#${hash}` : ''}`;
-                resolvableImport = importPath;
-            }
-            // if the import was already a fully resolved file path, it was probably injected by a plugin.
-            // in that case use that instead of resolving it through a plugin hook. this puts the resolved file
-            // path through the regular logic to turn it into a relative browser import
-            // otherwise call the resolveID hook on the plugin
-            const result = injectedFilePath
-                ? resolvableImport
-                : await ((_a = rollupPlugin.resolveId) === null || _a === void 0 ? void 0 : _a.call(rollupPluginContext, resolvableImport, filePath));
-            let resolvedImportFilePath = undefined;
-            if (typeof result === 'string') {
-                resolvedImportFilePath = result;
-            }
-            else if (typeof result === 'object' && typeof (result === null || result === void 0 ? void 0 : result.id) === 'string') {
-                resolvedImportFilePath = result.id;
-            }
-            if (!resolvedImportFilePath) {
-                return undefined;
-            }
-            const hasNullByte = resolvedImportFilePath.includes('\0');
-            const withoutNullByte = hasNullByte
-                ? resolvedImportFilePath.replace(new RegExp('\0', 'g'), '')
-                : resolvedImportFilePath;
-            if (withoutNullByte.startsWith(rootDir)) {
-                const resolveRelativeTo = path_1.default.extname(filePath) ? path_1.default.dirname(filePath) : filePath;
-                const relativeImportFilePath = path_1.default.relative(resolveRelativeTo, withoutNullByte);
-                const resolvedImportPath = `${utils_1.toBrowserPath(relativeImportFilePath)}`;
-                const prefixedImportPath = resolvedImportPath.startsWith('/') || resolvedImportPath.startsWith('.')
-                    ? `${resolvedImportPath}${importSuffix}`
-                    : `./${resolvedImportPath}${importSuffix}`;
-                if (!hasNullByte) {
-                    return prefixedImportPath;
+            try {
+                const rollupPluginContext = createRollupPluginContextAdapter_1.createRollupPluginContextAdapter(rollupPluginContexts.pluginContext, wdsPlugin, config, fileWatcher, context);
+                let resolvableImport = source;
+                let importSuffix = '';
+                // we have to special case node-resolve because it doesn't support resolving
+                // with hash/params at the moment
+                if (rollupPlugin.name === 'node-resolve') {
+                    const [withoutHash, hash] = source.split('#');
+                    const [importPath, params] = withoutHash.split('?');
+                    importSuffix = `${params ? `?${params}` : ''}${hash ? `#${hash}` : ''}`;
+                    resolvableImport = importPath;
                 }
-                const suffix = `${NULL_BYTE_PARAM}=${encodeURIComponent(resolvedImportFilePath)}`;
-                if (prefixedImportPath.includes('?')) {
-                    return `${prefixedImportPath}&${suffix}`;
+                // if the import was already a fully resolved file path, it was probably injected by a plugin.
+                // in that case use that instead of resolving it through a plugin hook. this puts the resolved file
+                // path through the regular logic to turn it into a relative browser import
+                // otherwise call the resolveID hook on the plugin
+                const result = injectedFilePath
+                    ? resolvableImport
+                    : await ((_a = rollupPlugin.resolveId) === null || _a === void 0 ? void 0 : _a.call(rollupPluginContext, resolvableImport, filePath));
+                let resolvedImportPath = undefined;
+                if (typeof result === 'string') {
+                    resolvedImportPath = result;
                 }
-                return `${prefixedImportPath}?${suffix}`;
+                else if (typeof result === 'object' && typeof (result === null || result === void 0 ? void 0 : result.id) === 'string') {
+                    resolvedImportPath = result.id;
+                }
+                if (!resolvedImportPath) {
+                    return undefined;
+                }
+                // if the resolved import includes a null byte (\0) there is some special logic
+                // these often are not valid file paths, so the browser cannot request them.
+                // we rewrite them to a special URL which we deconstruct later when we load the file
+                if (resolvedImportPath.includes('\0')) {
+                    const filename = path_1.default.basename(resolvedImportPath.replace(/\0*/g, '').split('?')[0].split('#')[0]);
+                    const urlParam = encodeURIComponent(resolvedImportPath);
+                    return `${VIRTUAL_FILE_PREFIX}/${filename}?${NULL_BYTE_PARAM}=${urlParam}`;
+                }
+                // some plugins don't return a file path, so we just return it as is
+                if (!utils_1.isAbsoluteFilePath(resolvedImportPath)) {
+                    return `${resolvedImportPath}`;
+                }
+                if (!resolvedImportPath.startsWith(rootDir)) {
+                    throw new dev_server_core_1.PluginError(chalk_1.red(`Resolved an import to ${chalk_1.yellow(resolvedImportPath)}`) +
+                        chalk_1.red('. This path is not reachable from the browser because') +
+                        chalk_1.red(` it is outside root directory ${chalk_1.yellow(rootDir)}`) +
+                        chalk_1.red(`. Configure the root directory using the ${chalk_1.yellow('--root-dir')} or ${chalk_1.yellow('rootDir')} option.`));
+                }
+                const resolveRelativeTo = path_1.default.extname(filePath) ? path_1.default.dirname(filePath) : filePath;
+                const relativeImportFilePath = path_1.default.relative(resolveRelativeTo, resolvedImportPath);
+                const importBrowserPath = `${utils_1.toBrowserPath(relativeImportFilePath)}`;
+                return `./${importBrowserPath}${importSuffix}`;
             }
-            // if the resolved import includes a null byte (\0) there is some special logic
-            // these often are not valid file paths, so the browser cannot request them.
-            // we rewrite them to a special URL which we deconstruct later when we load the file
-            if (resolvedImportFilePath.includes('\0')) {
-                return `${VIRTUAL_FILE_PREFIX}/?${NULL_BYTE_PARAM}=${encodeURIComponent(resolvedImportFilePath)}`;
+            catch (error) {
+                throw wrapRollupError(filePath, context, error);
             }
-            return `${resolvedImportFilePath}${importSuffix}`;
         },
@@ -117,3 +134,4 @@ async serve(context) {
             let filePath;
-            if (context.URL.searchParams.has(NULL_BYTE_PARAM)) {
+            if (context.path.startsWith(VIRTUAL_FILE_PREFIX) &&
+                context.URL.searchParams.has(NULL_BYTE_PARAM)) {
                 // if this was a special URL constructed in resolveImport to handle null bytes,
@@ -126,9 +144,14 @@ // the file path is stored in the search paramter
             }
-            const rollupPluginContext = createRollupPluginContextAdapter_1.createRollupPluginContextAdapter(rollupPluginContexts.pluginContext, wdsPlugin, config, fileWatcher, context);
-            const result = await ((_a = rollupPlugin.load) === null || _a === void 0 ? void 0 : _a.call(rollupPluginContext, filePath));
-            if (typeof result === 'string') {
-                return { body: result, type: 'js' };
+            try {
+                const rollupPluginContext = createRollupPluginContextAdapter_1.createRollupPluginContextAdapter(rollupPluginContexts.pluginContext, wdsPlugin, config, fileWatcher, context);
+                const result = await ((_a = rollupPlugin.load) === null || _a === void 0 ? void 0 : _a.call(rollupPluginContext, filePath));
+                if (typeof result === 'string') {
+                    return { body: result, type: 'js' };
+                }
+                if (typeof (result === null || result === void 0 ? void 0 : result.code) === 'string') {
+                    return { body: result.code, type: 'js' };
+                }
             }
-            if (typeof (result === null || result === void 0 ? void 0 : result.code) === 'string') {
-                return { body: result.code, type: 'js' };
+            catch (error) {
+                throw wrapRollupError(filePath, context, error);
             }
@@ -144,16 +167,21 @@ return undefined;
                 const filePath = resolveFilePath(rootDir, context.path);
-                const rollupPluginContext = createRollupPluginContextAdapter_1.createRollupPluginContextAdapter(rollupPluginContexts.transformPluginContext, wdsPlugin, config, fileWatcher, context);
-                const result = await ((_a = rollupPlugin.transform) === null || _a === void 0 ? void 0 : _a.call(rollupPluginContext, context.body, filePath));
-                let transformedCode = undefined;
-                if (typeof result === 'string') {
-                    transformedCode = result;
+                try {
+                    const rollupPluginContext = createRollupPluginContextAdapter_1.createRollupPluginContextAdapter(rollupPluginContexts.transformPluginContext, wdsPlugin, config, fileWatcher, context);
+                    const result = await ((_a = rollupPlugin.transform) === null || _a === void 0 ? void 0 : _a.call(rollupPluginContext, context.body, filePath));
+                    let transformedCode = undefined;
+                    if (typeof result === 'string') {
+                        transformedCode = result;
+                    }
+                    if (typeof result === 'object' && typeof (result === null || result === void 0 ? void 0 : result.code) === 'string') {
+                        transformedCode = result.code;
+                    }
+                    if (transformedCode) {
+                        transformedFiles.add(context.path);
+                        return transformedCode;
+                    }
+                    return;
                 }
-                if (typeof result === 'object' && typeof (result === null || result === void 0 ? void 0 : result.code) === 'string') {
-                    transformedCode = result.code;
+                catch (error) {
+                    throw wrapRollupError(filePath, context, error);
                 }
-                if (transformedCode) {
-                    transformedFiles.add(context.path);
-                    return transformedCode;
-                }
-                return;
             }
@@ -160,0 +188,0 @@ },

dist/rollupAdapter.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"rollupAdapter.js","sourceRoot":"","sources":["../src/rollupAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rollupAdapter.js","sourceRoot":"","sources":["../src/rollupAdapter.ts"],"names":[],"mappings":"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"}

dist/utils.d.ts

@@ -7,2 +7,3 @@ /**
 export declare function toBrowserPath(filePath: string): string;
+export declare function isAbsoluteFilePath(path: string): boolean;
 //# sourceMappingURL=utils.d.ts.map

dist/utils.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,UAE7C"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,UAE7C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,WAE9C"}

dist/utils.js

@@ -6,4 +6,5 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBrowserPath = void 0;
+exports.isAbsoluteFilePath = exports.toBrowserPath = void 0;
 const path_1 = __importDefault(require("path"));
+const REGEXP_ABSOLUTE = /^(?:\/|(?:[A-Za-z]:)?[\\|/])/;
 /**
@@ -18,2 +19,6 @@ * Turns a file path into a path suitable for browsers, with a / as seperator.
 exports.toBrowserPath = toBrowserPath;
+function isAbsoluteFilePath(path) {
+    return REGEXP_ABSOLUTE.test(path);
+}
+exports.isAbsoluteFilePath = isAbsoluteFilePath;
 //# sourceMappingURL=utils.js.map

dist/utils.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB;;;;GAIG;AACH,SAAgB,aAAa,CAAC,QAAgB;IAC5C,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,cAAI,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AACvF,CAAC;AAFD,sCAEC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAExB,MAAM,eAAe,GAAG,8BAA8B,CAAC;AAEvD;;;;GAIG;AACH,SAAgB,aAAa,CAAC,QAAgB;IAC5C,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,cAAI,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AACvF,CAAC;AAFD,sCAEC;AAED,SAAgB,kBAAkB,CAAC,IAAY;IAC7C,OAAO,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAFD,gDAEC"}

package.json

 {
   "name": "@web/dev-server-rollup",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "publishConfig": {
@@ -21,5 +21,8 @@ "access": "public"
   "scripts": {
-    "test": "mocha \"test/**/*.test.ts\" --require ts-node/register --reporter progress",
+    "test": "yarn test:node && yarn test:browser",
+    "test:browser": "node ../test-runner/dist/test-runner.js test/browser/**/*.test.js --node-resolve",
+    "test:browser:watch": "node ../test-runner/dist/test-runner.js test/browser/**/*.test.js --node-resolve --watch",
     "test:ci": "yarn test",
-    "test:watch": "mocha \"test/**/*.test.ts\" --require ts-node/register --watch --watch-files src,test --reporter progress"
+    "test:node": "mocha \"test/node/**/*.test.ts\" --require ts-node/register --reporter progress",
+    "test:node:watch": "mocha \"test/node/**/*.test.ts\" --require ts-node/register --watch --watch-files src,test --reporter progress"
   },
@@ -42,3 +45,4 @@ "files": [
   "dependencies": {
-    "@web/dev-server-core": "^0.1.1",
+    "@web/dev-server-core": "^0.1.5",
+    "chalk": "^4.1.0",
     "rollup": "^2.20.0",
@@ -48,3 +52,6 @@ "whatwg-url": "^8.1.0"
   "devDependencies": {
+    "@babel/plugin-transform-template-literals": "^7.10.4",
     "@rollup/plugin-alias": "^3.1.1",
+    "@rollup/plugin-babel": "^5.0.4",
+    "@rollup/plugin-commonjs": "^13.0.0",
     "@rollup/plugin-image": "^2.0.5",
@@ -54,4 +61,10 @@ "@rollup/plugin-inject": "^4.0.2",
     "@rollup/plugin-node-resolve": "^8.1.0",
-    "@rollup/plugin-replace": "^2.3.3"
+    "@rollup/plugin-replace": "^2.3.3",
+    "@rollup/plugin-url": "^5.0.1",
+    "@types/node-fetch": "^2.5.7",
+    "chai": "^4.2.0",
+    "node-fetch": "^2.6.0",
+    "rollup-plugin-postcss": "^3.1.2",
+    "sinon": "^9.0.2"
   }
 }

New alerts

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Long strings

Supply chain risk

Contains long string literals, which may be a sign of obfuscated or packed code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

37148

11.28%

Lines of code

377

9.91%

Worsened metrics

Dependency count

4

33.33%

Dev dependency count

15

150%

Number of low supply chain risk alerts

1

Infinity%

Number of medium supply chain risk alerts

1

Infinity%

Dependency changes

• + Added

  chalk@^4.1.0

• + Added

  ansi-styles@4.3.0
  (transitive)

• + Added

  chalk@4.1.2
  (transitive)

• + Added

  color-convert@2.0.1
  (transitive)

• + Added

  color-name@1.1.4
  (transitive)

• + Added

  has-flag@4.0.0
  (transitive)

• + Added

  supports-color@7.2.0
  (transitive)

• Updated

  @web/dev-server-core@^0.1.5