Merge pull request #150 from liferay/wincent/scope/js-toolkit-core

chore(js-toolkit): move liferay-js-toolkit-core (v3.x) to @liferay/js-toolkit-core
liferay · Oct 14, 2020 · a59badd · a59badd
2 parents 542e42c + 9ebcea8
commit a59badd
Show file tree

Hide file tree

Showing 140 changed files with 153 additions and 64 deletions.
diff --git a/projects/js-toolkit/CONTRIBUTING.md b/projects/js-toolkit/CONTRIBUTING.md
@@ -142,7 +142,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/js-toolkit-core
 -   https://www.npmjs.com/package/liferay-npm-bundler
 
 ## Releasing pre-release versions

diff --git a/projects/js-toolkit/packages/generator-liferay-js/package.json b/projects/js-toolkit/packages/generator-liferay-js/package.json
@@ -1,9 +1,9 @@
 {
 	"author": "Liferay Frontend Infrastructure Team <pt-frontend-infrastructure@liferay.com>",
 	"dependencies": {
+		"@liferay/js-toolkit-core": "3.0.0-alpha.2",
 		"dot-prop": "^5.0.1",
 		"fs-extra": "^8.1.0",
-		"liferay-js-toolkit-core": "3.0.0-alpha.2",
 		"read-json-sync": "^2.0.1",
 		"yargs": "^14.0.0",
 		"yeoman-generator": "^3.2.0"

diff --git a/projects/js-toolkit/packages/generator-liferay-js/src/adapt/index.ts b/projects/js-toolkit/packages/generator-liferay-js/src/adapt/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {Project, ProjectType, format} from 'liferay-js-toolkit-core';
+import {Project, ProjectType, format} from '@liferay/js-toolkit-core';
 import path from 'path';
 import {argv} from 'yargs';
 import Generator from 'yeoman-generator';

diff --git a/projects/js-toolkit/packages/generator-liferay-js/src/utils/ProjectAnalyzer.ts b/projects/js-toolkit/packages/generator-liferay-js/src/utils/ProjectAnalyzer.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {PkgJson} from '@liferay/js-toolkit-core';
 import prop from 'dot-prop';
-import {PkgJson} from 'liferay-js-toolkit-core';
 import path from 'path';
 
 import {DEFAULT_CONFIGURATION} from '../facet-configuration/constants';

diff --git a/projects/js-toolkit/packages/generator-liferay-js/tsconfig.json b/projects/js-toolkit/packages/generator-liferay-js/tsconfig.json
@@ -7,5 +7,5 @@
 		"rootDir": "./src"
 	},
 	"include": ["src/**/*", "src/**/*.json"],
-	"references": [{"path": "../liferay-js-toolkit-core"}]
+	"references": [{"path": "../js-toolkit-core"}]
 }
diff --git a/projects/js-toolkit/packages/js-toolkit-core/.yarnrc b/projects/js-toolkit/packages/js-toolkit-core/.yarnrc
@@ -0,0 +1,3 @@
+# Make `yarn version` produce the right commit message and tag for this package.
+version-tag-prefix "js-toolkit-core/v"
+version-git-message "chore: prepare @liferay/js-toolkit-core v%s release"
diff --git a/...ages/liferay-js-toolkit-core/CHANGELOG.md → ...kit/packages/js-toolkit-core/CHANGELOG.md b/...ages/liferay-js-toolkit-core/CHANGELOG.md → ...kit/packages/js-toolkit-core/CHANGELOG.md
diff --git a/...ages/liferay-js-toolkit-core/package.json → ...kit/packages/js-toolkit-core/package.json b/...ages/liferay-js-toolkit-core/package.json → ...kit/packages/js-toolkit-core/package.json
@@ -18,9 +18,9 @@
 	"description": "Utility library for Liferay NPM Build Tools.",
 	"license": "LGPL-3.0",
 	"main": "lib/index.js",
-	"name": "liferay-js-toolkit-core",
+	"name": "@liferay/js-toolkit-core",
 	"repository": {
-		"directory": "projects/js-toolkit/packages/liferay-js-toolkit-core",
+		"directory": "projects/js-toolkit/packages/js-toolkit-core",
 		"type": "git",
 		"url": "https://github.com/liferay/liferay-frontend-projects.git"
 	},

