liferay-npm-build-tools-common - npm Package Compare versions

Comparing version 2.26.0 to 2.27.0

lib/api/loaders.d.ts

@@ -53,4 +53,2 @@ /**
     content: string;
-    /** Path to main transformed object (relative to project dir) */
-    filePath: string;
     /**
@@ -61,2 +59,4 @@ * Hash of extra objects to write (keys are paths relative to output
     extraArtifacts: object;
+    /** Path to main transformed object (relative to project dir) */
+    filePath: string;
     /** A standard plugin logger to write things to the report */
@@ -63,0 +63,0 @@ log: PluginLogger;

lib/api/manifest.d.ts

@@ -15,12 +15,12 @@ /**
 export interface Package {
-    src: PackageDescriptor;
     dest: PackageDescriptor;
     modules?: Modules;
+    src: PackageDescriptor;
 }
 /** Structure of a package descriptor in `manifest.json` files */
 export interface PackageDescriptor {
+    dir: string;
     id: string;
     name: string;
     version: string;
-    dir: string;
 }
@@ -27,0 +27,0 @@ /** Structure of a `modules` of package descriptor in `manifest.json` files */

lib/api/plugins.d.ts

@@ -13,6 +13,6 @@ /**
 export interface BabelIpcObject {
+    globalConfig: object;
     log: PluginLogger;
     manifest: Manifest;
     rootPkgJson: object;
-    globalConfig: object;
 }
@@ -19,0 +19,0 @@ /**

lib/modules.d.ts

@@ -10,8 +10,8 @@ /**
 export interface ModuleNameParts {
+    /** Module file path relative to package root (starts with /) */
+    modulePath?: string;
+    /** Package name of module */
+    pkgName: string;
     /** Scope of module (starts with at sign) */
     scope?: string;
-    /** Package name of module */
-    pkgName: string;
-    /** Module file path relative to package root (starts with /) */
-    modulePath?: string;
 }
@@ -18,0 +18,0 @@ /**

lib/plugin-logger.d.ts

@@ -9,6 +9,6 @@ /**
 export interface Message {
+    level: 'info' | 'warn' | 'error';
+    link?: string;
     source: string;
-    level: 'info' | 'warn' | 'error';
     things: any[];
-    link?: string;
 }
@@ -15,0 +15,0 @@ declare class MessageTweaker {

lib/project/index.d.ts

@@ -14,2 +14,3 @@ /**
 import { VersionInfo } from './types';
+export { ProjectType } from './probe';
 /** A package manager */
@@ -19,4 +20,4 @@ export declare type PkgManager = 'npm' | 'yarn' | null;
 export interface PresetInfo {
+    isAutopreset: boolean;
     name: string;
-    isAutopreset: boolean;
 }
@@ -23,0 +24,0 @@ /**

lib/project/index.js

@@ -10,3 +10,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Project = void 0;
+exports.Project = exports.ProjectType = void 0;
 const child_process_1 = __importDefault(require("child_process"));
@@ -28,2 +28,4 @@ const dot_prop_1 = __importDefault(require("dot-prop"));
 const transform_1 = __importDefault(require("./transform"));
+var probe_2 = require("./probe");
+Object.defineProperty(exports, "ProjectType", { enumerable: true, get: function () { return probe_2.ProjectType; } });
 /**
@@ -363,2 +365,9 @@ * Describes a standard JS Toolkit project.
         }
+        // Resolve symbolic links in toolsDir so that we may test things locally
+        while (fs_1.default.lstatSync(this._toolsDir.asNative).isSymbolicLink()) {
+            const linkTarget = fs_1.default.readlinkSync(this._toolsDir.asNative);
+            this._toolsDir = new file_path_1.default(linkTarget.startsWith('/')
+                ? linkTarget
+                : this._toolsDir.dirname().join(linkTarget).asNative);
+        }
         this._npmbundlerrc = config;
@@ -365,0 +374,0 @@ }

lib/project/rules.d.ts

@@ -13,7 +13,7 @@ /**
 export interface BundlerLoaderDescriptor {
+    exec: BundlerLoaderEntryPoint;
     loader: string;
+    metadata: BundlerLoaderMetadata;
+    options: object;
     resolvedModule: string;
-    exec: BundlerLoaderEntryPoint;
-    options: object;
-    metadata: BundlerLoaderMetadata;
 }
@@ -20,0 +20,0 @@ /**

lib/project/rules.js

@@ -64,4 +64,4 @@ "use strict";
             this._versionsInfo = resolvedModules.reduce((map, resolvedModule) => {
-                const { modulePath, pkgName } = modules_1.splitModuleName(resolvedModule);
-                const pkgJsonPath = _project.toolResolve(`${pkgName}/package.json`);
+                const { modulePath, pkgName, scope } = modules_1.splitModuleName(resolvedModule);
+                const pkgJsonPath = _project.toolResolve(`${modules_1.joinModuleName(scope, pkgName, '')}/package.json`);
                 const pkgJson = require(pkgJsonPath);
@@ -68,0 +68,0 @@ map.set(resolvedModule, {

lib/project/types.d.ts

@@ -16,4 +16,4 @@ /**
 export interface BundlerPluginDescriptor<T> {
+    config: object;
     name: string;
-    config: object;
     run: BundlerPluginEntryPoint<T>;
@@ -23,4 +23,4 @@ }
 export interface VersionInfo {
+    path: string;
     version: string;
-    path: string;
 }

package.json

@@ -7,4 +7,4 @@ {
 		"escape-string-regexp": "^2.0.0",
-		"liferay-npm-bundler-preset-standard": "2.26.0",
-		"merge": "^1.2.1",
+		"liferay-npm-bundler-preset-standard": "2.27.0",
+		"merge": "^2.1.1",
 		"properties": "^1.2.1",
@@ -26,4 +26,4 @@ "read-json-sync": "^2.0.1",
 	},
-	"version": "2.26.0",
-	"gitHead": "1b968d796b07da761cd71157562f88d07db31ace"
+	"version": "2.27.0",
+	"gitHead": "e19c5b4d5fc7c2196cc37a6e31a30afe1d2c3f74"
 }

src/api/loaders.ts

@@ -63,5 +63,2 @@ /**
 
-	/** Path to main transformed object (relative to project dir) */
-	filePath: string;
-
 	/**
@@ -73,2 +70,5 @@ * Hash of extra objects to write (keys are paths relative to output
 
+	/** Path to main transformed object (relative to project dir) */
+	filePath: string;
+
 	/** A standard plugin logger to write things to the report */
