polymer-bundler - npm Package Compare versions

Comparing version 4.0.0-pre.1 to 4.0.0-pre.2

CHANGELOG.md

@@ -11,2 +11,6 @@ # Change Log
 
+## 4.0.0-pre.2 - 2018-03-20
+- Upgraded to use `polymer-analyzer` version `3.0.0-pre.17`.
+- Switched to `FsUrlResolver` from `PackageUrlResolver` as the default `UrlResolver` for bundling contexts.  This is because `PackageUrlResolver` is intended for component analysis, not application analysis.
+
 ## 4.0.0-pre.1 - 2018-03-07
@@ -13,0 +17,0 @@ - [BREAKING] Upgraded to use `polymer-analyzer` version `3.0.0-pre.13` which requires the `ResolvedUrl` type in nearly all places where URLs are exchanged and provides strict typing on URLs used globally.  Eliminated the local `UrlString` type.

lib/bin/polymer-bundler.js

@@ -175,4 +175,4 @@ #!/usr/bin/env node
 options.rewriteUrlsInTemplates = Boolean(options['rewrite-urls-in-templates']);
-const fsUrlLoader = new polymer_analyzer_1.FSUrlLoader(projectRoot);
-const packageUrlResolver = new polymer_analyzer_1.PackageUrlResolver({ packageDir: projectRoot });
+const urlLoader = new polymer_analyzer_1.FsUrlLoader(projectRoot);
+const urlResolver = new polymer_analyzer_1.FsUrlResolver(projectRoot);
 const projectRootUrl = url_utils_1.getFileUrl(projectRoot);
@@ -183,3 +183,3 @@ if (options.redirect) {
         const [prefix, path] = redirect.split('|');
-        const resolvedPrefix = packageUrlResolver.resolve(prefix);
+        const resolvedPrefix = urlResolver.resolve(prefix);
         return { prefix: resolvedPrefix, path };
@@ -189,7 +189,7 @@ })
     const resolvers = redirections.map((r) => new polymer_analyzer_1.RedirectResolver(projectRootUrl, r.prefix, url_utils_1.getFileUrl(r.path)));
-    const loaders = redirections.map((r) => new polymer_analyzer_1.FSUrlLoader(url_utils_1.resolvePath(r.path)));
+    const loaders = redirections.map((r) => new polymer_analyzer_1.FsUrlLoader(url_utils_1.resolvePath(r.path)));
     if (redirections.length > 0) {
         options.analyzer = new polymer_analyzer_1.Analyzer({
-            urlResolver: new polymer_analyzer_1.MultiUrlResolver([...resolvers, packageUrlResolver]),
-            urlLoader: new polymer_analyzer_1.MultiUrlLoader([...loaders, fsUrlLoader]),
+            urlResolver: new polymer_analyzer_1.MultiUrlResolver([...resolvers, urlResolver]),
+            urlLoader: new polymer_analyzer_1.MultiUrlLoader([...loaders, urlLoader]),
         });
@@ -199,6 +199,3 @@ }
 if (!options.analyzer) {
-    options.analyzer = new polymer_analyzer_1.Analyzer({
-        urlResolver: packageUrlResolver,
-        urlLoader: fsUrlLoader,
-    });
+    options.analyzer = new polymer_analyzer_1.Analyzer({ urlResolver, urlLoader });
 }
@@ -205,0 +202,0 @@ if (options.shell) {

lib/bundler.js

@@ -48,3 +48,3 @@ "use strict";
             this._overlayUrlLoader =
-                new polymer_analyzer_1.InMemoryOverlayUrlLoader(new polymer_analyzer_1.FSUrlLoader(url_utils_1.resolvePath('.')));
+                new polymer_analyzer_1.InMemoryOverlayUrlLoader(new polymer_analyzer_1.FsUrlLoader(url_utils_1.resolvePath('.')));
             this.analyzer = new polymer_analyzer_1.Analyzer({ urlLoader: this._overlayUrlLoader });
@@ -51,0 +51,0 @@ }

lib/test/bundler_test.js

