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

Comparing version 2.24.1 to 2.24.2

lib/index.js

@@ -6,2 +6,21 @@ "use strict";
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
@@ -13,2 +32,3 @@ return (mod && mod.__esModule) ? mod : { "default": mod };
 const file_path_1 = __importDefault(require("liferay-npm-build-tools-common/lib/file-path"));
+const ns = __importStar(require("liferay-npm-build-tools-common/lib/namespace"));
 const project_1 = __importDefault(require("liferay-npm-build-tools-common/lib/project"));
@@ -71,8 +91,15 @@ const path_1 = __importDefault(require("path"));
         const projectNameIndex = lastIndexOf(pathParts, 'node_modules') + 1;
-        const { version } = read_json_sync_1.default(path_1.default.join(...pathParts.slice(0, projectNameIndex), pathParts[projectNameIndex], 'package.json'));
+        let projectName = pathParts[projectNameIndex];
+        let projectFilePathParts = pathParts.slice(projectNameIndex + 1);
+        if (projectName.startsWith('@')) {
+            projectName = path_1.default.join(projectName, pathParts[projectNameIndex + 1]);
+            projectFilePathParts = projectFilePathParts.slice(1);
+        }
+        const { version } = read_json_sync_1.default(path_1.default.join(...pathParts.slice(0, projectNameIndex), projectName, 'package.json'));
+        let namespacedProjectName = projectName;
         if (namespaceDependencies) {
-            pathParts[projectNameIndex] = `${project_1.default.pkgJson.name}$${pathParts[projectNameIndex]}`;
+            namespacedProjectName = ns.addNamespace(projectName, project_1.default.pkgJson);
         }
-        pathParts[projectNameIndex] += `@${version}`;
-        filePath = path_1.default.join('node_modules', ...pathParts.slice(projectNameIndex));
+        namespacedProjectName += `@${version}`;
+        filePath = path_1.default.join('node_modules', namespacedProjectName, ...projectFilePathParts);
     }
@@ -79,0 +106,0 @@ else {

package.json

 {
 	"author": "Liferay Frontend Infrastructure Team <[e-mail]>",
 	"dependencies": {
-		"liferay-npm-build-tools-common": "2.24.1",
+		"liferay-npm-build-tools-common": "2.24.2",
 		"read-json-sync": "^2.0.1"
@@ -20,4 +20,4 @@ },
 	},
-	"version": "2.24.1",
-	"gitHead": "6c660327f112f62d4acb4a3ac9f592e22e6e4060"
+	"version": "2.24.2",
+	"gitHead": "ab0d522bd9736308380ab2c3757d318ee95d3701"
 }

src/index.js

@@ -8,2 +8,3 @@ /**
 import FilePath from 'liferay-npm-build-tools-common/lib/file-path';
+import * as ns from 'liferay-npm-build-tools-common/lib/namespace';
 import project from 'liferay-npm-build-tools-common/lib/project';
@@ -91,6 +92,17 @@ import path from 'path';
 
+		let projectName = pathParts[projectNameIndex];
+		let projectFilePathParts = pathParts.slice(projectNameIndex + 1);
+
+		if (projectName.startsWith('@')) {
+			projectName = path.join(
+				projectName,
+				pathParts[projectNameIndex + 1]
+			);
+			projectFilePathParts = projectFilePathParts.slice(1);
+		}
+
 		const {version} = readJsonSync(
 			path.join(
 				...pathParts.slice(0, projectNameIndex),
-				pathParts[projectNameIndex],
+				projectName,
 				'package.json'
@@ -100,13 +112,17 @@ )
 
+		let namespacedProjectName = projectName;
+
 		if (namespaceDependencies) {
-			pathParts[
-				projectNameIndex
-			] = `${project.pkgJson.name}$${pathParts[projectNameIndex]}`;
+			namespacedProjectName = ns.addNamespace(
+				projectName,
+				project.pkgJson
+			);
 		}
 
-		pathParts[projectNameIndex] += `@${version}`;
+		namespacedProjectName += `@${version}`;
 
 		filePath = path.join(
 			'node_modules',
-			...pathParts.slice(projectNameIndex)
+			namespacedProjectName,
+			...projectFilePathParts
 		);
@@ -113,0 +129,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

17393

increased by10.8%

Lines of code

397

increased by11.2%

Dependency changes

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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