@@ -75,0 +75,0 @@ log: PluginLogger;

src/api/manifest.ts

@@ -18,5 +18,5 @@ /**
 export interface Package {
-	src: PackageDescriptor;
 	dest: PackageDescriptor;
 	modules?: Modules;
+	src: PackageDescriptor;
 }
@@ -26,6 +26,6 @@
 export interface PackageDescriptor {
+	dir: string;
 	id: string;
 	name: string;
 	version: string;
-	dir: string;
 }
@@ -32,0 +32,0 @@

src/api/plugins.ts

@@ -15,6 +15,6 @@ /**
 export interface BabelIpcObject {
+	globalConfig: object;
 	log: PluginLogger;
 	manifest: Manifest;
 	rootPkgJson: object;
-	globalConfig: object;
 }
@@ -21,0 +21,0 @@

src/modules.ts

@@ -12,4 +12,4 @@ /**
 
-	/** Scope of module (starts with at sign) */
-	scope?: string;
+	/** Module file path relative to package root (starts with /) */
+	modulePath?: string;
 
@@ -19,4 +19,4 @@ /** Package name of module */
 
-	/** Module file path relative to package root (starts with /) */
-	modulePath?: string;
+	/** Scope of module (starts with at sign) */
+	scope?: string;
 }
@@ -23,0 +23,0 @@

src/plugin-logger.ts

@@ -10,6 +10,6 @@ /**
 export interface Message {
+	level: 'info' | 'warn' | 'error';
+	link?: string;
 	source: string;
-	level: 'info' | 'warn' | 'error';
 	things: any[];
-	link?: string;
 }
@@ -16,0 +16,0 @@

src/project/index.ts

@@ -25,2 +25,4 @@ /**
 
+export {ProjectType} from './probe';
+
 /** A package manager */
@@ -31,4 +33,4 @@ export type PkgManager = 'npm' | 'yarn' | null;
 export interface PresetInfo {
+	isAutopreset: boolean;
 	name: string;
-	isAutopreset: boolean;
 }
@@ -511,2 +513,14 @@
 
+		// Resolve symbolic links in toolsDir so that we may test things locally
+
+		while (fs.lstatSync(this._toolsDir.asNative).isSymbolicLink()) {
+			const linkTarget = fs.readlinkSync(this._toolsDir.asNative);
+
+			this._toolsDir = new FilePath(
+				linkTarget.startsWith('/')
+					? linkTarget
+					: this._toolsDir.dirname().join(linkTarget).asNative
+			);
+		}
+
 		this._npmbundlerrc = config;
@@ -513,0 +527,0 @@ }

src/project/rules.ts

@@ -12,3 +12,3 @@ /**
 import FilePath from '../file-path';
-import {splitModuleName} from '../modules';
+import {joinModuleName, splitModuleName} from '../modules';
 import {VersionInfo} from './types';
@@ -20,7 +20,7 @@
 export interface BundlerLoaderDescriptor {
+	exec: BundlerLoaderEntryPoint;
 	loader: string;
+	metadata: BundlerLoaderMetadata;
+	options: object;
 	resolvedModule: string;
-	exec: BundlerLoaderEntryPoint;
-	options: object;
-	metadata: BundlerLoaderMetadata;
 }
@@ -33,5 +33,5 @@
 interface BundlerNormalizedRule {
+	exclude: RegExp[];
+	include: RegExp[];
 	test: RegExp[];
-	include: RegExp[];
-	exclude: RegExp[];
 	use: BundlerLoaderDescriptor[];
@@ -106,7 +106,7 @@ }
 				(map: Map<string, VersionInfo>, resolvedModule) => {
-					const {modulePath, pkgName} = splitModuleName(
+					const {modulePath, pkgName, scope} = splitModuleName(
 						resolvedModule
 					);
 					const pkgJsonPath = _project.toolResolve(
-						`${pkgName}/package.json`
+						`${joinModuleName(scope, pkgName, '')}/package.json`
 					);
@@ -113,0 +113,0 @@ const pkgJson = require(pkgJsonPath);

src/project/types.ts

@@ -18,4 +18,4 @@ /**
 export interface BundlerPluginDescriptor<T> {
+	config: object;
 	name: string;
-	config: object;
 	run: BundlerPluginEntryPoint<T>;
@@ -26,4 +26,4 @@ }
 export interface VersionInfo {
+	path: string;
 	version: string;
-	path: string;
 }

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

315715

increased by0.36%

Lines of code

9729

increased by0.21%

Dependency changes

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

• + Addedmerge@2.1.1(transitive)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

• - Removedmerge@1.2.1(transitive)

• Updatedliferay-npm-bundler-preset-standard@2.27.0

• Updatedmerge@^2.1.1