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

Comparing version 2.17.1 to 2.18.0

lib/index.js

@@ -15,8 +15,9 @@ "use strict";
 const path_1 = __importDefault(require("path"));
+const read_json_sync_1 = __importDefault(require("read-json-sync"));
 /**
  * @param {object} context loader's context
  */
-function default_1(context, { extension, pathModule = '/o' }) {
+function default_1(context, { extension, namespaceDependencies = true, pathModule = '/o' }) {
     const { filePath, log } = context;
-    const href = getHref(filePath, extension, pathModule);
+    const href = getHref(filePath, extension, pathModule, namespaceDependencies);
     // Note that Liferay.ThemeDisplay.getPathContext() when called at runtime
@@ -50,3 +51,3 @@ // returns both pathProxy and the context path of the portal's webapp.
 exports.default = default_1;
-function getHref(filePath, extension, pathModule) {
+function getHref(filePath, extension, pathModule, namespaceDependencies) {
     let webContextPath;
@@ -68,11 +69,23 @@ if (project_1.default.jar.supported) {
     }
-    project_1.default.sources
-        .map(source => source.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);
+    if (filePath.startsWith(`node_modules${path_1.default.sep}`)) {
+        const pathParts = filePath.split(path_1.default.sep);
+        const projectNameIndex = lastIndexOf(pathParts, 'node_modules') + 1;
+        const { version } = read_json_sync_1.default(path_1.default.join('node_modules', pathParts[projectNameIndex], 'package.json'));
+        if (namespaceDependencies) {
+            pathParts[projectNameIndex] = `${project_1.default.pkgJson.name}$${pathParts[projectNameIndex]}`;
         }
-    });
+        pathParts[projectNameIndex] += `@${version}`;
+        filePath = pathParts.join(path_1.default.sep);
+    }
+    else {
+        // If file is inside a source folder, strip the folder name
+        for (let sourcePath of project_1.default.sources.map(source => source.asNative)) {
+            // Remove `./` from sourcePath so that it matches the filePath correctly
+            sourcePath = sourcePath.substring(2);
+            if (filePath.startsWith(sourcePath)) {
+                filePath = filePath.substring(sourcePath.length + 1);
+                break;
+            }
+        }
+    }
     if (extension !== undefined) {
@@ -90,1 +103,9 @@ const extname = path_1.default.extname(filePath);
 }
+function lastIndexOf(array, item) {
+    for (let i = array.length - 1; i >= 0; i--) {
+        if (array[i] === item) {
+            return i;
+        }
+    }
+    return -1;
+}

package.json

 {
 	"name": "liferay-npm-bundler-loader-css-loader",
-	"version": "2.17.1",
+	"version": "2.18.0",
 	"description": "A liferay-npm-bundler loader that turns CSS files into JavaScript modules that inject a <link> into the HTML when they are required.",
@@ -12,5 +12,6 @@ "main": "lib/index.js",
 	"dependencies": {
-		"liferay-npm-build-tools-common": "2.17.1"
+		"liferay-npm-build-tools-common": "2.18.0",
+		"read-json-sync": "^2.0.1"
 	},
-	"gitHead": "33e9c0c40f47bf8eb1b8b7ef497b92b36bf511e3"
+	"gitHead": "b493e109afa2c706ce5fcea79b81a54ac72578d9"
 }

src/index.js

@@ -11,2 +11,3 @@ /**
 import path from 'path';
+import readJsonSync from 'read-json-sync';
 
@@ -16,6 +17,14 @@ /**
  */
-export default function(context, {extension, pathModule = '/o'}) {
+export default function(
+	context,
+	{extension, namespaceDependencies = true, pathModule = '/o'}
+) {
 	const {filePath, log} = context;
 
-	const href = getHref(filePath, extension, pathModule);
+	const href = getHref(
+		filePath,
+		extension,
+		pathModule,
+		namespaceDependencies
+	);
 
@@ -51,3 +60,3 @@ // Note that Liferay.ThemeDisplay.getPathContext() when called at runtime
 
-function getHref(filePath, extension, pathModule) {
+function getHref(filePath, extension, pathModule, namespaceDependencies) {
 	let webContextPath;
@@ -78,5 +87,27 @@
 
-	project.sources
-		.map(source => source.asNative)
-		.forEach(sourcePath => {
+	if (filePath.startsWith(`node_modules${path.sep}`)) {
+		const pathParts = filePath.split(path.sep);
+
+		const projectNameIndex = lastIndexOf(pathParts, 'node_modules') + 1;
+
+		const {version} = readJsonSync(
+			path.join(
+				'node_modules',
+				pathParts[projectNameIndex],
+				'package.json'
+			)
+		);
+
+		if (namespaceDependencies) {
+			pathParts[
+				projectNameIndex
+			] = `${project.pkgJson.name}$${pathParts[projectNameIndex]}`;
+		}
+
+		pathParts[projectNameIndex] += `@${version}`;
+
+		filePath = pathParts.join(path.sep);
+	} else {
+		// If file is inside a source folder, strip the folder name
+		for (let sourcePath of project.sources.map(source => source.asNative)) {
 			// Remove `./` from sourcePath so that it matches the filePath correctly
@@ -87,4 +118,7 @@ sourcePath = sourcePath.substring(2);
 				filePath = filePath.substring(sourcePath.length + 1);
+
+				break;
 			}
-		});
+		}
+	}
 
@@ -108,1 +142,11 @@ if (extension !== undefined) {
 }
+
+function lastIndexOf(array, item) {
+	for (let i = array.length - 1; i >= 0; i--) {
+		if (array[i] === item) {
+			return i;
+		}
+	}
+
+	return -1;
+}

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

22409

increased by9.65%

Lines of code

352

increased by19.32%

Worsened metrics

Dependency count

2

increased by100%

Dependency changes

• + Addedread-json-sync@^2.0.1

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

• + Addedbabel-plugin-alias-modules@2.18.0(transitive)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

• - Removedbabel-plugin-alias-modules@2.17.1(transitive)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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