Unify package files for JS adapter (keycloak#9789)

adapters/oidc/js/.gitignore

@@ -1,2 +1,4 @@
 node
 node_modules
+dist/*
+!dist/*.d.ts

adapters/oidc/js/package.json

@@ -1,22 +1,43 @@
 {
-  "name": "keycloak-js-adapter",
-  "private": true,
+  "name": "keycloak-js",
+  "version": "${project.version}",
+  "description": "Keycloak Adapter",
+  "main": "dist/keycloak.js",
+  "module": "dist/keycloak.mjs",
+  "types": "dist/keycloak.d.ts",
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "rollup --config --configPlugin typescript"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/keycloak/keycloak"
+  },
+  "author": "Keycloak",
+  "license": "Apache-2.0",
+  "homepage": "https://www.keycloak.org",
+  "keywords": [
+    "keycloak",
+    "sso",
+    "oauth",
+    "oauth2",
+    "authentication"
+  ],
   "devDependencies": {
     "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-inject": "^4.0.3",
-    "@rollup/plugin-node-resolve": "^13.1.1",
+    "@rollup/plugin-inject": "^4.0.4",
+    "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-typescript": "^8.3.0",
-    "@types/node": "^17.0.5",
-    "rollup": "^2.62.0",
+    "@types/node": "^17.0.16",
+    "es6-promise": "^4.2.8",
+    "rollup": "^2.67.1",
     "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.5.4"
+    "typescript": "^4.5.5"
   },
   "dependencies": {
     "base64-js": "^1.5.1",
-    "es6-promise": "^4.2.8",
     "js-sha256": "^0.9.0"
   }
 }

adapters/oidc/js/pom.xml

@@ -29,7 +29,29 @@
 	<name>Keycloak JS Integration</name>
 
 	<build>
+		<resources>
+			<resource>
+				<directory>static</directory>
+			</resource>
+			<resource>
+				<directory>dist</directory>
+			</resource>
+		</resources>
 		<plugins>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>dist</directory>
+							<excludes>
+								<exclude>*.d.ts</exclude>
+							</excludes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>com.github.eirslett</groupId>
 				<artifactId>frontend-maven-plugin</artifactId>

adapters/oidc/js/rollup.config.ts

@@ -17,8 +17,8 @@ function defineOptions({
   name,
   amdId,
 }: DefineOptionsArgs): RollupOptions[] {
-  const sourceDir = "src/main/js";
-  const targetDir = "target/classes";
+  const sourceDir = "src";
+  const targetDir = "dist";
   const commonOptions: RollupOptions = {
     input: path.join(sourceDir, `${file}.js`),
     plugins: [commonjs(), nodeResolve()],

distribution/adapters/js-adapter-npm-zip/assembly.xml

@@ -25,7 +25,7 @@
 
     <files>
         <file>
-            <source>src/main/resources/package.json</source>
+            <source>../../../adapters/oidc/js/package.json</source>
             <outputDirectory>/</outputDirectory>
             <filtered>true</filtered>
         </file>

pom.xml

@@ -215,7 +215,7 @@
         <server.output.dir.version>${project.version}</server.output.dir.version>
 
         <!-- Frontend -->
-        <node.version>v16.13.1</node.version>
+        <node.version>v16.13.2</node.version>
     </properties>
 
     <url>http://keycloak.org</url>

themes/src/main/resources/theme/keycloak.v2/account/src/app/keycloak-service/keycloak.service.ts

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {KeycloakLoginOptions} from "../../../../../../../../../../adapters/oidc/js/src/main/resources/keycloak";
+import {KeycloakLoginOptions} from "../../../../../../../../../../adapters/oidc/js";
 
 declare const baseUrl: string;
 export type KeycloakClient = Keycloak.KeycloakInstance;

themes/src/main/resources/theme/keycloak.v2/account/src/tsconfig.json

@@ -15,8 +15,5 @@
   },
   "include": [
     "./app/**/*.ts?"
-  ],
-  "files": [
-    "../../../../../../../../adapters/oidc/js/src/main/resources/keycloak.d.ts"
   ]
 }