From e03a5c20ee978059890227d026af29032fcd8175 Mon Sep 17 00:00:00 2001 From: Greg Hurrell Date: Tue, 13 Oct 2020 18:37:47 +0200 Subject: [PATCH 1/3] refactor(js-toolkit): strip prefix from liferay-npm-bundler directory First step in moving it to be in a named scope. --- .../packages/{liferay-npm-bundler => npm-bundler}/.yarnrc | 0 .../packages/{liferay-npm-bundler => npm-bundler}/CHANGELOG.md | 0 .../packages/{liferay-npm-bundler => npm-bundler}/README.md | 0 .../bin/liferay-npm-bundler.js | 0 .../packages/{liferay-npm-bundler => npm-bundler}/package.json | 0 .../src/adapt/angular-cli/index.ts | 0 .../src/adapt/angular-cli/templates/adapt-rt.js.ejs | 0 .../src/adapt/angular-cli/tweakAttachmentToDOM.ts | 0 .../src/adapt/bundler-project/index.ts | 0 .../src/adapt/bundler-project/replaceWebpackJsonp.ts | 0 .../src/adapt/bundler-project/write-export-modules.ts | 0 .../src/adapt/create-react-app/index.ts | 0 .../src/adapt/create-react-app/templates/adapt-rt.js.ejs | 0 .../src/adapt/create-react-app/tweakAttachmentToDOM.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/adapt/index.ts | 0 .../src/adapt/liferay-fragment/index.ts | 0 .../src/adapt/templates/export-module.ejs | 0 .../src/adapt/templates/index.js.ejs | 0 .../src/adapt/templates/manifest-module.ejs | 0 .../src/bundle/ExplainedError.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/bundle/configure.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/bundle/index.ts | 0 .../packages/{liferay-npm-bundler => npm-bundler}/src/globals.ts | 0 .../packages/{liferay-npm-bundler => npm-bundler}/src/index.ts | 0 .../src/liferay-npm-bundler.config.ts | 0 .../src/report/__tests__/__snapshots__/index.test.ts.snap | 0 .../src/report/__tests__/index.test.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/report/html.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/report/index.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/report/logger.ts | 0 .../src/transform/js/operation/adaptStaticURLsAtRuntime.ts | 0 .../src/transform/js/operation/exportModuleAsFunction.ts | 0 .../src/transform/js/operation/namespaceWepbackJsonp.ts | 0 .../src/transform/js/operation/transformImports.ts | 0 .../src/transform/text/operation/__tests__/replace.test.ts | 0 .../src/transform/text/operation/replace.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/util/abort.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/util/files.ts | 0 .../packages/{liferay-npm-bundler => npm-bundler}/src/util/log.ts | 0 .../{liferay-npm-bundler => npm-bundler}/src/util/renderer.ts | 0 .../packages/{liferay-npm-bundler => npm-bundler}/src/util/run.ts | 0 .../src/webpack/loader/imports-loader.ts | 0 .../packages/{liferay-npm-bundler => npm-bundler}/tsconfig.json | 0 43 files changed, 0 insertions(+), 0 deletions(-) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/.yarnrc (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/CHANGELOG.md (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/README.md (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/bin/liferay-npm-bundler.js (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/package.json (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/angular-cli/index.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/angular-cli/templates/adapt-rt.js.ejs (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/angular-cli/tweakAttachmentToDOM.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/bundler-project/index.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/bundler-project/replaceWebpackJsonp.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/bundler-project/write-export-modules.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/create-react-app/index.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/create-react-app/templates/adapt-rt.js.ejs (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/create-react-app/tweakAttachmentToDOM.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/index.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/liferay-fragment/index.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/templates/export-module.ejs (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/templates/index.js.ejs (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/adapt/templates/manifest-module.ejs (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/bundle/ExplainedError.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/bundle/configure.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/bundle/index.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/globals.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/index.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/liferay-npm-bundler.config.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/report/__tests__/__snapshots__/index.test.ts.snap (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/report/__tests__/index.test.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/report/html.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/report/index.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/report/logger.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/transform/js/operation/adaptStaticURLsAtRuntime.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/transform/js/operation/exportModuleAsFunction.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/transform/js/operation/namespaceWepbackJsonp.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/transform/js/operation/transformImports.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/transform/text/operation/__tests__/replace.test.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/transform/text/operation/replace.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/util/abort.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/util/files.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/util/log.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/util/renderer.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/util/run.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/src/webpack/loader/imports-loader.ts (100%) rename projects/js-toolkit/packages/{liferay-npm-bundler => npm-bundler}/tsconfig.json (100%) diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/.yarnrc b/projects/js-toolkit/packages/npm-bundler/.yarnrc similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/.yarnrc rename to projects/js-toolkit/packages/npm-bundler/.yarnrc diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/CHANGELOG.md b/projects/js-toolkit/packages/npm-bundler/CHANGELOG.md similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/CHANGELOG.md rename to projects/js-toolkit/packages/npm-bundler/CHANGELOG.md diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/README.md b/projects/js-toolkit/packages/npm-bundler/README.md similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/README.md rename to projects/js-toolkit/packages/npm-bundler/README.md diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/bin/liferay-npm-bundler.js b/projects/js-toolkit/packages/npm-bundler/bin/liferay-npm-bundler.js similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/bin/liferay-npm-bundler.js rename to projects/js-toolkit/packages/npm-bundler/bin/liferay-npm-bundler.js diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/package.json b/projects/js-toolkit/packages/npm-bundler/package.json similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/package.json rename to projects/js-toolkit/packages/npm-bundler/package.json diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/index.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/angular-cli/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/index.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/angular-cli/index.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/templates/adapt-rt.js.ejs b/projects/js-toolkit/packages/npm-bundler/src/adapt/angular-cli/templates/adapt-rt.js.ejs similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/templates/adapt-rt.js.ejs rename to projects/js-toolkit/packages/npm-bundler/src/adapt/angular-cli/templates/adapt-rt.js.ejs diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/angular-cli/tweakAttachmentToDOM.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/index.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/bundler-project/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/index.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/bundler-project/index.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/bundler-project/replaceWebpackJsonp.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/write-export-modules.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/bundler-project/write-export-modules.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/bundler-project/write-export-modules.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/bundler-project/write-export-modules.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/index.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/create-react-app/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/index.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/create-react-app/index.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/templates/adapt-rt.js.ejs b/projects/js-toolkit/packages/npm-bundler/src/adapt/create-react-app/templates/adapt-rt.js.ejs similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/templates/adapt-rt.js.ejs rename to projects/js-toolkit/packages/npm-bundler/src/adapt/create-react-app/templates/adapt-rt.js.ejs diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/create-react-app/tweakAttachmentToDOM.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/index.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/index.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/index.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/liferay-fragment/index.ts b/projects/js-toolkit/packages/npm-bundler/src/adapt/liferay-fragment/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/liferay-fragment/index.ts rename to projects/js-toolkit/packages/npm-bundler/src/adapt/liferay-fragment/index.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/templates/export-module.ejs b/projects/js-toolkit/packages/npm-bundler/src/adapt/templates/export-module.ejs similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/templates/export-module.ejs rename to projects/js-toolkit/packages/npm-bundler/src/adapt/templates/export-module.ejs diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/templates/index.js.ejs b/projects/js-toolkit/packages/npm-bundler/src/adapt/templates/index.js.ejs similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/templates/index.js.ejs rename to projects/js-toolkit/packages/npm-bundler/src/adapt/templates/index.js.ejs diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/templates/manifest-module.ejs b/projects/js-toolkit/packages/npm-bundler/src/adapt/templates/manifest-module.ejs similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/adapt/templates/manifest-module.ejs rename to projects/js-toolkit/packages/npm-bundler/src/adapt/templates/manifest-module.ejs diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/ExplainedError.ts b/projects/js-toolkit/packages/npm-bundler/src/bundle/ExplainedError.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/ExplainedError.ts rename to projects/js-toolkit/packages/npm-bundler/src/bundle/ExplainedError.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/configure.ts b/projects/js-toolkit/packages/npm-bundler/src/bundle/configure.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/configure.ts rename to projects/js-toolkit/packages/npm-bundler/src/bundle/configure.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/index.ts b/projects/js-toolkit/packages/npm-bundler/src/bundle/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/bundle/index.ts rename to projects/js-toolkit/packages/npm-bundler/src/bundle/index.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/globals.ts b/projects/js-toolkit/packages/npm-bundler/src/globals.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/globals.ts rename to projects/js-toolkit/packages/npm-bundler/src/globals.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts b/projects/js-toolkit/packages/npm-bundler/src/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/index.ts rename to projects/js-toolkit/packages/npm-bundler/src/index.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/liferay-npm-bundler.config.ts b/projects/js-toolkit/packages/npm-bundler/src/liferay-npm-bundler.config.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/liferay-npm-bundler.config.ts rename to projects/js-toolkit/packages/npm-bundler/src/liferay-npm-bundler.config.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/__tests__/__snapshots__/index.test.ts.snap b/projects/js-toolkit/packages/npm-bundler/src/report/__tests__/__snapshots__/index.test.ts.snap similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/report/__tests__/__snapshots__/index.test.ts.snap rename to projects/js-toolkit/packages/npm-bundler/src/report/__tests__/__snapshots__/index.test.ts.snap diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/__tests__/index.test.ts b/projects/js-toolkit/packages/npm-bundler/src/report/__tests__/index.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/report/__tests__/index.test.ts rename to projects/js-toolkit/packages/npm-bundler/src/report/__tests__/index.test.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/html.ts b/projects/js-toolkit/packages/npm-bundler/src/report/html.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/report/html.ts rename to projects/js-toolkit/packages/npm-bundler/src/report/html.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/index.ts b/projects/js-toolkit/packages/npm-bundler/src/report/index.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/report/index.ts rename to projects/js-toolkit/packages/npm-bundler/src/report/index.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/report/logger.ts b/projects/js-toolkit/packages/npm-bundler/src/report/logger.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/report/logger.ts rename to projects/js-toolkit/packages/npm-bundler/src/report/logger.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/adaptStaticURLsAtRuntime.ts b/projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/adaptStaticURLsAtRuntime.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/adaptStaticURLsAtRuntime.ts rename to projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/adaptStaticURLsAtRuntime.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/exportModuleAsFunction.ts b/projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/exportModuleAsFunction.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/exportModuleAsFunction.ts rename to projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/exportModuleAsFunction.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/namespaceWepbackJsonp.ts b/projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/namespaceWepbackJsonp.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/namespaceWepbackJsonp.ts rename to projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/namespaceWepbackJsonp.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/transformImports.ts b/projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/transformImports.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/transform/js/operation/transformImports.ts rename to projects/js-toolkit/packages/npm-bundler/src/transform/js/operation/transformImports.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/text/operation/__tests__/replace.test.ts b/projects/js-toolkit/packages/npm-bundler/src/transform/text/operation/__tests__/replace.test.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/transform/text/operation/__tests__/replace.test.ts rename to projects/js-toolkit/packages/npm-bundler/src/transform/text/operation/__tests__/replace.test.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/transform/text/operation/replace.ts b/projects/js-toolkit/packages/npm-bundler/src/transform/text/operation/replace.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/transform/text/operation/replace.ts rename to projects/js-toolkit/packages/npm-bundler/src/transform/text/operation/replace.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/abort.ts b/projects/js-toolkit/packages/npm-bundler/src/util/abort.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/util/abort.ts rename to projects/js-toolkit/packages/npm-bundler/src/util/abort.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/files.ts b/projects/js-toolkit/packages/npm-bundler/src/util/files.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/util/files.ts rename to projects/js-toolkit/packages/npm-bundler/src/util/files.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/log.ts b/projects/js-toolkit/packages/npm-bundler/src/util/log.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/util/log.ts rename to projects/js-toolkit/packages/npm-bundler/src/util/log.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/renderer.ts b/projects/js-toolkit/packages/npm-bundler/src/util/renderer.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/util/renderer.ts rename to projects/js-toolkit/packages/npm-bundler/src/util/renderer.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/util/run.ts b/projects/js-toolkit/packages/npm-bundler/src/util/run.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/util/run.ts rename to projects/js-toolkit/packages/npm-bundler/src/util/run.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/src/webpack/loader/imports-loader.ts b/projects/js-toolkit/packages/npm-bundler/src/webpack/loader/imports-loader.ts similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/src/webpack/loader/imports-loader.ts rename to projects/js-toolkit/packages/npm-bundler/src/webpack/loader/imports-loader.ts diff --git a/projects/js-toolkit/packages/liferay-npm-bundler/tsconfig.json b/projects/js-toolkit/packages/npm-bundler/tsconfig.json similarity index 100% rename from projects/js-toolkit/packages/liferay-npm-bundler/tsconfig.json rename to projects/js-toolkit/packages/npm-bundler/tsconfig.json From 0b9333e8b7493f3a1e13e7ee47951e152e8e7874 Mon Sep 17 00:00:00 2001 From: Greg Hurrell Date: Tue, 13 Oct 2020 18:38:37 +0200 Subject: [PATCH 2/3] refactor(js-toolkit): update .yarnrc for npm-bundler To ensure it gets the right tag name when released under our named scope. --- projects/js-toolkit/packages/npm-bundler/.yarnrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/js-toolkit/packages/npm-bundler/.yarnrc b/projects/js-toolkit/packages/npm-bundler/.yarnrc index 000b7a1370..4f433fe69f 100644 --- a/projects/js-toolkit/packages/npm-bundler/.yarnrc +++ b/projects/js-toolkit/packages/npm-bundler/.yarnrc @@ -1,3 +1,3 @@ # Make `yarn version` produce the right commit message and tag for this package. -version-tag-prefix "liferay-npm-bundler/v" -version-git-message "chore: prepare liferay-npm-bundler/v%s release" +version-tag-prefix "npm-bundler/v" +version-git-message "chore: prepare @liferay/npm-bundler v%s release" From 0eb88ce696dc033314ba00914e4ece65ac1ac837 Mon Sep 17 00:00:00 2001 From: Greg Hurrell Date: Tue, 13 Oct 2020 18:50:07 +0200 Subject: [PATCH 3/3] refactor(js-toolkit): update internal references to npm-bundler --- projects/js-toolkit/CONTRIBUTING.md | 4 ++-- .../js-toolkit/packages/generator-js/src/adapt/index.ts | 4 ++-- .../packages/generator-js/src/facet-project/index.ts | 4 +++- .../src/facet-project/templates/package.json.ejs | 2 +- .../packages/js-toolkit-core/src/project/Probe.ts | 6 +++--- .../packages/js-toolkit-core/src/project/Project.ts | 2 +- .../js-toolkit-core/src/project/__tests__/Project.test.ts | 7 ++++--- .../js-toolkit-scripts/src/scripts/create-jar/index.ts | 2 +- projects/js-toolkit/packages/npm-bundler/README.md | 2 +- projects/js-toolkit/packages/npm-bundler/package.json | 4 ++-- projects/js-toolkit/packages/npm-bundler/src/index.ts | 2 +- .../js-toolkit/qa/samples/packages/react-app/package.json | 2 +- projects/js-toolkit/scripts/qa/resources.js | 3 ++- 13 files changed, 24 insertions(+), 20 deletions(-) diff --git a/projects/js-toolkit/CONTRIBUTING.md b/projects/js-toolkit/CONTRIBUTING.md index c8f20e9208..5832a0696d 100644 --- a/projects/js-toolkit/CONTRIBUTING.md +++ b/projects/js-toolkit/CONTRIBUTING.md @@ -119,7 +119,7 @@ yarn ci # start again. Otherwise... # Change to the directory of the package you wish to publish: -cd packages/liferay-npm-bundler +cd packages/npm-bundler # Update the changelog: npx @liferay/changelog-generator --version=3.0.0 @@ -143,7 +143,7 @@ Copy the relevant section from the changelog to the corresponding entry on the [ After the release, you can confirm that the packages are correctly listed in the NPM registry: - https://www.npmjs.com/package/@liferay/js-toolkit-core -- https://www.npmjs.com/package/liferay-npm-bundler +- https://www.npmjs.com/package/@liferay/npm-bundler ## Releasing pre-release versions diff --git a/projects/js-toolkit/packages/generator-js/src/adapt/index.ts b/projects/js-toolkit/packages/generator-js/src/adapt/index.ts index 07d0491a4a..66dcddfb98 100644 --- a/projects/js-toolkit/packages/generator-js/src/adapt/index.ts +++ b/projects/js-toolkit/packages/generator-js/src/adapt/index.ts @@ -291,8 +291,8 @@ export default class extends Generator { getSDKVersion('liferay-npm-build-support', {ignoreConfig: true}) ); pkgJson.addDevDependency( - 'liferay-npm-bundler', - getSDKVersion('liferay-npm-bundler', {ignoreConfig: true}) + '@liferay/npm-bundler', + getSDKVersion('@liferay/npm-bundler', {ignoreConfig: true}) ); pkgJson.addDevDependency( `liferay-npm-bundler-preset-${preset}`, diff --git a/projects/js-toolkit/packages/generator-js/src/facet-project/index.ts b/projects/js-toolkit/packages/generator-js/src/facet-project/index.ts index 5085066c77..4123c30c7b 100644 --- a/projects/js-toolkit/packages/generator-js/src/facet-project/index.ts +++ b/projects/js-toolkit/packages/generator-js/src/facet-project/index.ts @@ -49,7 +49,9 @@ export default class extends Generator { const cp = new Copier(this); const context = { - liferayNpmBuildSupportVersion: getSDKVersion('liferay-npm-bundler'), + liferayNpmBuildSupportVersion: getSDKVersion( + '@liferay/npm-bundler' + ), liferayNpmBundlerVersion: getSDKVersion( 'liferay-npm-build-support' ), diff --git a/projects/js-toolkit/packages/generator-js/src/facet-project/templates/package.json.ejs b/projects/js-toolkit/packages/generator-js/src/facet-project/templates/package.json.ejs index d9b9f2906a..e3b04f2f60 100644 --- a/projects/js-toolkit/packages/generator-js/src/facet-project/templates/package.json.ejs +++ b/projects/js-toolkit/packages/generator-js/src/facet-project/templates/package.json.ejs @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "<%= description %>", "devDependencies": { - "liferay-npm-bundler": "<%= liferayNpmBundlerVersion %>", + "@liferay/npm-bundler": "<%= liferayNpmBundlerVersion %>", "liferay-npm-build-support": "<%= liferayNpmBuildSupportVersion %>" }, "dependencies": {}, diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts index 0050a957b1..1188a8dacd 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/project/Probe.ts @@ -42,11 +42,11 @@ export default class Probe { return ProjectType.LIFERAY_FRAGMENT; } - // This must go last, as all other types have liferay-npm-bundler as - // dependency + // This must go last, as all other types have (or may have) + // @liferay/npm-bundler as dependency. if ( - this._hasDependency('liferay-npm-bundler') || + this._hasDependency('@liferay/npm-bundler') || this._hasDependency('@liferay/js-toolkit-scripts') || this._hasScriptCalling('js-toolkit') ) { diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/project/Project.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/Project.ts index 9889c8fe57..468f8b2e03 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/project/Project.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/project/Project.ts @@ -330,7 +330,7 @@ export default class Project { // Get bundler and me versions - putInMap('liferay-npm-bundler'); + putInMap('@liferay/npm-bundler'); putInMap(path.join(__dirname, '../..')); // Get preset version diff --git a/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.ts b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.ts index d987c3972c..2de6b06c09 100644 --- a/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.ts +++ b/projects/js-toolkit/packages/js-toolkit-core/src/project/__tests__/Project.test.ts @@ -372,9 +372,9 @@ describe('project.versionsInfo', () => { }, ], [ - 'liferay-npm-bundler', + '@liferay/npm-bundler', { - version: require(`../../../../../../../node_modules/liferay-npm-bundler/package.json`) + version: require(`../../../../../../../node_modules/@liferay/npm-bundler/package.json`) .version, path: path.join( '..', @@ -388,7 +388,8 @@ describe('project.versionsInfo', () => { '..', '..', 'node_modules', - 'liferay-npm-bundler' + '@liferay', + 'npm-bundler' ), }, ], diff --git a/projects/js-toolkit/packages/js-toolkit-scripts/src/scripts/create-jar/index.ts b/projects/js-toolkit/packages/js-toolkit-scripts/src/scripts/create-jar/index.ts index 273a6a79ba..d7c610d786 100644 --- a/projects/js-toolkit/packages/js-toolkit-scripts/src/scripts/create-jar/index.ts +++ b/projects/js-toolkit/packages/js-toolkit-scripts/src/scripts/create-jar/index.ts @@ -116,7 +116,7 @@ function addLocalizationFiles(zip: JSZip): void { function addManifest(zip: JSZip): void { let contents = ''; - const bundlerVersion = project.versionsInfo.get('liferay-npm-bundler') + const bundlerVersion = project.versionsInfo.get('@liferay/npm-bundler') .version; contents += `Manifest-Version: 1.0\n`; diff --git a/projects/js-toolkit/packages/npm-bundler/README.md b/projects/js-toolkit/packages/npm-bundler/README.md index cb050f1776..376a7006ce 100644 --- a/projects/js-toolkit/packages/npm-bundler/README.md +++ b/projects/js-toolkit/packages/npm-bundler/README.md @@ -1,3 +1,3 @@ -# liferay-npm-bundler +# @liferay/npm-bundler A tool to process a Liferay widget project to produce an OSGi bundle containing the needed npm dependencies so that it can be run when deployed to the Portal. diff --git a/projects/js-toolkit/packages/npm-bundler/package.json b/projects/js-toolkit/packages/npm-bundler/package.json index 04e3a7b9c8..474937ae3d 100644 --- a/projects/js-toolkit/packages/npm-bundler/package.json +++ b/projects/js-toolkit/packages/npm-bundler/package.json @@ -23,9 +23,9 @@ "description": "A CLI utility to bundle NPM dependencies of a Liferay OSGi bundle.", "license": "LGPL-3.0", "main": "lib/index.js", - "name": "liferay-npm-bundler", + "name": "@liferay/npm-bundler", "repository": { - "directory": "projects/js-toolkit/packages/liferay-npm-bundler", + "directory": "projects/js-toolkit/packages/npm-bundler", "type": "git", "url": "https://github.com/liferay/liferay-frontend-projects.git" }, diff --git a/projects/js-toolkit/packages/npm-bundler/src/index.ts b/projects/js-toolkit/packages/npm-bundler/src/index.ts index 85a062ac73..8128e4fa6e 100644 --- a/projects/js-toolkit/packages/npm-bundler/src/index.ts +++ b/projects/js-toolkit/packages/npm-bundler/src/index.ts @@ -15,7 +15,7 @@ import report from './report'; import abort from './util/abort'; import * as log from './util/log'; -/** Default entry point for the liferay-npm-bundler */ +/** Default entry point for the liferay-npm-bundler executable. */ export default async function (argv: {version: boolean}): Promise { if (argv.version) { const {versionsInfo} = project; diff --git a/projects/js-toolkit/qa/samples/packages/react-app/package.json b/projects/js-toolkit/qa/samples/packages/react-app/package.json index d37a027308..a5b3c84b5e 100644 --- a/projects/js-toolkit/qa/samples/packages/react-app/package.json +++ b/projects/js-toolkit/qa/samples/packages/react-app/package.json @@ -34,8 +34,8 @@ ] }, "devDependencies": { + "@liferay/npm-bundler": "^3.0.0", "liferay-npm-build-support": "^3.0.0", - "liferay-npm-bundler": "^3.0.0", "liferay-npm-bundler-preset-create-react-app": "^3.0.0" }, "portlet": { diff --git a/projects/js-toolkit/scripts/qa/resources.js b/projects/js-toolkit/scripts/qa/resources.js index db9a8f6df3..36a537616f 100644 --- a/projects/js-toolkit/scripts/qa/resources.js +++ b/projects/js-toolkit/scripts/qa/resources.js @@ -17,7 +17,8 @@ const {version: currentSDKVersion} = require(path.join( '..', '..', 'packages', - 'liferay-npm-bundler', + '@liferay', + 'npm-bundler', 'package.json' ));