@@ -52,10 +52,8 @@ "use strict";
             if (!opts || !opts.urlResolver) {
-                const urlResolver = new polymer_analyzer_1.PackageUrlResolver({
-                    packageDir: url_utils_1.resolvePath('test/html'),
-                });
-                opts = Object.assign({}, opts || {}, { urlResolver: urlResolver });
+                const urlResolver = new polymer_analyzer_1.FsUrlResolver(url_utils_1.resolvePath('test/html'));
+                opts = Object.assign({}, opts || {}, { urlResolver });
             }
             if (!opts || !opts.urlLoader) {
-                const urlLoader = new polymer_analyzer_1.FSUrlLoader(url_utils_1.resolvePath('test/html'));
-                opts = Object.assign({}, opts || {}, { urlLoader: urlLoader });
+                const urlLoader = new polymer_analyzer_1.FsUrlLoader(url_utils_1.resolvePath('test/html'));
+                opts = Object.assign({}, opts || {}, { urlLoader });
             }
@@ -485,3 +483,3 @@ analyzer = new polymer_analyzer_1.Analyzer(opts);
                 inlineScripts: true,
-                analyzer: new polymer_analyzer_1.Analyzer({ urlLoader: new polymer_analyzer_1.FSUrlLoader() }),
+                analyzer: new polymer_analyzer_1.Analyzer({ urlLoader: new polymer_analyzer_1.FsUrlLoader() }),
             });
@@ -589,3 +587,3 @@ const scripts = dom5.queryAll(doc, matchers.inlineJavascript);
                 inlineCss: true,
-                analyzer: new polymer_analyzer_1.Analyzer({ urlLoader: new polymer_analyzer_1.FSUrlLoader('.') }),
+                analyzer: new polymer_analyzer_1.Analyzer({ urlLoader: new polymer_analyzer_1.FsUrlLoader('.') }),
             });
