liferay-npm-bundler-loader-css-loader - npm Package Compare versions

Comparing version 2.13.0 to 2.13.1

lib/__tests__/index.test.js

@@ -27,3 +27,3 @@ 'use strict';
 
-var savedProjectDir = _project2.default.dir;
+var savedProjectPath = _project2.default.dir.asNative;
 
@@ -36,3 +36,3 @@ describe('standard projects', function () {
 	afterEach(function () {
-		_project2.default.loadFrom(savedProjectDir);
+		_project2.default.loadFrom(savedProjectPath);
 	});
@@ -105,3 +105,14 @@
 
-	it('dumps correct URL in windows', function () {});
+	it('strips source dirs from URL', function () {
+		var context = {
+			content: '',
+			filePath: 'src' + _path2.default.sep + 'file.css',
+			log: new _pluginLogger2.default(),
+			extraArtifacts: {}
+		};
+
+		(0, _index2.default)(context, {});
+
+		expect(context.extraArtifacts[context.filePath + '.js.wrap-modules-amd.template']).toMatch('.ThemeDisplay.getPathContext() + "/o/a-project/file.css"');
+	});
 });
@@ -115,3 +126,3 @@
 	afterEach(function () {
-		_project2.default.loadFrom(savedProjectDir);
+		_project2.default.loadFrom(savedProjectPath);
 	});
@@ -118,0 +129,0 @@

lib/index.js

@@ -29,2 +29,6 @@ 'use strict';
 
+var _filePath = require('liferay-npm-build-tools-common/lib/file-path');
+
+var _filePath2 = _interopRequireDefault(_filePath);
+
 var _project = require('liferay-npm-build-tools-common/lib/project');
@@ -40,8 +44,2 @@
 
