diff --git a/projects/js-toolkit/CONTRIBUTING.md b/projects/js-toolkit/CONTRIBUTING.md index 49c26cbca5..c8f20e9208 100644 --- 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 index fe982fd2a9..e5c20e5ac5 100644 --- 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 ", "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 index 66370a2b3c..07d0491a4a 100644 --- 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 index ff15c1effb..6b368ecb51 100644 --- 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 index 79ee8fe370..df2975d389 100644 --- 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 new file mode 100644 index 0000000000..40ec030060 --- /dev/null +++ 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/projects/js-toolkit/packages/liferay-js-toolkit-core/CHANGELOG.md b/projects/js-toolkit/packages/js-toolkit-core/CHANGELOG.md similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/CHANGELOG.md rename to projects/js-toolkit/packages/js-toolkit-core/CHANGELOG.md diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/package.json b/projects/js-toolkit/packages/js-toolkit-core/package.json similarity index 89% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/package.json rename to projects/js-toolkit/packages/js-toolkit-core/package.json index 5fc86eb812..6488a8adde 100644 --- a/projects/js-toolkit/packages/liferay-js-toolkit-core/package.json +++ b/projects/js-toolkit/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/projects/js-toolkit/packages/liferay-js-toolkit-core/src/__tests__/globs.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/__tests__/globs.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/__tests__/globs.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/__tests__/globs.test.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/bundler/PkgDesc.ts b/projects/js-toolkit/packages/js-toolkit-core/src/bundler/PkgDesc.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/bundler/PkgDesc.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/bundler/PkgDesc.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/bundler/__tests__/PkgDesc.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/bundler/__tests__/PkgDesc.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/bundler/__tests__/PkgDesc.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/bundler/__tests__/PkgDesc.test.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/escapeStringRegExp.ts b/projects/js-toolkit/packages/js-toolkit-core/src/escapeStringRegExp.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/escapeStringRegExp.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/escapeStringRegExp.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/FilePath.ts b/projects/js-toolkit/packages/js-toolkit-core/src/file/FilePath.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/FilePath.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/file/FilePath.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/__tests__/FilePath.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/file/__tests__/FilePath.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/__tests__/FilePath.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/file/__tests__/FilePath.test.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/handler/Manifest.ts b/projects/js-toolkit/packages/js-toolkit-core/src/file/handler/Manifest.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/handler/Manifest.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/file/handler/Manifest.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/handler/__tests__/Manifest.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/file/handler/__tests__/Manifest.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/handler/__tests__/Manifest.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/file/handler/__tests__/Manifest.test.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/handler/__tests__/__snapshots__/Manifest.test.ts.snap b/projects/js-toolkit/packages/js-toolkit-core/src/file/handler/__tests__/__snapshots__/Manifest.test.ts.snap similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/file/handler/__tests__/__snapshots__/Manifest.test.ts.snap rename to projects/js-toolkit/packages/js-toolkit-core/src/file/handler/__tests__/__snapshots__/Manifest.test.ts.snap diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/format.ts b/projects/js-toolkit/packages/js-toolkit-core/src/format.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/format.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/format.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/globs.ts b/projects/js-toolkit/packages/js-toolkit-core/src/globs.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/globs.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/globs.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/index.ts b/projects/js-toolkit/packages/js-toolkit-core/src/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/index.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/index.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/node/__tests__/modules.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/node/__tests__/modules.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/node/__tests__/modules.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/node/__tests__/modules.test.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/node/__tests__/namespace.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/node/__tests__/namespace.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/node/__tests__/namespace.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/node/__tests__/namespace.test.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/node/modules.ts b/projects/js-toolkit/packages/js-toolkit-core/src/node/modules.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/node/modules.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/node/modules.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/node/namespace.ts b/projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/node/namespace.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/node/namespace.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Adapt.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Adapt.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Adapt.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/Adapt.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Jar.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Jar.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Jar.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/Jar.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Localization.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Localization.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Localization.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/Localization.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Misc.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Misc.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Misc.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/Misc.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Probe.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Probe.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Project.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Project.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/Project.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/Project.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/VersionInfo.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/VersionInfo.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/VersionInfo.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/VersionInfo.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/Project.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.ts similarity index 99% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/Project.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.ts index 6ec93a1d8b..d987c3972c 100644 --- a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/Project.test.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/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/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/default-features/features/localization/Language.properties b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/default-features/features/localization/Language.properties similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/default-features/features/localization/Language.properties rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/default-features/features/localization/Language.properties diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/default-features/liferay-npm-bundler.config.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/default-features/liferay-npm-bundler.config.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/default-features/liferay-npm-bundler.config.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/default-features/liferay-npm-bundler.config.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/default-features/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/default-features/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/default-features/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/default-features/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/package-lock.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/package-lock.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/package-lock.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/package-lock.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/yarn.lock b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/yarn.lock similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/yarn.lock rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/both/yarn.lock diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/none/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/none/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/none/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/none/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/npm/package-lock.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/npm/package-lock.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/npm/package-lock.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/npm/package-lock.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/npm/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/npm/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/npm/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/npm/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/yarn/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/yarn/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/yarn/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/yarn/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/yarn/yarn.lock b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/yarn/yarn.lock similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/yarn/yarn.lock rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/pkg-manager/yarn/yarn.lock diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/bool-create-jar/liferay-npm-bundler.config.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/bool-create-jar/liferay-npm-bundler.config.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/bool-create-jar/liferay-npm-bundler.config.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/bool-create-jar/liferay-npm-bundler.config.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/bool-create-jar/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/bool-create-jar/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/bool-create-jar/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/bool-create-jar/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/create-jar-off-with-portlet/liferay-npm-bundler.config.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/create-jar-off-with-portlet/liferay-npm-bundler.config.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/create-jar-off-with-portlet/liferay-npm-bundler.config.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/create-jar-off-with-portlet/liferay-npm-bundler.config.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/create-jar-off-with-portlet/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/create-jar-off-with-portlet/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/create-jar-off-with-portlet/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/create-jar-off-with-portlet/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/empty-with-portlet/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/empty-with-portlet/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/empty-with-portlet/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/empty-with-portlet/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/empty/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/empty/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/empty/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/empty/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/false-create-jar/liferay-npm-bundler.config.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/false-create-jar/liferay-npm-bundler.config.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/false-create-jar/liferay-npm-bundler.config.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/false-create-jar/liferay-npm-bundler.config.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/false-create-jar/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/false-create-jar/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/false-create-jar/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/false-create-jar/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/localization/Language.properties b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/localization/Language.properties similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/localization/Language.properties rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/localization/Language.properties diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/localization/Language_es_ES.properties b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/localization/Language_es_ES.properties similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/localization/Language_es_ES.properties rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/localization/Language_es_ES.properties diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/manifest.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/manifest.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/manifest.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/features/manifest.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/liferay-npm-bundler.config.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/liferay-npm-bundler.config.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/liferay-npm-bundler.config.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/liferay-npm-bundler.config.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/standard/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/liferay-npm-bundler.config.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/liferay-npm-bundler.config.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/liferay-npm-bundler.config.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/liferay-npm-bundler.config.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugin-test-0/index.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugin-test-0/index.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugin-test-0/index.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugin-test-0/index.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugin-test-0/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugin-test-0/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugin-test-0/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugin-test-0/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/dir/plugin-0.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/dir/plugin-0.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/dir/plugin-0.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/dir/plugin-0.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/dir/plugin-1.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/dir/plugin-1.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/dir/plugin-1.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/dir/plugin-1.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/babel-plugins/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/dir/plugin-0.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/dir/plugin-0.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/dir/plugin-0.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/dir/plugin-0.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/dir/plugin-1.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/dir/plugin-1.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/dir/plugin-1.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/dir/plugin-1.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/bundler-plugins/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-0/index.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-0/index.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-0/index.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-0/index.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-0/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-0/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-0/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-0/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-1/index.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-1/index.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-1/index.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-1/index.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-1/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-1/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-1/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/node_modules/liferay-npm-bundler-plugin-test-1/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/versions-info/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/liferay-npm-bundler.config.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/liferay-npm-bundler.config.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/liferay-npm-bundler.config.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/liferay-npm-bundler.config.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-babel-plugin.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-babel-plugin.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-babel-plugin.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-babel-plugin.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-babel-preset.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-babel-preset.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-babel-preset.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-babel-preset.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-copy-plugin.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-copy-plugin.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-copy-plugin.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-copy-plugin.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-post-plugin.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-post-plugin.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-post-plugin.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-post-plugin.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-pre-plugin.js b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-pre-plugin.js similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-pre-plugin.js rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/my-pre-plugin.js diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-config/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-package/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-package/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-package/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/node_modules/a-package/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/package.json b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/package.json rename to projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/__fixtures__/project/with-module-cfg/package.json diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/getFeaturesFilePath.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/getFeaturesFilePath.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/project/getFeaturesFilePath.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/project/getFeaturesFilePath.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/run.ts b/projects/js-toolkit/packages/js-toolkit-core/src/run.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/run.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/run.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/schema/ConfigurationJson.ts b/projects/js-toolkit/packages/js-toolkit-core/src/schema/ConfigurationJson.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/schema/ConfigurationJson.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/schema/ConfigurationJson.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/schema/ManifestJson.ts b/projects/js-toolkit/packages/js-toolkit-core/src/schema/ManifestJson.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/schema/ManifestJson.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/schema/ManifestJson.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/schema/PkgJson.ts b/projects/js-toolkit/packages/js-toolkit-core/src/schema/PkgJson.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/schema/PkgJson.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/schema/PkgJson.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/__tests__/index.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/__tests__/index.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/__tests__/index.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/js/__tests__/index.test.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/ast.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/ast.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/ast.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/js/ast.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/index.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/index.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/js/index.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/operation/__tests__/wrapModule.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/__tests__/wrapModule.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/operation/__tests__/wrapModule.test.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/__tests__/wrapModule.test.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/operation/replaceInStringLiterals.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/replaceInStringLiterals.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/operation/replaceInStringLiterals.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/replaceInStringLiterals.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/operation/wrapModule.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/wrapModule.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/operation/wrapModule.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/js/operation/wrapModule.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/parse.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/js/parse.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/js/parse.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/js/parse.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/json/index.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/json/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/json/index.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/json/index.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/json/operation/addPkgJsonDependencies.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/json/operation/addPkgJsonDependencies.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/json/operation/addPkgJsonDependencies.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/json/operation/addPkgJsonDependencies.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/json/operation/deletePkgJsonDependencies.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/json/operation/deletePkgJsonDependencies.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/json/operation/deletePkgJsonDependencies.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/json/operation/deletePkgJsonDependencies.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/json/operation/setPkgJsonPortletHeader.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/json/operation/setPkgJsonPortletHeader.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/json/operation/setPkgJsonPortletHeader.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/json/operation/setPkgJsonPortletHeader.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/text.ts b/projects/js-toolkit/packages/js-toolkit-core/src/transform/text.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/src/transform/text.ts rename to projects/js-toolkit/packages/js-toolkit-core/src/transform/text.ts diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-core/tsconfig.json b/projects/js-toolkit/packages/js-toolkit-core/tsconfig.json similarity index 100% rename from projects/js-toolkit/packages/liferay-js-toolkit-core/tsconfig.json rename to projects/js-toolkit/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 deleted file mode 100644 index 773fdf8a63..0000000000 --- a/projects/js-toolkit/packages/liferay-js-toolkit-core/.yarnrc +++ /dev/null @@ -1,3 +0,0 @@ -# Make `yarn version` produce the right commit message and tag for this package. -version-tag-prefix "liferay-js-toolkit-core/v" -version-git-message "chore: prepare liferay-js-toolkit-core/v%s release" diff --git a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/package.json b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/package.json index 519b6c43fd..1bbca0897d 100644 --- a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/package.json +++ b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/package.json @@ -5,6 +5,7 @@ }, "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", @@ -12,7 +13,6 @@ "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 index 346d5e82c3..e842884b06 100644 --- 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 index b6889f1ab7..5955b2b7e8 100644 --- 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 index 12ec4e2fe8..70126337ca 100644 --- 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 index ba2c93a57e..3cbb637326 100644 --- 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 index 0d250890d8..d25580892a 100644 --- 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/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/ddm.test.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/ddm.test.ts index 4d25afa482..90e3138a97 100644 --- a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/ddm.test.ts +++ b/projects/js-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/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/xml.test.ts b/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/xml.test.ts index 676f5a0a32..0a04f044ad 100644 --- a/projects/js-toolkit/packages/liferay-js-toolkit-scripts/src/scripts/create-jar/__tests__/xml.test.ts +++ b/projects/js-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 index 40b90b09ff..885401e63c 100644 --- 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 index 7fc5e718d2..273a6a79ba 100644 --- 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 index 3a3de3566e..7649269d5a 100644 --- 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 index e8a88194a8..2f429a2fb7 100644 --- 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 index 951938d35b..363dd0f521 100644 --- 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 index 07026c2e61..db056e2030 100644 --- 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 index a7b25adccb..04e3a7b9c8 100644 --- 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/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts index 1b87d4552d..6f20bcdb02 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts +++ b/projects/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 index 113d858aeb..d565867f61 100644 --- 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,7 +3,6 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -import fs from 'fs-extra'; import { addNamespace, addPkgJsonDependencies, @@ -11,7 +10,8 @@ import { 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/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts index 5d326b6318..016a26327b 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts +++ b/projects/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/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/write-export-modules.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/write-export-modules.ts index 695718c44c..5780304490 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/write-export-modules.ts +++ b/projects/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/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts index 8fc607c555..1e9933fc58 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts +++ b/projects/js-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 index cc0747d4e5..44f1b09bbe 100644 --- 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 index d2f6ef9f05..9d0b5fb1ef 100644 --- 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 index b02af17ae1..76e10d9181 100644 --- 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 index d25ea0e00d..90aa3c9652 100644 --- 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 index 07b38e421d..7855b3ca49 100644 --- 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 index 26f88b0ad8..85a062ac73 100644 --- 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 index 6cee350fbf..94b2cee586 100644 --- 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 index ebca0b6900..644c96c0f0 100644 --- 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 '.'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/index.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/report/index.ts index 333685e826..87c3c81857 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/index.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/report/index.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -import {PkgDesc, VersionInfo} from 'liferay-js-toolkit-core'; +import {PkgDesc, VersionInfo} from '@liferay/js-toolkit-core'; import {htmlDump} from './html'; import ReportLogger from './logger'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/logger.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/report/logger.ts index 55a5d98358..1705ec9d67 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/logger.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/report/logger.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 {project} from '../globals'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/adaptStaticURLsAtRuntime.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/adaptStaticURLsAtRuntime.ts index 0811a0c4f7..712b21eb41 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/adaptStaticURLsAtRuntime.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/adaptStaticURLsAtRuntime.ts @@ -7,7 +7,7 @@ import { JsSourceTransform, parseAsAstExpressionStatement, replaceJsSource, -} from 'liferay-js-toolkit-core'; +} from '@liferay/js-toolkit-core'; import {project} from '../../../globals'; import {findFiles} from '../../../util/files'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/exportModuleAsFunction.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/exportModuleAsFunction.ts index 77b8ace478..3f4b0204be 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/exportModuleAsFunction.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/exportModuleAsFunction.ts @@ -3,14 +3,14 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -import estree from 'estree'; import { JsSource, JsSourceTransform, getAstProgramStatements, parseAsAstProgram, replaceJsSource, -} from 'liferay-js-toolkit-core'; +} from '@liferay/js-toolkit-core'; +import estree from 'estree'; export default function exportModuleAsFunction(): JsSourceTransform { return ((source) => _exportModuleAsFunction(source)) as JsSourceTransform; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/namespaceWepbackJsonp.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/namespaceWepbackJsonp.ts index 80a1432833..d941ac7309 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/namespaceWepbackJsonp.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/namespaceWepbackJsonp.ts @@ -3,11 +3,11 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -import crypto from 'crypto'; import { JsSourceTransform, replaceInStringLiterals, -} from 'liferay-js-toolkit-core'; +} from '@liferay/js-toolkit-core'; +import crypto from 'crypto'; import {project} from '../../../globals'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/transformImports.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/transformImports.ts index 480304c6ed..d50296807b 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/transformImports.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/transformImports.ts @@ -3,14 +3,14 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -import {parse} from 'acorn'; -import estree from 'estree'; import { Imports, JsSourceTransform, addNamespace, replaceJsSource, -} from 'liferay-js-toolkit-core'; +} from '@liferay/js-toolkit-core'; +import {parse} from 'acorn'; +import estree from 'estree'; import {project} from '../../../globals'; import ReportLogger from '../../../report/logger'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/text/operation/replace.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/text/operation/replace.ts index 80ed1c10d2..a83ada3657 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/text/operation/replace.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/text/operation/replace.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -import {TextTransform, escapeStringRegExp} from 'liferay-js-toolkit-core'; +import {TextTransform, escapeStringRegExp} from '@liferay/js-toolkit-core'; /** * Replace strings or regular expressions in a text. diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/files.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/util/files.ts index 75792d303f..00c15a3cd3 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/files.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/util/files.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ +import {FilePath} from '@liferay/js-toolkit-core'; import fs from 'fs-extra'; import globby from 'globby'; -import {FilePath} from 'liferay-js-toolkit-core'; import path from 'path'; /** diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/log.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/util/log.ts index f349a1fad3..7aae1a2e5e 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/log.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/util/log.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -import {LogLevel, format} from 'liferay-js-toolkit-core'; +import {LogLevel, format} from '@liferay/js-toolkit-core'; import {project} from '../globals'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/renderer.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/util/renderer.ts index 6874ccd8a1..0fd3d7ce30 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/renderer.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/util/renderer.ts @@ -3,9 +3,9 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ +import {FilePath} from '@liferay/js-toolkit-core'; import ejs from 'ejs'; import fs from 'fs-extra'; -import {FilePath} from 'liferay-js-toolkit-core'; import path from 'path'; export interface RenderOptions { diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/run.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/util/run.ts index 95859ae98c..db91567988 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/run.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/util/run.ts @@ -6,7 +6,7 @@ import { runNodeModulesBin as coreRunNodeModulesBin, runPkgJsonScript as coreRunPkgJsonScript, -} from 'liferay-js-toolkit-core'; +} from '@liferay/js-toolkit-core'; import {project} from '../globals'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/webpack/loader/imports-loader.ts b/projects/js-toolkit/packages/liferay-npm-bundler/src/webpack/loader/imports-loader.ts index 38201c9114..cf0692f684 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/src/webpack/loader/imports-loader.ts +++ b/projects/js-toolkit/packages/liferay-npm-bundler/src/webpack/loader/imports-loader.ts @@ -3,7 +3,7 @@ * SPDX-License-Identifier: LGPL-3.0-or-later */ -import {transformJsSource} from 'liferay-js-toolkit-core'; +import {transformJsSource} from '@liferay/js-toolkit-core'; import {project} from '../../globals'; import report from '../../report'; diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/tsconfig.json b/projects/js-toolkit/packages/liferay-npm-bundler/tsconfig.json index 3c510123d0..dd7e64b0a5 100644 --- a/projects/js-toolkit/packages/liferay-npm-bundler/tsconfig.json +++ b/projects/js-toolkit/packages/liferay-npm-bundler/tsconfig.json @@ -5,5 +5,5 @@ "rootDir": "./src" }, "include": ["**/*"], - "references": [{"path": "../liferay-js-toolkit-core"}] + "references": [{"path": "../js-toolkit-core"}] } diff --git a/projects/js-toolkit/scripts/topological.js b/projects/js-toolkit/scripts/topological.js new file mode 100644 index 0000000000..4011c0d5f7 --- /dev/null +++ b/projects/js-toolkit/scripts/topological.js @@ -0,0 +1,89 @@ +/** + * SPDX-FileCopyrightText: © 2020 Liferay, Inc. + * SPDX-License-Identifier: LGPL-3.0-or-later + */ + +const fs = require('fs'); +const path = require('path'); + +const packages = {}; + +let target = process.argv[2]; + +if (!target) { + log('no explicit target directory argument provided; assuming "packages"'); + + target = 'packages'; +} + +fs.readdirSync(target, {withFileTypes: true}).forEach((entry) => { + if (entry.isDirectory()) { + const info = JSON.parse( + fs.readFileSync( + path.join(target, entry.name, 'package.json'), + 'utf8' + ) + ); + + packages[info.name] = info; + } +}); + +function log(string) { + process.stderr.write(`${string}\n`); +} + +/** + * Obtain topological ordering via DFS. + * + * See: https://en.wikipedia.org/wiki/Topological_sorting#Depth-first_search + */ + +const ordered = []; + +const CYCLE_MESSAGE = 'Cycle detected in dependency graph'; + +const PERMANENT = 'permanent'; + +const TEMPORARY = 'temporary'; + +Object.values(packages).forEach((node) => { + if (!node.mark) { + visit(node); + } +}); + +function visit(node) { + try { + if (node.mark === PERMANENT) { + return; + } + else if (node.mark === TEMPORARY) { + log(`${CYCLE_MESSAGE}\n`); + + throw new Error(CYCLE_MESSAGE); + } + + node.mark = TEMPORARY; + + Object.keys(node.dependencies || {}).forEach((other) => { + if (packages[other]) { + visit(packages[other]); + } + }); + + node.mark = PERMANENT; + + ordered.push(node.name); + } + catch (error) { + + // Log the package name so we can see the cycle as we unwind the stack. + + log(` ${node.name}\n`); + + throw error; + } +} + +process.stdout.write(JSON.stringify(ordered, null, 2) + '\n');