@@ -622,3 +620,3 @@ const link = dom5.query(doc, preds.AND(matchers.htmlImport, preds.hasAttrValue('href', 'default.html')));
         test('Assetpath rewriting', () => __awaiter(this, void 0, void 0, function* () {
-            const { ast: doc } = yield bundle('path-rewriting/src/app-main/app-main.html', { analyzer: new polymer_analyzer_1.Analyzer({ urlLoader: new polymer_analyzer_1.FSUrlLoader() }) });
+            const { ast: doc } = yield bundle('path-rewriting/src/app-main/app-main.html', { analyzer: new polymer_analyzer_1.Analyzer({ urlLoader: new polymer_analyzer_1.FsUrlLoader() }) });
             assert(doc);
@@ -625,0 +623,0 @@ const domModules = dom5.queryAll(doc, preds.hasTagName('dom-module'));

lib/test/deps-index_test.js

@@ -51,6 +51,4 @@ "use strict";
             analyzer = new polymer_analyzer_1.Analyzer({
-                urlResolver: new polymer_analyzer_1.PackageUrlResolver({
-                    packageDir: 'test/html/shards/polymer_style_project',
-                }),
-                urlLoader: new polymer_analyzer_1.FSUrlLoader('test/html/shards/polymer_style_project'),
+                urlResolver: new polymer_analyzer_1.FsUrlResolver('test/html/shards/polymer_style_project'),
+                urlLoader: new polymer_analyzer_1.FsUrlLoader('test/html/shards/polymer_style_project'),
             });
@@ -73,6 +71,4 @@ const common = resolve('common.html');
             analyzer = new polymer_analyzer_1.Analyzer({
-                urlResolver: new polymer_analyzer_1.PackageUrlResolver({
-                    packageDir: 'test/html/imports',
-                }),
-                urlLoader: new polymer_analyzer_1.FSUrlLoader('test/html/imports')
+                urlResolver: new polymer_analyzer_1.FsUrlResolver('test/html/imports'),
+                urlLoader: new polymer_analyzer_1.FsUrlLoader('test/html/imports')
             });
@@ -106,6 +102,4 @@ const entrypoint = resolve('lazy-imports.html');
             analyzer = new polymer_analyzer_1.Analyzer({
-                urlResolver: new polymer_analyzer_1.PackageUrlResolver({
-                    packageDir: 'test/html/imports',
-                }),
-                urlLoader: new polymer_analyzer_1.FSUrlLoader('test/html/imports')
+                urlResolver: new polymer_analyzer_1.FsUrlResolver('test/html/imports'),
+                urlLoader: new polymer_analyzer_1.FsUrlLoader('test/html/imports')
             });
@@ -112,0 +106,0 @@ const entrypoint = resolve('eagerly-importing-a-fragment.html');

lib/test/shards_test.js

@@ -52,4 +52,4 @@ "use strict";
             analyzer = new polymer_analyzer_1.Analyzer({
-                urlResolver: new polymer_analyzer_1.PackageUrlResolver({ packageDir: 'test/html' }),
-                urlLoader: new polymer_analyzer_1.FSUrlLoader('test/html'),
+                urlResolver: new polymer_analyzer_1.FsUrlResolver('test/html'),
+                urlLoader: new polymer_analyzer_1.FsUrlLoader('test/html'),
             });
@@ -56,0 +56,0 @@ }

lib/test/sourcemap_test.js

@@ -45,3 +45,3 @@ "use strict";
             if (!bundlerOpts.analyzer) {
-                bundlerOpts.analyzer = new polymer_analyzer_1.Analyzer({ urlLoader: new polymer_analyzer_1.FSUrlLoader(path.dirname(inputPath)) });
+                bundlerOpts.analyzer = new polymer_analyzer_1.Analyzer({ urlLoader: new polymer_analyzer_1.FsUrlLoader(path.dirname(inputPath)) });
                 inputPath = path.basename(inputPath);
@@ -80,7 +80,4 @@ }
     const basePath = url_utils_1.resolvePath('test/html/sourcemaps/');
-    const urlLoader = new polymer_analyzer_1.FSUrlLoader(basePath);
-    const analyzer = new polymer_analyzer_1.Analyzer({
-        urlResolver: new polymer_analyzer_1.PackageUrlResolver({ packageDir: basePath }),
-        urlLoader: urlLoader
-    });
+    const urlLoader = new polymer_analyzer_1.FsUrlLoader(basePath);
+    const analyzer = new polymer_analyzer_1.Analyzer({ urlResolver: new polymer_analyzer_1.FsUrlResolver(basePath), urlLoader: urlLoader });
     suite('Sourcemaps', () => {
@@ -87,0 +84,0 @@ test('inline maps are compiled correctly', () => __awaiter(this, void 0, void 0, function* () {

package.json

 {
   "name": "polymer-bundler",
-  "version": "4.0.0-pre.1",
+  "version": "4.0.0-pre.2",
   "description": "Process Web Components into one output file",
@@ -23,3 +23,3 @@ "main": "lib/bundler.js",
     "parse5": "^2.2.2",
-    "polymer-analyzer": "^3.0.0-pre.13",
+    "polymer-analyzer": "^3.0.0-pre.17",
     "source-map": "^0.5.6",
@@ -26,0 +26,0 @@ "vscode-uri": "^1.0.1"

README.md

@@ -134,5 +134,5 @@ [![Build Status](https://travis-ci.org/Polymer/polymer-bundler.svg?branch=master)](https://travis-ci.org/Polymer/polymer-bundler)
 ```js
-const {Analyzer, FSUrlLoader} = require('polymer-analyzer');
+const {Analyzer, FsUrlLoader} = require('polymer-analyzer');
 const analyzer = new Analyzer({
-  urlLoader: new FSUrlLoader(path.resolve('.'))
+  urlLoader: new FsUrlLoader(path.resolve('.'))
 });
@@ -139,0 +139,0 @@

No alert changes

Worsened metrics

Total package byte prevSize

433555

decreased by-15.25%

Number of package files

83

decreased by-13.54%

Lines of code

5088

decreased by-16.82%

Dependency changes

• Updatedpolymer-analyzer@^3.0.0-pre.17