diff --git a/...-toolkit-core/src/__tests__/globs.test.ts → ...-toolkit-core/src/__tests__/globs.test.ts b/...-toolkit-core/src/__tests__/globs.test.ts → ...-toolkit-core/src/__tests__/globs.test.ts
diff --git a/...ay-js-toolkit-core/src/bundler/PkgDesc.ts → ...es/js-toolkit-core/src/bundler/PkgDesc.ts b/...ay-js-toolkit-core/src/bundler/PkgDesc.ts → ...es/js-toolkit-core/src/bundler/PkgDesc.ts
diff --git a/...ore/src/bundler/__tests__/PkgDesc.test.ts → ...ore/src/bundler/__tests__/PkgDesc.test.ts b/...ore/src/bundler/__tests__/PkgDesc.test.ts → ...ore/src/bundler/__tests__/PkgDesc.test.ts
diff --git a/...js-toolkit-core/src/escapeStringRegExp.ts → ...js-toolkit-core/src/escapeStringRegExp.ts b/...js-toolkit-core/src/escapeStringRegExp.ts → ...js-toolkit-core/src/escapeStringRegExp.ts
diff --git a/...eray-js-toolkit-core/src/file/FilePath.ts → ...ages/js-toolkit-core/src/file/FilePath.ts b/...eray-js-toolkit-core/src/file/FilePath.ts → ...ages/js-toolkit-core/src/file/FilePath.ts
diff --git a/...-core/src/file/__tests__/FilePath.test.ts → ...-core/src/file/__tests__/FilePath.test.ts b/...-core/src/file/__tests__/FilePath.test.ts → ...-core/src/file/__tests__/FilePath.test.ts
diff --git a/...toolkit-core/src/file/handler/Manifest.ts → ...toolkit-core/src/file/handler/Manifest.ts b/...toolkit-core/src/file/handler/Manifest.ts → ...toolkit-core/src/file/handler/Manifest.ts
diff --git a/...c/file/handler/__tests__/Manifest.test.ts → ...c/file/handler/__tests__/Manifest.test.ts b/...c/file/handler/__tests__/Manifest.test.ts → ...c/file/handler/__tests__/Manifest.test.ts
diff --git a/...sts__/__snapshots__/Manifest.test.ts.snap → ...sts__/__snapshots__/Manifest.test.ts.snap b/...sts__/__snapshots__/Manifest.test.ts.snap → ...sts__/__snapshots__/Manifest.test.ts.snap
diff --git a/...ges/liferay-js-toolkit-core/src/format.ts → ...it/packages/js-toolkit-core/src/format.ts b/...ges/liferay-js-toolkit-core/src/format.ts → ...it/packages/js-toolkit-core/src/format.ts
diff --git a/...ages/liferay-js-toolkit-core/src/globs.ts → ...kit/packages/js-toolkit-core/src/globs.ts b/...ages/liferay-js-toolkit-core/src/globs.ts → ...kit/packages/js-toolkit-core/src/globs.ts
diff --git a/...ages/liferay-js-toolkit-core/src/index.ts → ...kit/packages/js-toolkit-core/src/index.ts b/...ages/liferay-js-toolkit-core/src/index.ts → ...kit/packages/js-toolkit-core/src/index.ts
diff --git a/...t-core/src/node/__tests__/modules.test.ts → ...t-core/src/node/__tests__/modules.test.ts b/...t-core/src/node/__tests__/modules.test.ts → ...t-core/src/node/__tests__/modules.test.ts
diff --git a/...core/src/node/__tests__/namespace.test.ts → ...core/src/node/__tests__/namespace.test.ts b/...core/src/node/__tests__/namespace.test.ts → ...core/src/node/__tests__/namespace.test.ts
diff --git a/...feray-js-toolkit-core/src/node/modules.ts → ...kages/js-toolkit-core/src/node/modules.ts b/...feray-js-toolkit-core/src/node/modules.ts → ...kages/js-toolkit-core/src/node/modules.ts
diff --git a/...ray-js-toolkit-core/src/node/namespace.ts → ...ges/js-toolkit-core/src/node/namespace.ts b/...ray-js-toolkit-core/src/node/namespace.ts → ...ges/js-toolkit-core/src/node/namespace.ts
diff --git a/...eray-js-toolkit-core/src/project/Adapt.ts → ...ages/js-toolkit-core/src/project/Adapt.ts b/...eray-js-toolkit-core/src/project/Adapt.ts → ...ages/js-toolkit-core/src/project/Adapt.ts
diff --git a/...iferay-js-toolkit-core/src/project/Jar.ts → ...ckages/js-toolkit-core/src/project/Jar.ts b/...iferay-js-toolkit-core/src/project/Jar.ts → ...ckages/js-toolkit-core/src/project/Jar.ts
diff --git a/...-toolkit-core/src/project/Localization.ts → ...-toolkit-core/src/project/Localization.ts b/...-toolkit-core/src/project/Localization.ts → ...-toolkit-core/src/project/Localization.ts
diff --git a/...feray-js-toolkit-core/src/project/Misc.ts → ...kages/js-toolkit-core/src/project/Misc.ts b/...feray-js-toolkit-core/src/project/Misc.ts → ...kages/js-toolkit-core/src/project/Misc.ts
diff --git a/...eray-js-toolkit-core/src/project/Probe.ts → ...ages/js-toolkit-core/src/project/Probe.ts b/...eray-js-toolkit-core/src/project/Probe.ts → ...ages/js-toolkit-core/src/project/Probe.ts
diff --git a/...ay-js-toolkit-core/src/project/Project.ts → ...es/js-toolkit-core/src/project/Project.ts b/...ay-js-toolkit-core/src/project/Project.ts → ...es/js-toolkit-core/src/project/Project.ts
diff --git a/...s-toolkit-core/src/project/VersionInfo.ts → ...s-toolkit-core/src/project/VersionInfo.ts b/...s-toolkit-core/src/project/VersionInfo.ts → ...s-toolkit-core/src/project/VersionInfo.ts
diff --git a/...ore/src/project/__tests__/Project.test.ts → ...ore/src/project/__tests__/Project.test.ts b/...ore/src/project/__tests__/Project.test.ts → ...ore/src/project/__tests__/Project.test.ts
@@ -365,7 +365,7 @@ describe('project.versionsInfo', () => {
 		expect(versions).toEqual(
 			new Map([
 				[
-					'liferay-js-toolkit-core',
+					'@liferay/js-toolkit-core',
 					{
 						version: require('../../../package.json').version,
 						path: path.join('..', '..', '..', '..', '..', '..'),

diff --git a/...features/localization/Language.properties → ...features/localization/Language.properties b/...features/localization/Language.properties → ...features/localization/Language.properties
diff --git a/...lt-features/liferay-npm-bundler.config.js → ...lt-features/liferay-npm-bundler.config.js b/...lt-features/liferay-npm-bundler.config.js → ...lt-features/liferay-npm-bundler.config.js
diff --git a/..._fixtures__/default-features/package.json → ..._fixtures__/default-features/package.json b/..._fixtures__/default-features/package.json → ..._fixtures__/default-features/package.json
diff --git a/...ures__/pkg-manager/both/package-lock.json → ...ures__/pkg-manager/both/package-lock.json b/...ures__/pkg-manager/both/package-lock.json → ...ures__/pkg-manager/both/package-lock.json
diff --git a/..._fixtures__/pkg-manager/both/package.json → ..._fixtures__/pkg-manager/both/package.json b/..._fixtures__/pkg-manager/both/package.json → ..._fixtures__/pkg-manager/both/package.json
diff --git a/..._/__fixtures__/pkg-manager/both/yarn.lock → ..._/__fixtures__/pkg-manager/both/yarn.lock b/..._/__fixtures__/pkg-manager/both/yarn.lock → ..._/__fixtures__/pkg-manager/both/yarn.lock
diff --git a/..._fixtures__/pkg-manager/none/package.json → ..._fixtures__/pkg-manager/none/package.json b/..._fixtures__/pkg-manager/none/package.json → ..._fixtures__/pkg-manager/none/package.json
diff --git a/...tures__/pkg-manager/npm/package-lock.json → ...tures__/pkg-manager/npm/package-lock.json b/...tures__/pkg-manager/npm/package-lock.json → ...tures__/pkg-manager/npm/package-lock.json
diff --git a/...__fixtures__/pkg-manager/npm/package.json → ...__fixtures__/pkg-manager/npm/package.json b/...__fixtures__/pkg-manager/npm/package.json → ...__fixtures__/pkg-manager/npm/package.json
diff --git a/..._fixtures__/pkg-manager/yarn/package.json → ..._fixtures__/pkg-manager/yarn/package.json b/..._fixtures__/pkg-manager/yarn/package.json → ..._fixtures__/pkg-manager/yarn/package.json
diff --git a/..._/__fixtures__/pkg-manager/yarn/yarn.lock → ..._/__fixtures__/pkg-manager/yarn/yarn.lock b/..._/__fixtures__/pkg-manager/yarn/yarn.lock → ..._/__fixtures__/pkg-manager/yarn/yarn.lock
diff --git a/...-create-jar/liferay-npm-bundler.config.js → ...-create-jar/liferay-npm-bundler.config.js b/...-create-jar/liferay-npm-bundler.config.js → ...-create-jar/liferay-npm-bundler.config.js
diff --git a/...es__/project/bool-create-jar/package.json → ...es__/project/bool-create-jar/package.json b/...es__/project/bool-create-jar/package.json → ...es__/project/bool-create-jar/package.json
diff --git a/...ith-portlet/liferay-npm-bundler.config.js → ...ith-portlet/liferay-npm-bundler.config.js b/...ith-portlet/liferay-npm-bundler.config.js → ...ith-portlet/liferay-npm-bundler.config.js
diff --git a/.../create-jar-off-with-portlet/package.json → .../create-jar-off-with-portlet/package.json b/.../create-jar-off-with-portlet/package.json → .../create-jar-off-with-portlet/package.json
diff --git a/..._/project/empty-with-portlet/package.json → ..._/project/empty-with-portlet/package.json b/..._/project/empty-with-portlet/package.json → ..._/project/empty-with-portlet/package.json
diff --git a/..._/__fixtures__/project/empty/package.json → ..._/__fixtures__/project/empty/package.json b/..._/__fixtures__/project/empty/package.json → ..._/__fixtures__/project/empty/package.json
diff --git a/...-create-jar/liferay-npm-bundler.config.js → ...-create-jar/liferay-npm-bundler.config.js b/...-create-jar/liferay-npm-bundler.config.js → ...-create-jar/liferay-npm-bundler.config.js
diff --git a/...s__/project/false-create-jar/package.json → ...s__/project/false-create-jar/package.json b/...s__/project/false-create-jar/package.json → ...s__/project/false-create-jar/package.json
diff --git a/...features/localization/Language.properties → ...features/localization/Language.properties b/...features/localization/Language.properties → ...features/localization/Language.properties
diff --git a/...es/localization/Language_es_ES.properties → ...es/localization/Language_es_ES.properties b/...es/localization/Language_es_ES.properties → ...es/localization/Language_es_ES.properties
diff --git a/..._/project/standard/features/manifest.json → ..._/project/standard/features/manifest.json b/..._/project/standard/features/manifest.json → ..._/project/standard/features/manifest.json
diff --git a/...ct/standard/liferay-npm-bundler.config.js → ...ct/standard/liferay-npm-bundler.config.js b/...ct/standard/liferay-npm-bundler.config.js → ...ct/standard/liferay-npm-bundler.config.js
diff --git a/..._fixtures__/project/standard/package.json → ..._fixtures__/project/standard/package.json b/..._fixtures__/project/standard/package.json → ..._fixtures__/project/standard/package.json
diff --git a/...rsions-info/liferay-npm-bundler.config.js → ...rsions-info/liferay-npm-bundler.config.js b/...rsions-info/liferay-npm-bundler.config.js → ...rsions-info/liferay-npm-bundler.config.js
diff --git a/...node_modules/babel-plugin-test-0/index.js → ...node_modules/babel-plugin-test-0/index.js b/...node_modules/babel-plugin-test-0/index.js → ...node_modules/babel-plugin-test-0/index.js
diff --git a/..._modules/babel-plugin-test-0/package.json → ..._modules/babel-plugin-test-0/package.json b/..._modules/babel-plugin-test-0/package.json → ..._modules/babel-plugin-test-0/package.json
diff --git a/...ode_modules/babel-plugins/dir/plugin-0.js → ...ode_modules/babel-plugins/dir/plugin-0.js b/...ode_modules/babel-plugins/dir/plugin-0.js → ...ode_modules/babel-plugins/dir/plugin-0.js
diff --git a/...ode_modules/babel-plugins/dir/plugin-1.js → ...ode_modules/babel-plugins/dir/plugin-1.js b/...ode_modules/babel-plugins/dir/plugin-1.js → ...ode_modules/babel-plugins/dir/plugin-1.js
diff --git a/...o/node_modules/babel-plugins/package.json → ...o/node_modules/babel-plugins/package.json b/...o/node_modules/babel-plugins/package.json → ...o/node_modules/babel-plugins/package.json
diff --git a/...e_modules/bundler-plugins/dir/plugin-0.js → ...e_modules/bundler-plugins/dir/plugin-0.js b/...e_modules/bundler-plugins/dir/plugin-0.js → ...e_modules/bundler-plugins/dir/plugin-0.js
diff --git a/...e_modules/bundler-plugins/dir/plugin-1.js → ...e_modules/bundler-plugins/dir/plugin-1.js b/...e_modules/bundler-plugins/dir/plugin-1.js → ...e_modules/bundler-plugins/dir/plugin-1.js
diff --git a/...node_modules/bundler-plugins/package.json → ...node_modules/bundler-plugins/package.json b/...node_modules/bundler-plugins/package.json → ...node_modules/bundler-plugins/package.json
diff --git a/...iferay-npm-bundler-plugin-test-0/index.js → ...iferay-npm-bundler-plugin-test-0/index.js b/...iferay-npm-bundler-plugin-test-0/index.js → ...iferay-npm-bundler-plugin-test-0/index.js
diff --git a/...ay-npm-bundler-plugin-test-0/package.json → ...ay-npm-bundler-plugin-test-0/package.json b/...ay-npm-bundler-plugin-test-0/package.json → ...ay-npm-bundler-plugin-test-0/package.json
diff --git a/...iferay-npm-bundler-plugin-test-1/index.js → ...iferay-npm-bundler-plugin-test-1/index.js b/...iferay-npm-bundler-plugin-test-1/index.js → ...iferay-npm-bundler-plugin-test-1/index.js
diff --git a/...ay-npm-bundler-plugin-test-1/package.json → ...ay-npm-bundler-plugin-test-1/package.json b/...ay-npm-bundler-plugin-test-1/package.json → ...ay-npm-bundler-plugin-test-1/package.json
diff --git a/...ures__/project/versions-info/package.json → ...ures__/project/versions-info/package.json b/...ures__/project/versions-info/package.json → ...ures__/project/versions-info/package.json
diff --git a/...-module-cfg/liferay-npm-bundler.config.js → ...-module-cfg/liferay-npm-bundler.config.js b/...-module-cfg/liferay-npm-bundler.config.js → ...-module-cfg/liferay-npm-bundler.config.js
diff --git a/.../node_modules/a-config/my-babel-plugin.js → .../node_modules/a-config/my-babel-plugin.js b/.../node_modules/a-config/my-babel-plugin.js → .../node_modules/a-config/my-babel-plugin.js
diff --git a/.../node_modules/a-config/my-babel-preset.js → .../node_modules/a-config/my-babel-preset.js b/.../node_modules/a-config/my-babel-preset.js → .../node_modules/a-config/my-babel-preset.js
diff --git a/...g/node_modules/a-config/my-copy-plugin.js → ...g/node_modules/a-config/my-copy-plugin.js b/...g/node_modules/a-config/my-copy-plugin.js → ...g/node_modules/a-config/my-copy-plugin.js
diff --git a/...g/node_modules/a-config/my-post-plugin.js → ...g/node_modules/a-config/my-post-plugin.js b/...g/node_modules/a-config/my-post-plugin.js → ...g/node_modules/a-config/my-post-plugin.js
diff --git a/...fg/node_modules/a-config/my-pre-plugin.js → ...fg/node_modules/a-config/my-pre-plugin.js b/...fg/node_modules/a-config/my-pre-plugin.js → ...fg/node_modules/a-config/my-pre-plugin.js
diff --git a/...le-cfg/node_modules/a-config/package.json → ...le-cfg/node_modules/a-config/package.json b/...le-cfg/node_modules/a-config/package.json → ...le-cfg/node_modules/a-config/package.json
diff --git a/...e-cfg/node_modules/a-package/package.json → ...e-cfg/node_modules/a-package/package.json b/...e-cfg/node_modules/a-package/package.json → ...e-cfg/node_modules/a-package/package.json
diff --git a/...es__/project/with-module-cfg/package.json → ...es__/project/with-module-cfg/package.json b/...es__/project/with-module-cfg/package.json → ...es__/project/with-module-cfg/package.json
diff --git a/...t-core/src/project/getFeaturesFilePath.ts → ...t-core/src/project/getFeaturesFilePath.ts b/...t-core/src/project/getFeaturesFilePath.ts → ...t-core/src/project/getFeaturesFilePath.ts
diff --git a/...ckages/liferay-js-toolkit-core/src/run.ts → ...olkit/packages/js-toolkit-core/src/run.ts b/...ckages/liferay-js-toolkit-core/src/run.ts → ...olkit/packages/js-toolkit-core/src/run.ts
diff --git a/...lkit-core/src/schema/ConfigurationJson.ts → ...lkit-core/src/schema/ConfigurationJson.ts b/...lkit-core/src/schema/ConfigurationJson.ts → ...lkit-core/src/schema/ConfigurationJson.ts
diff --git a/...s-toolkit-core/src/schema/ManifestJson.ts → ...s-toolkit-core/src/schema/ManifestJson.ts b/...s-toolkit-core/src/schema/ManifestJson.ts → ...s-toolkit-core/src/schema/ManifestJson.ts
diff --git a/...ray-js-toolkit-core/src/schema/PkgJson.ts → ...ges/js-toolkit-core/src/schema/PkgJson.ts b/...ray-js-toolkit-core/src/schema/PkgJson.ts → ...ges/js-toolkit-core/src/schema/PkgJson.ts
diff --git a/.../src/transform/js/__tests__/index.test.ts → .../src/transform/js/__tests__/index.test.ts b/.../src/transform/js/__tests__/index.test.ts → .../src/transform/js/__tests__/index.test.ts
diff --git a/...y-js-toolkit-core/src/transform/js/ast.ts → ...s/js-toolkit-core/src/transform/js/ast.ts b/...y-js-toolkit-core/src/transform/js/ast.ts → ...s/js-toolkit-core/src/transform/js/ast.ts
diff --git a/...js-toolkit-core/src/transform/js/index.ts → ...js-toolkit-core/src/transform/js/index.ts b/...js-toolkit-core/src/transform/js/index.ts → ...js-toolkit-core/src/transform/js/index.ts
diff --git a/...js/operation/__tests__/wrapModule.test.ts → ...js/operation/__tests__/wrapModule.test.ts b/...js/operation/__tests__/wrapModule.test.ts → ...js/operation/__tests__/wrapModule.test.ts
diff --git a/...m/js/operation/replaceInStringLiterals.ts → ...m/js/operation/replaceInStringLiterals.ts b/...m/js/operation/replaceInStringLiterals.ts → ...m/js/operation/replaceInStringLiterals.ts
diff --git a/.../src/transform/js/operation/wrapModule.ts → .../src/transform/js/operation/wrapModule.ts b/.../src/transform/js/operation/wrapModule.ts → .../src/transform/js/operation/wrapModule.ts
diff --git a/...js-toolkit-core/src/transform/js/parse.ts → ...js-toolkit-core/src/transform/js/parse.ts b/...js-toolkit-core/src/transform/js/parse.ts → ...js-toolkit-core/src/transform/js/parse.ts
diff --git a/...-toolkit-core/src/transform/json/index.ts → ...-toolkit-core/src/transform/json/index.ts b/...-toolkit-core/src/transform/json/index.ts → ...-toolkit-core/src/transform/json/index.ts
diff --git a/.../json/operation/addPkgJsonDependencies.ts → .../json/operation/addPkgJsonDependencies.ts b/.../json/operation/addPkgJsonDependencies.ts → .../json/operation/addPkgJsonDependencies.ts
diff --git a/...on/operation/deletePkgJsonDependencies.ts → ...on/operation/deletePkgJsonDependencies.ts b/...on/operation/deletePkgJsonDependencies.ts → ...on/operation/deletePkgJsonDependencies.ts
diff --git a/...json/operation/setPkgJsonPortletHeader.ts → ...json/operation/setPkgJsonPortletHeader.ts b/...json/operation/setPkgJsonPortletHeader.ts → ...json/operation/setPkgJsonPortletHeader.ts
diff --git a/...ray-js-toolkit-core/src/transform/text.ts → ...ges/js-toolkit-core/src/transform/text.ts b/...ray-js-toolkit-core/src/transform/text.ts → ...ges/js-toolkit-core/src/transform/text.ts
diff --git a/...ges/liferay-js-toolkit-core/tsconfig.json → ...it/packages/js-toolkit-core/tsconfig.json b/...ges/liferay-js-toolkit-core/tsconfig.json → ...it/packages/js-toolkit-core/tsconfig.json
diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/.yarnrc b/projects/js-toolkit/packages/liferay-js-toolkit-core/.yarnrc
diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/package.json b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/package.json
@@ -5,14 +5,14 @@
 	},
 	"dependencies": {
 		"@babel/core": "^7.0.0",
+		"@liferay/js-toolkit-core": "3.0.0-alpha.2",
 		"babel-template": "^6.26.0",
 		"cpr": "^3.0.1",
 		"cross-spawn": "^7.0.0",
 		"dot-prop": "^5.0.1",
 		"ejs": "^2.6.1",
 		"fs-extra": "^8.1.0",
 		"globby": "^11.0.1",
-		"liferay-js-toolkit-core": "3.0.0-alpha.2",
 		"properties": "^1.2.1",
 		"read-json-sync": "^2.0.1",
 		"request": "^2.88.0",

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/config.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/config.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {Project} from '@liferay/js-toolkit-core';
 import prop from 'dot-prop';
-import {Project} from 'liferay-js-toolkit-core';
 import readJsonSync from 'read-json-sync';
 
 export const project = new Project('.');

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/index.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {format} from 'liferay-js-toolkit-core';
+import {format} from '@liferay/js-toolkit-core';
 
 import build from './scripts/build';
 import copyAssets from './scripts/copy-assets';

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/build.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/build.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {runNodeModulesBin} from 'liferay-js-toolkit-core';
+import {runNodeModulesBin} from '@liferay/js-toolkit-core';
 
 export default function (): void {
 	runNodeModulesBin('liferay-npm-bundler');

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/copy-assets.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/copy-assets.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {format} from '@liferay/js-toolkit-core';
 import cpr from 'cpr';
 import fs from 'fs-extra';
-import {format} from 'liferay-js-toolkit-core';
 
 import {project} from '../config';
 

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/copy-sources.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/copy-sources.ts
@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {format} from '@liferay/js-toolkit-core';
 import cpr from 'cpr';
 import fs from 'fs-extra';
-import {format} from 'liferay-js-toolkit-core';
 
 import {project} from '../config';
 

diff --git a/...-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/ddm.test.ts b/...-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/ddm.test.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {Project} from 'liferay-js-toolkit-core';
+import {Project} from '@liferay/js-toolkit-core';
 import path from 'path';
 import readJsonSync from 'read-json-sync';
 

diff --git a/...-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/xml.test.ts b/...-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/xml.test.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {ConfigurationJsonField} from 'liferay-js-toolkit-core';
+import {ConfigurationJsonField} from '@liferay/js-toolkit-core';
 
 import {
 	addMetatypeAttr,

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/ddm.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/ddm.ts
@@ -7,7 +7,7 @@ import {
 	ConfigurationJsonField,
 	ConfigurationJsonPortletInstance,
 	Project,
-} from 'liferay-js-toolkit-core';
+} from '@liferay/js-toolkit-core';
 
 interface Field {
 	dataType: string;

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/index.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/index.ts
@@ -3,16 +3,16 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import fs from 'fs-extra';
-import globby, {GlobbyOptions} from 'globby';
-import JSZip from 'jszip';
 import {
 	ConfigurationJson,
 	ConfigurationJsonPortletInstance,
 	ConfigurationJsonSystem,
 	FilePath,
 	format,
-} from 'liferay-js-toolkit-core';
+} from '@liferay/js-toolkit-core';
+import fs from 'fs-extra';
+import globby, {GlobbyOptions} from 'globby';
+import JSZip from 'jszip';
 import path from 'path';
 
 import {project} from '../../config';

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/xml.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/xml.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {ConfigurationJsonField} from 'liferay-js-toolkit-core';
+import {ConfigurationJsonField} from '@liferay/js-toolkit-core';
 import {Element, ElementCompact, js2xml, xml2js} from 'xml-js';
 
 type XmlObject = Element | ElementCompact;

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/deploy.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/deploy.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {format} from '@liferay/js-toolkit-core';
 import fs from 'fs';
-import {format} from 'liferay-js-toolkit-core';
 import path from 'path';
 
 import {getLiferayDir, project} from '../config';

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/translate.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/translate.ts
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {format} from '@liferay/js-toolkit-core';
 import fs from 'fs';
-import {format} from 'liferay-js-toolkit-core';
 import properties from 'properties';
 import request from 'request';
 import uuidv4 from 'uuid/v4';

diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/tsconfig.json b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/tsconfig.json
@@ -5,5 +5,5 @@
 		"rootDir": "./src"
 	},
 	"include": ["src/**/*"],
-	"references": [{"path": "../liferay-js-toolkit-core"}]
+	"references": [{"path": "../js-toolkit-core"}]
 }
diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/package.json b/projects/js-toolkit/packages/liferay-npm-bundler/package.json
@@ -4,6 +4,7 @@
 		"liferay-npm-bundler": "bin/liferay-npm-bundler.js"
 	},
 	"dependencies": {
+		"@liferay/js-toolkit-core": "3.0.0-alpha.2",
 		"acorn": "^6.2.1",
 		"cross-spawn": "^7.0.0",
 		"ejs": "^2.6.1",
@@ -12,7 +13,6 @@
 		"fs-extra": "^8.1.0",
 		"globby": "^11.0.1",
 		"jszip": "^3.1.5",
-		"liferay-js-toolkit-core": "3.0.0-alpha.2",
 		"pretty-time": "^1.1.0",
 		"read-json-sync": "^2.0.1",
 		"source-map": "^0.7.3",

diff --git a/...cts/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts b/...cts/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts
@@ -7,7 +7,7 @@ import {
 	JsSourceTransform,
 	parseAsAstExpressionStatement,
 	replaceJsSource,
-} from 'liferay-js-toolkit-core';
+} from '@liferay/js-toolkit-core';
 
 /**
  * Changes `'app-root'` to `'#'+_LIFERAY_PARAMS_.portletElementId` so that

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/index.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/index.ts
@@ -3,15 +3,15 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import fs from 'fs-extra';
 import {
 	addNamespace,
 	addPkgJsonDependencies,
 	deletePkgJsonDependencies,
 	transformJsSourceFile,
 	transformJsonFile,
 	wrapModule,
-} from 'liferay-js-toolkit-core';
+} from '@liferay/js-toolkit-core';
+import fs from 'fs-extra';
 import path from 'path';
 
 import {bundlerWebpackDir, project} from '../../globals';

diff --git a/.../js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts b/.../js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {JsSourceTransform, replaceJsSource} from 'liferay-js-toolkit-core';
-import {parseAsExpressionStatement} from 'liferay-js-toolkit-core/lib/transform/js/parse';
+import {JsSourceTransform, replaceJsSource} from '@liferay/js-toolkit-core';
+import {parseAsExpressionStatement} from '@liferay/js-toolkit-core/lib/transform/js/parse';
 
 const {expression: webpackManifestExpression} = parseAsExpressionStatement(
 	'__WEBPACK_MANIFEST__'

diff --git a/...js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/write-export-modules.ts b/...js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/write-export-modules.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import fs from 'fs-extra';
 import {
 	FilePath,
 	PkgDesc,
@@ -12,7 +11,8 @@ import {
 	isLocalModule,
 	joinModuleName,
 	splitModuleName,
-} from 'liferay-js-toolkit-core';
+} from '@liferay/js-toolkit-core';
+import fs from 'fs-extra';
 import path from 'path';
 
 import {bundlerWebpackDir, manifest, project} from '../../globals';

diff --git a/...s-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts b/...s-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts
@@ -8,7 +8,7 @@ import {
 	JsSourceTransform,
 	parseAsAstExpressionStatement,
 	replaceJsSource,
-} from 'liferay-js-toolkit-core';
+} from '@liferay/js-toolkit-core';
 
 export default function tweakAttachmentToDOM(): JsSourceTransform {
 	return ((source) => _tweakAttachmentToDOM(source)) as JsSourceTransform;

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/index.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/index.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import fs from 'fs-extra';
 import {
 	JsSourceTransform,
 	PkgJson,
@@ -13,7 +12,8 @@ import {
 	transformJsonFile,
 	transformTextFile,
 	wrapModule,
-} from 'liferay-js-toolkit-core';
+} from '@liferay/js-toolkit-core';
+import fs from 'fs-extra';
 import path from 'path';
 
 import {bundlerGeneratedDir, project} from '../globals';

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/liferay-fragment/index.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/liferay-fragment/index.ts
@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import fs from 'fs-extra';
 import {
 	FilePath,
 	transformJsSourceFile,
 	wrapModule,
-} from 'liferay-js-toolkit-core';
+} from '@liferay/js-toolkit-core';
+import fs from 'fs-extra';
 
 import {bundlerWebpackDir, project} from '../../globals';
 import * as log from '../../util/log';

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/configure.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/configure.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {FilePath, ProjectType, isLocalModule} from '@liferay/js-toolkit-core';
 import fs from 'fs-extra';
-import {FilePath, ProjectType, isLocalModule} from 'liferay-js-toolkit-core';
 import webpack from 'webpack';
 
 import {bundlerGeneratedDir, bundlerWebpackDir, project} from '../globals';

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/index.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/index.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {ProjectType} from '@liferay/js-toolkit-core';
 import fs from 'fs-extra';
-import {ProjectType} from 'liferay-js-toolkit-core';
 import webpack from 'webpack';
 
 import adaptBundlerProject from '../adapt/bundler-project';

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/globals.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/globals.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {Manifest, Project} from '@liferay/js-toolkit-core';
 import fs from 'fs-extra';
-import {Manifest, Project} from 'liferay-js-toolkit-core';
 
 export const manifest = new Manifest();
 

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
+import {PkgDesc, ProjectType} from '@liferay/js-toolkit-core';
 import fs from 'fs-extra';
-import {PkgDesc, ProjectType} from 'liferay-js-toolkit-core';
 import pretty from 'pretty-time';
 
 import adaptAngularCli from './adapt/angular-cli';

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/__tests__/index.test.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/report/__tests__/index.test.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {PkgDesc} from 'liferay-js-toolkit-core';
+import {PkgDesc} from '@liferay/js-toolkit-core';
 
 import {Report} from '../index';
 

diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/html.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/report/html.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import {LogLevel} from 'liferay-js-toolkit-core';
+import {LogLevel} from '@liferay/js-toolkit-core';
 import pretty from 'pretty-time';
 
 import {Report} from '.';