liferay · wincent · Oct 14, 2020 · Oct 13, 2020 · Oct 13, 2020 · Oct 13, 2020
diff --git a/projects/js-toolkit/CONTRIBUTING.md b/projects/js-toolkit/CONTRIBUTING.md
@@ -119,7 +119,7 @@ yarn ci
 # start again. Otherwise...
 
 # Change to the directory of the package you wish to publish:
-cd packages/liferay-npm-bundler
+cd packages/npm-bundler
 
 # Update the changelog:
 npx @liferay/changelog-generator --version=3.0.0
@@ -143,7 +143,7 @@ Copy the relevant section from the changelog to the corresponding entry on the [
 After the release, you can confirm that the packages are correctly listed in the NPM registry:
 
 -   https://www.npmjs.com/package/@liferay/js-toolkit-core
--   https://www.npmjs.com/package/liferay-npm-bundler
+-   https://www.npmjs.com/package/@liferay/npm-bundler
 
 ## Releasing pre-release versions
 

diff --git a/projects/js-toolkit/packages/generator-js/src/adapt/index.ts b/projects/js-toolkit/packages/generator-js/src/adapt/index.ts
@@ -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}`,

diff --git a/projects/js-toolkit/packages/generator-js/src/facet-project/index.ts b/projects/js-toolkit/packages/generator-js/src/facet-project/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'
 			),

diff --git a/projects/js-toolkit/packages/generator-js/src/facet-project/templates/package.json.ejs b/projects/js-toolkit/packages/generator-js/src/facet-project/templates/package.json.ejs
@@ -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": {},

diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts
@@ -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')
 		) {

diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/project/Project.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Project.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

diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.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'
 						),
 					},
 				],

diff --git a/projects/js-toolkit/packages/js-toolkit-scripts/src/scripts/create-jar/index.ts b/projects/js-toolkit/packages/js-toolkit-scripts/src/scripts/create-jar/index.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`;

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/.yarnrc b/projects/js-toolkit/packages/liferay-npm-bundler/.yarnrc
diff --git a/projects/js-toolkit/packages/npm-bundler/.yarnrc b/projects/js-toolkit/packages/npm-bundler/.yarnrc
@@ -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"
diff --git a/...packages/liferay-npm-bundler/CHANGELOG.md → ...toolkit/packages/npm-bundler/CHANGELOG.md b/...packages/liferay-npm-bundler/CHANGELOG.md → ...toolkit/packages/npm-bundler/CHANGELOG.md
diff --git a/...it/packages/liferay-npm-bundler/README.md → ...js-toolkit/packages/npm-bundler/README.md b/...it/packages/liferay-npm-bundler/README.md → ...js-toolkit/packages/npm-bundler/README.md
@@ -1,3 +1,3 @@
-# liferay-npm-bundler
+# @liferay/npm-bundler
 
 A tool to process a Liferay widget project to produce an OSGi bundle containing the needed npm dependencies so that it can be run when deployed to the Portal.
diff --git a/...ay-npm-bundler/bin/liferay-npm-bundler.js → ...es/npm-bundler/bin/liferay-npm-bundler.js b/...ay-npm-bundler/bin/liferay-npm-bundler.js → ...es/npm-bundler/bin/liferay-npm-bundler.js
diff --git a/...packages/liferay-npm-bundler/package.json → ...toolkit/packages/npm-bundler/package.json b/...packages/liferay-npm-bundler/package.json → ...toolkit/packages/npm-bundler/package.json
@@ -23,9 +23,9 @@
 	"description": "A CLI utility to bundle NPM dependencies of a Liferay OSGi bundle.",
 	"license": "LGPL-3.0",
 	"main": "lib/index.js",
-	"name": "liferay-npm-bundler",
+	"name": "@liferay/npm-bundler",
 	"repository": {
-		"directory": "projects/js-toolkit/packages/liferay-npm-bundler",
+		"directory": "projects/js-toolkit/packages/npm-bundler",
 		"type": "git",
 		"url": "https://github.com/liferay/liferay-frontend-projects.git"
 	},

