Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: move client side frontend resources to META-INF/frontend (#12128) #12161

Merged
merged 1 commit into from
Oct 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions flow-client/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"noUnusedLocals": true,
"noUnusedParameters": true,
"experimentalDecorators": true,
"outDir": "target/classes/META-INF/resources/frontend",
"outDir": "target/classes/META-INF/frontend",
"declaration": true,
"skipLibCheck": true
},
"include": [
"src/main/resources/META-INF/resources/frontend/**/*.ts"
"src/main/resources/META-INF/frontend/**/*.ts"
],
"exclude": []
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/*
* Copyright 2000-2021 Vaadin Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.vaadin.flow;

import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;

import org.junit.Assert;
import org.junit.Test;

import com.vaadin.flow.testutil.ChromeBrowserTest;

public class ClientResourceIT extends ChromeBrowserTest {

@Test
public void clientResourcesAreNotExposed() throws IOException {
assertResourceIsUnavailable("frontend/VaadinDevmodeGizmo.js.map");
assertResourceIsUnavailable("frontend/VaadinDevmodeGizmo.d.ts");
assertResourceIsUnavailable("frontend/VaadinDevmodeGizmo.js");
assertResourceIsUnavailable("frontend/VaadinDevmodeGizmo.ts");
}

private void assertResourceIsUnavailable(String path) throws IOException {
URL url = getResourceURL(path);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
int responseCode = connection.getResponseCode();
Assert.assertEquals(HttpURLConnection.HTTP_NOT_FOUND, responseCode);
}

private URL getResourceURL(String path) throws MalformedURLException {
String url = getRootURL() + "/" + path;
return new URL(url);
}
}