-/**
- * © 2017 Liferay, Inc. <https://liferay.com>
- *
- * SPDX-License-Identifier: LGPL-3.0-or-later
- */
-
 function getHref(filePath, extension, pathModule) {
@@ -53,3 +51,3 @@ var webContextPath = void 0;
 	} else {
-		var bnd = _fs2.default.readFileSync(_path2.default.join(_project2.default.dir, 'bnd.bnd')).toString();
+		var bnd = _fs2.default.readFileSync(_project2.default.dir.join('bnd.bnd').asNative).toString();
 
@@ -65,5 +63,8 @@ var lines = bnd.split('\n');
 
-	_project2.default.sources.asPlatform.forEach(function (source) {
-		if (filePath.startsWith(source)) {
-			filePath = filePath.substring(source.length + 1);
+	_project2.default.sources.asNative.forEach(function (sourcePath) {
+		// Remove `./` from sourcePath so that it matches the filePath correctly
+		sourcePath = sourcePath.substring(2);
+
+		if (filePath.startsWith(sourcePath)) {
+			filePath = filePath.substring(sourcePath.length + 1);
 		}
@@ -82,5 +83,3 @@ });
 
-	if (_path2.default.sep !== '/') {
-		filePath = filePath.replace(new RegExp(_path2.default.sep, 'g'), '/');
-	}
+	filePath = new _filePath2.default(filePath).asPosix;
 
@@ -93,2 +92,7 @@ return '' + pathModule + webContextPath + '/' + filePath;
  */
+/**
+ * © 2017 Liferay, Inc. <https://liferay.com>
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ */
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "liferay-npm-bundler-loader-css-loader",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "A liferay-npm-bundler loader that turns CSS files into JavaScript modules that inject a <link> into the HTML when they are required.",
@@ -15,4 +15,4 @@ "main": "lib/index.js",
   "dependencies": {
-    "liferay-npm-build-tools-common": "2.13.0"
+    "liferay-npm-build-tools-common": "2.13.1"
   }
 }

src/__tests__/index.test.js

@@ -13,3 +13,3 @@ /**
 
-const savedProjectDir = project.dir;
+const savedProjectPath = project.dir.asNative;
 
@@ -22,3 +22,3 @@ describe('standard projects', () => {
 	afterEach(() => {
-		project.loadFrom(savedProjectDir);
+		project.loadFrom(savedProjectPath);
 	});
@@ -108,3 +108,18 @@
 
-	it('dumps correct URL in windows', () => {});
+	it('strips source dirs from URL', () => {
+		const context = {
+			content: '',
+			filePath: `src${path.sep}file.css`,
+			log: new PluginLogger(),
+			extraArtifacts: {},
+		};
+
+		loader(context, {});
+
+		expect(
+			context.extraArtifacts[
+				`${context.filePath}.js.wrap-modules-amd.template`
+			]
+		).toMatch('.ThemeDisplay.getPathContext() + "/o/a-project/file.css"');
+	});
 });
@@ -118,3 +133,3 @@
 	afterEach(() => {
-		project.loadFrom(savedProjectDir);
+		project.loadFrom(savedProjectPath);
 	});
@@ -121,0 +136,0 @@

src/index.js

@@ -8,2 +8,3 @@ /**
 import fs from 'fs';
+import FilePath from 'liferay-npm-build-tools-common/lib/file-path';
 import project from 'liferay-npm-build-tools-common/lib/project';
@@ -56,3 +57,3 @@ import path from 'path';
 		const bnd = fs
-			.readFileSync(path.join(project.dir, 'bnd.bnd'))
+			.readFileSync(project.dir.join('bnd.bnd').asNative)
 			.toString();
@@ -69,5 +70,8 @@
 
-	project.sources.asPlatform.forEach(source => {
-		if (filePath.startsWith(source)) {
-			filePath = filePath.substring(source.length + 1);
+	project.sources.asNative.forEach(sourcePath => {
+		// Remove `./` from sourcePath so that it matches the filePath correctly
+		sourcePath = sourcePath.substring(2);
+
+		if (filePath.startsWith(sourcePath)) {
+			filePath = filePath.substring(sourcePath.length + 1);
 		}
@@ -89,7 +93,5 @@ });
 
-	if (path.sep !== '/') {
-		filePath = filePath.replace(new RegExp(path.sep, 'g'), '/');
-	}
+	filePath = new FilePath(filePath).asPosix;
 
 	return `${pathModule}${webContextPath}/${filePath}`;
 }

No alert changes

Improved metrics

Total package byte prevSize

29647

increased by6.56%

Lines of code

370

increased by7.25%

Dependency changes

• + Addedbabel-plugin-add-module-metadata@2.13.1(transitive)

• + Addedbabel-plugin-name-amd-modules@2.13.1(transitive)

• + Addedbabel-plugin-namespace-amd-define@2.13.1(transitive)

• + Addedbabel-plugin-namespace-modules@2.13.1(transitive)

• + Addedbabel-plugin-normalize-requires@2.13.1(transitive)

• + Addedbabel-plugin-wrap-modules-amd@2.13.1(transitive)

• + Addedbabel-preset-liferay-standard@2.13.1(transitive)

• + Addedliferay-npm-build-tools-common@2.13.1(transitive)

• + Addedliferay-npm-bundler-plugin-exclude-imports@2.13.1(transitive)

• + Addedliferay-npm-bundler-plugin-inject-imports-dependencies@2.13.1(transitive)

• + Addedliferay-npm-bundler-plugin-inject-peer-dependencies@2.13.1(transitive)

• + Addedliferay-npm-bundler-plugin-namespace-packages@2.13.1(transitive)

• + Addedliferay-npm-bundler-plugin-replace-browser-modules@2.13.1(transitive)

• + Addedliferay-npm-bundler-plugin-resolve-linked-dependencies@2.13.1(transitive)

• + Addedliferay-npm-bundler-preset-standard@2.13.1(transitive)

• - Removedbabel-plugin-add-module-metadata@2.13.0(transitive)

• - Removedbabel-plugin-name-amd-modules@2.13.0(transitive)

• - Removedbabel-plugin-namespace-amd-define@2.13.0(transitive)

• - Removedbabel-plugin-namespace-modules@2.13.0(transitive)

• - Removedbabel-plugin-normalize-requires@2.13.0(transitive)

• - Removedbabel-plugin-wrap-modules-amd@2.13.0(transitive)

• - Removedbabel-preset-liferay-standard@2.13.0(transitive)

• - Removedliferay-npm-build-tools-common@2.13.0(transitive)

• - Removedliferay-npm-bundler-plugin-exclude-imports@2.13.0(transitive)

• - Removedliferay-npm-bundler-plugin-inject-imports-dependencies@2.13.0(transitive)

• - Removedliferay-npm-bundler-plugin-inject-peer-dependencies@2.13.0(transitive)

• - Removedliferay-npm-bundler-plugin-namespace-packages@2.13.0(transitive)

• - Removedliferay-npm-bundler-plugin-replace-browser-modules@2.13.0(transitive)

• - Removedliferay-npm-bundler-plugin-resolve-linked-dependencies@2.13.0(transitive)

• - Removedliferay-npm-bundler-preset-standard@2.13.0(transitive)

• Updatedliferay-npm-build-tools-common@2.13.1