diff --git a/...pm-bundler/src/adapt/angular-cli/index.ts → ...pm-bundler/src/adapt/angular-cli/index.ts b/...pm-bundler/src/adapt/angular-cli/index.ts → ...pm-bundler/src/adapt/angular-cli/index.ts
diff --git a/...apt/angular-cli/templates/adapt-rt.js.ejs → ...apt/angular-cli/templates/adapt-rt.js.ejs b/...apt/angular-cli/templates/adapt-rt.js.ejs → ...apt/angular-cli/templates/adapt-rt.js.ejs
diff --git a/...adapt/angular-cli/tweakAttachmentToDOM.ts → ...adapt/angular-cli/tweakAttachmentToDOM.ts b/...adapt/angular-cli/tweakAttachmentToDOM.ts → ...adapt/angular-cli/tweakAttachmentToDOM.ts
diff --git a/...undler/src/adapt/bundler-project/index.ts → ...undler/src/adapt/bundler-project/index.ts b/...undler/src/adapt/bundler-project/index.ts → ...undler/src/adapt/bundler-project/index.ts
diff --git a/...pt/bundler-project/replaceWebpackJsonp.ts → ...pt/bundler-project/replaceWebpackJsonp.ts b/...pt/bundler-project/replaceWebpackJsonp.ts → ...pt/bundler-project/replaceWebpackJsonp.ts
diff --git a/...t/bundler-project/write-export-modules.ts → ...t/bundler-project/write-export-modules.ts b/...t/bundler-project/write-export-modules.ts → ...t/bundler-project/write-export-modules.ts
diff --git a/...ndler/src/adapt/create-react-app/index.ts → ...ndler/src/adapt/create-react-app/index.ts b/...ndler/src/adapt/create-react-app/index.ts → ...ndler/src/adapt/create-react-app/index.ts
diff --git a/...reate-react-app/templates/adapt-rt.js.ejs → ...reate-react-app/templates/adapt-rt.js.ejs b/...reate-react-app/templates/adapt-rt.js.ejs → ...reate-react-app/templates/adapt-rt.js.ejs
diff --git a/.../create-react-app/tweakAttachmentToDOM.ts → .../create-react-app/tweakAttachmentToDOM.ts b/.../create-react-app/tweakAttachmentToDOM.ts → .../create-react-app/tweakAttachmentToDOM.ts
diff --git a/...es/liferay-npm-bundler/src/adapt/index.ts → ...t/packages/npm-bundler/src/adapt/index.ts b/...es/liferay-npm-bundler/src/adapt/index.ts → ...t/packages/npm-bundler/src/adapt/index.ts
diff --git a/...ndler/src/adapt/liferay-fragment/index.ts → ...ndler/src/adapt/liferay-fragment/index.ts b/...ndler/src/adapt/liferay-fragment/index.ts → ...ndler/src/adapt/liferay-fragment/index.ts
diff --git a/...ler/src/adapt/templates/export-module.ejs → ...ler/src/adapt/templates/export-module.ejs b/...ler/src/adapt/templates/export-module.ejs → ...ler/src/adapt/templates/export-module.ejs
diff --git a/...-bundler/src/adapt/templates/index.js.ejs → ...-bundler/src/adapt/templates/index.js.ejs b/...-bundler/src/adapt/templates/index.js.ejs → ...-bundler/src/adapt/templates/index.js.ejs
diff --git a/...r/src/adapt/templates/manifest-module.ejs → ...r/src/adapt/templates/manifest-module.ejs b/...r/src/adapt/templates/manifest-module.ejs → ...r/src/adapt/templates/manifest-module.ejs
diff --git a/...-npm-bundler/src/bundle/ExplainedError.ts → .../npm-bundler/src/bundle/ExplainedError.ts b/...-npm-bundler/src/bundle/ExplainedError.ts → .../npm-bundler/src/bundle/ExplainedError.ts
diff --git a/...feray-npm-bundler/src/bundle/configure.ts → ...kages/npm-bundler/src/bundle/configure.ts b/...feray-npm-bundler/src/bundle/configure.ts → ...kages/npm-bundler/src/bundle/configure.ts
diff --git a/...s/liferay-npm-bundler/src/bundle/index.ts → .../packages/npm-bundler/src/bundle/index.ts b/...s/liferay-npm-bundler/src/bundle/index.ts → .../packages/npm-bundler/src/bundle/index.ts
diff --git a/...ckages/liferay-npm-bundler/src/globals.ts → ...olkit/packages/npm-bundler/src/globals.ts b/...ckages/liferay-npm-bundler/src/globals.ts → ...olkit/packages/npm-bundler/src/globals.ts
diff --git a/...packages/liferay-npm-bundler/src/index.ts → ...toolkit/packages/npm-bundler/src/index.ts b/...packages/liferay-npm-bundler/src/index.ts → ...toolkit/packages/npm-bundler/src/index.ts
@@ -15,7 +15,7 @@ import report from './report';
 import abort from './util/abort';
 import * as log from './util/log';
 
