Merge pull request #154 from liferay/wincent/scope/npm-bundler

chore(js-toolkit): move liferay-npm-bundler (v3.x) to @liferay/npm-bundler

Author: wincent

projects/js-toolkit/CONTRIBUTING.md

@@ -291,8 +291,8 @@ export default class extends Generator {
 			getSDKVersion('liferay-npm-build-support', {ignoreConfig: true})
 		);
 		pkgJson.addDevDependency(
-			'liferay-npm-bundler',
-			getSDKVersion('liferay-npm-bundler', {ignoreConfig: true})
+			'@liferay/npm-bundler',
+			getSDKVersion('@liferay/npm-bundler', {ignoreConfig: true})
 		);
 		pkgJson.addDevDependency(
 			`liferay-npm-bundler-preset-${preset}`,

projects/js-toolkit/packages/generator-js/src/adapt/index.ts

@@ -49,7 +49,9 @@ export default class extends Generator {
 		const cp = new Copier(this);
 
 		const context = {
-			liferayNpmBuildSupportVersion: getSDKVersion('liferay-npm-bundler'),
+			liferayNpmBuildSupportVersion: getSDKVersion(
+				'@liferay/npm-bundler'
+			),
 			liferayNpmBundlerVersion: getSDKVersion(
 				'liferay-npm-build-support'
 			),

projects/js-toolkit/packages/generator-js/src/facet-project/index.ts

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "<%= description %>",
   "devDependencies": {
-    "liferay-npm-bundler": "<%= liferayNpmBundlerVersion %>",
+    "@liferay/npm-bundler": "<%= liferayNpmBundlerVersion %>",
     "liferay-npm-build-support": "<%= liferayNpmBuildSupportVersion %>"
   },
   "dependencies": {},

projects/js-toolkit/packages/generator-js/src/facet-project/templates/package.json.ejs

@@ -42,11 +42,11 @@ export default class Probe {
 			return ProjectType.LIFERAY_FRAGMENT;
 		}
 
-		// This must go last, as all other types have liferay-npm-bundler as
-		// dependency
+		// This must go last, as all other types have (or may have)
+		// @liferay/npm-bundler as dependency.
 
 		if (
-			this._hasDependency('liferay-npm-bundler') ||
+			this._hasDependency('@liferay/npm-bundler') ||
 			this._hasDependency('@liferay/js-toolkit-scripts') ||
 			this._hasScriptCalling('js-toolkit')
 		) {

projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts

@@ -330,7 +330,7 @@ export default class Project {
 
 			// Get bundler and me versions
 
-			putInMap('liferay-npm-bundler');
+			putInMap('@liferay/npm-bundler');
 			putInMap(path.join(__dirname, '../..'));
 
 			// Get preset version

projects/js-toolkit/packages/js-toolkit-core/src/project/Project.ts

@@ -372,9 +372,9 @@ describe('project.versionsInfo', () => {
 					},
 				],
 				[
-					'liferay-npm-bundler',
+					'@liferay/npm-bundler',
 					{
-						version: require(`../../../../../../../node_modules/liferay-npm-bundler/package.json`)
+						version: require(`../../../../../../../node_modules/@liferay/npm-bundler/package.json`)
 							.version,
 						path: path.join(
 							'..',
@@ -388,7 +388,8 @@ describe('project.versionsInfo', () => {
 							'..',
 							'..',
 							'node_modules',
-							'liferay-npm-bundler'
+							'@liferay',
+							'npm-bundler'
 						),
 					},
 				],

projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.ts

@@ -116,7 +116,7 @@ function addLocalizationFiles(zip: JSZip): void {
 function addManifest(zip: JSZip): void {
 	let contents = '';
 
-	const bundlerVersion = project.versionsInfo.get('liferay-npm-bundler')
+	const bundlerVersion = project.versionsInfo.get('@liferay/npm-bundler')
 		.version;
 
 	contents += `Manifest-Version: 1.0\n`;

projects/js-toolkit/packages/js-toolkit-scripts/src/scripts/create-jar/index.ts

@@ -0,0 +1,3 @@
+# Make `yarn version` produce the right commit message and tag for this package.
+version-tag-prefix "npm-bundler/v"
+version-git-message "chore: prepare @liferay/npm-bundler v%s release"