Merge pull request #1176 from bryceosterhaus/LPS-196042

fix(js-toolkit): add warnings for when creating, building, and deploying projects within a liferay workspace

projects/js-toolkit/packages/js-toolkit-core/src/index.ts

@@ -34,9 +34,7 @@ export {default as Project} from './project/liferayCli/Project';
 export {
 	Bundler2BuildOptions,
 	CustomElementBuildOptions,
-	FDSCellRendererBuildOptions,
 	MinifiableBuildOptions,
-	ThemeSpritemapBuildOptions,
 	WebpackBuildOptions,
 } from './project/liferayCli/Build';
 
@@ -73,8 +71,6 @@ export type {
 	AnyTypedBuildConfig,
 	Bundler2BuildConfig,
 	CustomElementBuildConfig,
-	FDSCellRendererBuildConfig,
-	ThemeSpritemapBuildConfig,
 	TypedBuildConfig,
 } from './schema/LiferayJson';
 

projects/js-toolkit/packages/js-toolkit-core/src/project/liferayCli/Build.ts

@@ -9,23 +9,13 @@ import FilePath from '../../file/FilePath';
 import LiferayJson, {
 	Bundler2BuildConfig,
 	CustomElementBuildConfig,
-	FDSCellRendererBuildConfig,
-	ThemeSpritemapBuildConfig,
 } from '../../schema/LiferayJson';
 import Project from './Project';
 import persist, {Location} from './persist';
 
-type BuildType =
-	| 'bundler2'
-	| 'customElement'
-	| 'fdsCellRenderer'
-	| 'themeSpritemap';
+type BuildType = 'bundler2' | 'customElement';
 
-type BuildOptions =
-	| Bundler2BuildOptions
-	| CustomElementBuildOptions
-	| FDSCellRendererBuildOptions
-	| ThemeSpritemapBuildOptions;
+type BuildOptions = Bundler2BuildOptions | CustomElementBuildOptions;
 
 export type Bundler2BuildOptions = MinifiableBuildOptions;
 
@@ -34,13 +24,6 @@ export interface CustomElementBuildOptions extends WebpackBuildOptions {
 	portletCategoryName: string;
 }
 
-export type FDSCellRendererBuildOptions = WebpackBuildOptions;
-
-export interface ThemeSpritemapBuildOptions {
-	enableSVG4Everybody: boolean;
-	extendClay: boolean;
-}
-
 export interface MinifiableBuildOptions {
 	minify: boolean;
 }
@@ -69,22 +52,6 @@ export default class Build {
 				);
 				break;
 
-			case 'fdsCellRenderer':
-				this.type = 'fdsCellRenderer';
-				this.dir = project.dir.join('build');
-				this.options = this._toFDSCellRendererBuildOptions(
-					liferayJson.build?.options
-				);
-				break;
-
-			case 'themeSpritemap':
-				this.type = 'themeSpritemap';
-				this.dir = project.dir.join('build');
-				this.options = this._toThemeSpriteMapBuildOptions(
-					liferayJson.build?.options
-				);
-				break;
-
 			case 'bundler2': {
 				const {
 					default: bundler2Project,
@@ -179,26 +146,6 @@ export default class Build {
 		};
 	}
 
-	private _toFDSCellRendererBuildOptions(
-		config: FDSCellRendererBuildConfig
-	): FDSCellRendererBuildOptions {
-		const webpackOptions = this._toWebpackBuildOptions(config);
-
-		return {
-			externals: webpackOptions.externals,
-			minify: webpackOptions.minify,
-		};
-	}
-
-	private _toThemeSpriteMapBuildOptions(
-		config: ThemeSpritemapBuildConfig
-	): ThemeSpritemapBuildOptions {
-		return {
-			enableSVG4Everybody: !!config.enableSVG4Everybody,
-			extendClay: !!config.extendClay,
-		};
-	}
-
 	private _toBundler2BuildOptions(
 		_config: Bundler2BuildConfig
 	): Bundler2BuildOptions {
@@ -208,7 +155,7 @@ export default class Build {
 	}
 
 	private _toWebpackBuildOptions(
-		config: CustomElementBuildConfig | FDSCellRendererBuildConfig
+		config: CustomElementBuildConfig
 	): WebpackBuildOptions {
 		const options: WebpackBuildOptions = {
 			externals: {},

projects/js-toolkit/packages/js-toolkit-core/src/project/liferayCli/Dist.ts

@@ -27,8 +27,6 @@ export default class Dist {
 			}
 
 			case 'customElement':
-			case 'fdsCellRenderer':
-			case 'themeSpritemap':
 				this.dir = project.dir.join('dist');
 				this.file = this.dir.join(`${project.dir.basename()}.zip`);
 				break;

projects/js-toolkit/packages/js-toolkit-core/src/schema/ClientExtensionConfigJson.ts

@@ -3,10 +3,7 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-export type ClientExtensionConfigJsonType =
-	| 'customElement'
-	| 'fdsCellRenderer'
-	| 'themeSpritemap';
+export type ClientExtensionConfigJsonType = 'customElement';
 
 export default interface ClientExtensionConfigJson {
 	[configurationPid: string]: {

projects/js-toolkit/packages/js-toolkit-core/src/schema/ClientExtensionYaml.ts

@@ -6,16 +6,14 @@
 import type {
 	Bundler2BuildConfig,
 	CustomElementBuildConfig,
-	ThemeSpritemapBuildConfig,
 } from './LiferayJson';
 
 export default interface ClientExtensionYaml
 	extends Bundler2BuildConfig,
-		CustomElementBuildConfig,
-		ThemeSpritemapBuildConfig {
+		CustomElementBuildConfig {
 	baseURL: string;
 	description: string;
 	name: string;
 	sourceCodeURL: string;
-	type: 'bundler2' | 'customElement' | 'themeSpritemap';
+	type: 'bundler2' | 'customElement';
 }

projects/js-toolkit/packages/js-toolkit-core/src/schema/LiferayJson.ts

@@ -15,9 +15,7 @@ export default interface LiferayJson {
 
 export type AnyTypedBuildConfig =
 	| TypedBundler2BuildConfig
-	| TypedCustomElementBuildConfig
-	| TypedFDSCellRendererBuildConfig
-	| TypedThemeSpritemapBuildConfig;
+	| TypedCustomElementBuildConfig;
 
 export interface TypedBuildConfig {
 	options: unknown;
@@ -41,22 +39,3 @@ export interface CustomElementBuildConfig {
 	htmlElementName?: string;
 	portletCategoryName?: string;
 }
-
-interface TypedFDSCellRendererBuildConfig extends TypedBuildConfig {
-	options: FDSCellRendererBuildConfig;
-	type: 'fdsCellRenderer';
-}
-
-export interface FDSCellRendererBuildConfig {
-	externals?: {[bareIdentifier: string]: string} | string[];
-}
-
-interface TypedThemeSpritemapBuildConfig extends TypedBuildConfig {
-	options: ThemeSpritemapBuildConfig;
-	type: 'themeSpritemap';
-}
-
-export interface ThemeSpritemapBuildConfig {
-	enableSVG4Everybody?: boolean;
-	extendClay?: boolean;
-}