-/** Default entry point for the liferay-npm-bundler */
+/** Default entry point for the liferay-npm-bundler executable. */
 export default async function (argv: {version: boolean}): Promise<void> {
 	if (argv.version) {
 		const {versionsInfo} = project;

diff --git a/...bundler/src/liferay-npm-bundler.config.ts → ...bundler/src/liferay-npm-bundler.config.ts b/...bundler/src/liferay-npm-bundler.config.ts → ...bundler/src/liferay-npm-bundler.config.ts
diff --git a/..._tests__/__snapshots__/index.test.ts.snap → ..._tests__/__snapshots__/index.test.ts.snap b/..._tests__/__snapshots__/index.test.ts.snap → ..._tests__/__snapshots__/index.test.ts.snap
diff --git a/...undler/src/report/__tests__/index.test.ts → ...undler/src/report/__tests__/index.test.ts b/...undler/src/report/__tests__/index.test.ts → ...undler/src/report/__tests__/index.test.ts
diff --git a/...es/liferay-npm-bundler/src/report/html.ts → ...t/packages/npm-bundler/src/report/html.ts b/...es/liferay-npm-bundler/src/report/html.ts → ...t/packages/npm-bundler/src/report/html.ts
diff --git a/...s/liferay-npm-bundler/src/report/index.ts → .../packages/npm-bundler/src/report/index.ts b/...s/liferay-npm-bundler/src/report/index.ts → .../packages/npm-bundler/src/report/index.ts
diff --git a/.../liferay-npm-bundler/src/report/logger.ts → ...packages/npm-bundler/src/report/logger.ts b/.../liferay-npm-bundler/src/report/logger.ts → ...packages/npm-bundler/src/report/logger.ts
diff --git a/.../js/operation/adaptStaticURLsAtRuntime.ts → .../js/operation/adaptStaticURLsAtRuntime.ts b/.../js/operation/adaptStaticURLsAtRuntime.ts → .../js/operation/adaptStaticURLsAtRuntime.ts
diff --git a/...rm/js/operation/exportModuleAsFunction.ts → ...rm/js/operation/exportModuleAsFunction.ts b/...rm/js/operation/exportModuleAsFunction.ts → ...rm/js/operation/exportModuleAsFunction.ts
diff --git a/...orm/js/operation/namespaceWepbackJsonp.ts → ...orm/js/operation/namespaceWepbackJsonp.ts b/...orm/js/operation/namespaceWepbackJsonp.ts → ...orm/js/operation/namespaceWepbackJsonp.ts
diff --git a/...ransform/js/operation/transformImports.ts → ...ransform/js/operation/transformImports.ts b/...ransform/js/operation/transformImports.ts → ...ransform/js/operation/transformImports.ts
diff --git a/.../text/operation/__tests__/replace.test.ts → .../text/operation/__tests__/replace.test.ts b/.../text/operation/__tests__/replace.test.ts → .../text/operation/__tests__/replace.test.ts
diff --git a/...r/src/transform/text/operation/replace.ts → ...r/src/transform/text/operation/replace.ts b/...r/src/transform/text/operation/replace.ts → ...r/src/transform/text/operation/replace.ts
diff --git a/...ges/liferay-npm-bundler/src/util/abort.ts → ...it/packages/npm-bundler/src/util/abort.ts b/...ges/liferay-npm-bundler/src/util/abort.ts → ...it/packages/npm-bundler/src/util/abort.ts
diff --git a/...ges/liferay-npm-bundler/src/util/files.ts → ...it/packages/npm-bundler/src/util/files.ts b/...ges/liferay-npm-bundler/src/util/files.ts → ...it/packages/npm-bundler/src/util/files.ts
diff --git a/...kages/liferay-npm-bundler/src/util/log.ts → ...lkit/packages/npm-bundler/src/util/log.ts b/...kages/liferay-npm-bundler/src/util/log.ts → ...lkit/packages/npm-bundler/src/util/log.ts
diff --git a/.../liferay-npm-bundler/src/util/renderer.ts → ...packages/npm-bundler/src/util/renderer.ts b/.../liferay-npm-bundler/src/util/renderer.ts → ...packages/npm-bundler/src/util/renderer.ts
diff --git a/...kages/liferay-npm-bundler/src/util/run.ts → ...lkit/packages/npm-bundler/src/util/run.ts b/...kages/liferay-npm-bundler/src/util/run.ts → ...lkit/packages/npm-bundler/src/util/run.ts
diff --git a/...dler/src/webpack/loader/imports-loader.ts → ...dler/src/webpack/loader/imports-loader.ts b/...dler/src/webpack/loader/imports-loader.ts → ...dler/src/webpack/loader/imports-loader.ts
diff --git a/...ackages/liferay-npm-bundler/tsconfig.json → ...oolkit/packages/npm-bundler/tsconfig.json b/...ackages/liferay-npm-bundler/tsconfig.json → ...oolkit/packages/npm-bundler/tsconfig.json
diff --git a/projects/js-toolkit/qa/samples/packages/react-app/package.json b/projects/js-toolkit/qa/samples/packages/react-app/package.json
@@ -34,8 +34,8 @@
 		]
 	},
 	"devDependencies": {
+		"@liferay/npm-bundler": "^3.0.0",
 		"liferay-npm-build-support": "^3.0.0",
-		"liferay-npm-bundler": "^3.0.0",
 		"liferay-npm-bundler-preset-create-react-app": "^3.0.0"
 	},
 	"portlet": {

diff --git a/projects/js-toolkit/scripts/qa/resources.js b/projects/js-toolkit/scripts/qa/resources.js
@@ -17,7 +17,8 @@ const {version: currentSDKVersion} = require(path.join(
 	'..',
 	'..',
 	'packages',
-	'liferay-npm-bundler',
+	'@liferay',
+	'npm-bundler',
 	'package.json'
 ));