Skip to content
GitLab
Commit bd7e0598 authored by Jasper Koehorst's avatar Jasper Koehorst
Browse files

cleaning

parent 35d330e8
Pipeline #36032 failed with stage
in 2 minutes and 10 seconds
Expand all Hide whitespace changes
Inline Side-by-side
package-lock.json
View file @ bd7e0598
This diff is collapsed.
package.json
View file @ bd7e0598
{
"name": "no-name",
"license": "UNLICENSED",
"dependencies": {
"@polymer/iron-a11y-announcer": "3.0.2",
"@polymer/iron-a11y-keys-behavior": "3.0.1",
"@polymer/iron-fit-behavior": "3.0.2",
"@polymer/iron-flex-layout": "3.0.1",
"@polymer/iron-icon": "3.0.1",
"@polymer/iron-iconset-svg": "3.0.1",
"@polymer/iron-list": "3.1.0",
"@polymer/iron-media-query": "3.0.1",
"@polymer/iron-meta": "3.0.1",
"@polymer/iron-overlay-behavior": "3.0.3",
"@polymer/iron-resizable-behavior": "3.0.1",
"@polymer/iron-scroll-target-behavior": "3.0.1",
"@polymer/polymer": "3.2.0",
"@vaadin/vaadin-accordion": "1.2.0",
"@vaadin/vaadin-app-layout": "2.2.0",
"@vaadin/vaadin-avatar": "1.0.4",
"@vaadin/vaadin-board": "2.2.0",
"@vaadin/vaadin-button": "2.4.0",
"@vaadin/vaadin-charts": "6.3.3",
"@vaadin/vaadin-checkbox": "2.5.1",
"@vaadin/vaadin-combo-box": "5.4.8",
"@vaadin/vaadin-confirm-dialog": "1.3.0",
"@vaadin/vaadin-context-menu": "4.5.0",
"@vaadin/vaadin-control-state-mixin": "2.2.4",
"@vaadin/vaadin-cookie-consent": "1.2.0",
"@vaadin/vaadin-core-shrinkwrap": "14.7.3",
"@vaadin/vaadin-crud": "1.3.1",
"@vaadin/vaadin-custom-field": "1.3.1",
"@vaadin/vaadin-date-picker": "4.4.1",
"@vaadin/vaadin-date-time-picker": "1.4.0",
"@vaadin/vaadin-details": "1.2.0",
"@vaadin/vaadin-development-mode-detector": "2.0.4",
"@vaadin/vaadin-dialog": "2.5.2",
"@vaadin/vaadin-element-mixin": "2.4.2",
"@vaadin/vaadin-form-layout": "2.3.0",
"@vaadin/vaadin-grid": "5.8.4",
"@vaadin/vaadin-grid-pro": "2.3.0",
"@vaadin/vaadin-icons": "4.3.2",
"@vaadin/vaadin-item": "2.3.0",
"@vaadin/vaadin-list-box": "1.4.0",
"@vaadin/vaadin-list-mixin": "2.5.1",
"@vaadin/vaadin-login": "1.2.0",
"@vaadin/vaadin-lumo-styles": "1.6.1",
"@vaadin/vaadin-material-styles": "1.3.2",
"@vaadin/vaadin-menu-bar": "1.2.2",
"@vaadin/vaadin-messages": "1.0.1",
"@vaadin/vaadin-notification": "1.6.1",
"@vaadin/vaadin-ordered-layout": "1.4.0",
"@vaadin/vaadin-overlay": "3.5.1",
"@vaadin/vaadin-progress-bar": "1.3.0",
"@vaadin/vaadin-radio-button": "1.5.4",
"@vaadin/vaadin-rich-text-editor": "1.3.1",
"@vaadin/vaadin-select": "2.4.1",
"@vaadin/vaadin-split-layout": "4.3.0",
"@vaadin/vaadin-tabs": "3.2.0",
"@vaadin/vaadin-text-field": "2.8.6",
"@vaadin/vaadin-themable-mixin": "1.6.2",
"@vaadin/vaadin-time-picker": "2.4.0",
"@vaadin/vaadin-upload": "4.4.2",
"@vaadin/vaadin-usage-statistics": "2.1.0",
"@webcomponents/shadycss": "1.8.0",
"@webcomponents/webcomponentsjs": "^2.2.10",
"construct-style-sheets-polyfill": "2.4.16",
"lit-element": "2.5.1",
"lit-html": "1.4.1"
},
"devDependencies": {
"babel-loader": "8.2.2",
"chokidar": "^3.5.0",
"compression-webpack-plugin": "4.0.1",
"copy-webpack-plugin": "5.1.2",
"css-loader": "4.2.1",
"extra-watch-webpack-plugin": "1.0.3",
"extract-loader": "5.1.0",
"file-loader": "6.1.0",
"html-webpack-plugin": "4.5.2",
"lit-css-loader": "0.0.4",
"raw-loader": "3.1.0",
"ts-loader": "8.0.12",
"typescript": "4.0.3",
"webpack": "4.42.0",
"webpack-babel-multi-target-plugin": "2.5.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.2"
},
"vaadin": {
"dependencies": {
"@polymer/iron-a11y-announcer": "3.0.2",
......@@ -54,7 +141,7 @@
"@vaadin/vaadin-overlay": "3.5.1",
"@vaadin/vaadin-progress-bar": "1.3.0",
"@vaadin/vaadin-radio-button": "1.5.4",
"@vaadin/vaadin-rich-text-editor": "1.3.0",
"@vaadin/vaadin-rich-text-editor": "1.3.1",
"@vaadin/vaadin-select": "2.4.1",
"@vaadin/vaadin-split-layout": "4.3.0",
"@vaadin/vaadin-tabs": "3.2.0",
......@@ -89,93 +176,6 @@
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.2"
},
"hash": "025619f43d07b9298a4ab29162b4ad8ab5773e0519593e770440e059a2542f7f"
},
"dependencies": {
"@polymer/iron-a11y-announcer": "3.0.2",
"@polymer/iron-a11y-keys-behavior": "3.0.1",
"@polymer/iron-fit-behavior": "3.0.2",
"@polymer/iron-flex-layout": "3.0.1",
"@polymer/iron-icon": "3.0.1",
"@polymer/iron-iconset-svg": "3.0.1",
"@polymer/iron-list": "3.1.0",
"@polymer/iron-media-query": "3.0.1",
"@polymer/iron-meta": "3.0.1",
"@polymer/iron-overlay-behavior": "3.0.3",
"@polymer/iron-resizable-behavior": "3.0.1",
"@polymer/iron-scroll-target-behavior": "3.0.1",
"@polymer/polymer": "3.2.0",
"@vaadin/vaadin-accordion": "1.2.0",
"@vaadin/vaadin-app-layout": "2.2.0",
"@vaadin/vaadin-avatar": "1.0.4",
"@vaadin/vaadin-board": "2.2.0",
"@vaadin/vaadin-button": "2.4.0",
"@vaadin/vaadin-charts": "6.3.3",
"@vaadin/vaadin-checkbox": "2.5.1",
"@vaadin/vaadin-combo-box": "5.4.8",
"@vaadin/vaadin-confirm-dialog": "1.3.0",
"@vaadin/vaadin-context-menu": "4.5.0",
"@vaadin/vaadin-control-state-mixin": "2.2.4",
"@vaadin/vaadin-cookie-consent": "1.2.0",
"@vaadin/vaadin-core-shrinkwrap": "14.7.3",
"@vaadin/vaadin-crud": "1.3.1",
"@vaadin/vaadin-custom-field": "1.3.1",
"@vaadin/vaadin-date-picker": "4.4.1",
"@vaadin/vaadin-date-time-picker": "1.4.0",
"@vaadin/vaadin-details": "1.2.0",
"@vaadin/vaadin-development-mode-detector": "2.0.4",
"@vaadin/vaadin-dialog": "2.5.2",
"@vaadin/vaadin-element-mixin": "2.4.2",
"@vaadin/vaadin-form-layout": "2.3.0",
"@vaadin/vaadin-grid": "5.8.4",
"@vaadin/vaadin-grid-pro": "2.3.0",
"@vaadin/vaadin-icons": "4.3.2",
"@vaadin/vaadin-item": "2.3.0",
"@vaadin/vaadin-list-box": "1.4.0",
"@vaadin/vaadin-list-mixin": "2.5.1",
"@vaadin/vaadin-login": "1.2.0",
"@vaadin/vaadin-lumo-styles": "1.6.1",
"@vaadin/vaadin-material-styles": "1.3.2",
"@vaadin/vaadin-menu-bar": "1.2.2",
"@vaadin/vaadin-messages": "1.0.1",
"@vaadin/vaadin-notification": "1.6.1",
"@vaadin/vaadin-ordered-layout": "1.4.0",
"@vaadin/vaadin-overlay": "3.5.1",
"@vaadin/vaadin-progress-bar": "1.3.0",
"@vaadin/vaadin-radio-button": "1.5.4",
"@vaadin/vaadin-rich-text-editor": "1.3.0",
"@vaadin/vaadin-select": "2.4.1",
"@vaadin/vaadin-split-layout": "4.3.0",
"@vaadin/vaadin-tabs": "3.2.0",
"@vaadin/vaadin-text-field": "2.8.6",
"@vaadin/vaadin-themable-mixin": "1.6.2",
"@vaadin/vaadin-time-picker": "2.4.0",
"@vaadin/vaadin-upload": "4.4.2",
"@vaadin/vaadin-usage-statistics": "2.1.0",
"@webcomponents/shadycss": "1.8.0",
"@webcomponents/webcomponentsjs": "^2.2.10",
"construct-style-sheets-polyfill": "2.4.16",
"lit-element": "2.5.1",
"lit-html": "1.4.1"
},
"devDependencies": {
"babel-loader": "8.2.2",
"chokidar": "^3.5.0",
"compression-webpack-plugin": "4.0.1",
"copy-webpack-plugin": "5.1.2",
"css-loader": "4.2.1",
"extra-watch-webpack-plugin": "1.0.3",
"extract-loader": "5.1.0",
"file-loader": "6.1.0",
"html-webpack-plugin": "4.5.2",
"lit-css-loader": "0.0.4",
"raw-loader": "3.1.0",
"ts-loader": "8.0.12",
"typescript": "4.0.3",
"webpack": "4.42.0",
"webpack-babel-multi-target-plugin": "2.5.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"webpack-merge": "4.2.2"
"hash": "c026424a89aa150aada71c0fce2135327cdd92025da4c8a55e6453aff50825d0"
}
}
\ No newline at end of file
}
pnpm-lock.yaml deleted 100644 → 0
View file @ 35d330e8
This diff is collapsed.
pnpmfile.js deleted 100644 → 0
View file @ 35d330e8
/**
* NOTICE: this is an auto-generated file
*
* This file has been generated for `pnpm install` task.
* It is used to pin client side dependencies.
* This file will be overwritten on every run.
*/
const fs = require('fs');
const versionsFile = require('path').resolve(__dirname, 'target/frontend/versions.json');
if (!fs.existsSync(versionsFile)) {
return;
}
const versions = JSON.parse(fs.readFileSync(versionsFile, 'utf-8'));
module.exports = {
hooks: {
readPackage
}
};
function readPackage(pkg) {
const {dependencies} = pkg;
if (dependencies) {
for (let k in versions) {
if (dependencies[k] && dependencies[k] !== versions[k]) {
pkg.dependencies[k] = versions[k];
}
}
}
// Forcing chokidar version for now until new babel version is available
// check out https://github.com/babel/babel/issues/11488
if (pkg.dependencies.chokidar) {
pkg.dependencies.chokidar = '^3.4.0';
}
return pkg;
}
webpack.config.js deleted 100644 → 0
View file @ 35d330e8
/**
* This file has been autogenerated as it didn't exist or was made for an older incompatible version.
* This file can be used for manual configuration will not be modified if the flowDefaults constant exists.
*/
const merge = require('webpack-merge');
const flowDefaults = require('./webpack.generated.js');
module.exports = merge(flowDefaults, {
});
/**
* This file can be used to configure the flow plugin defaults.
* <code>
* // Add a custom plugin
* flowDefaults.plugins.push(new MyPlugin());
*
* // Update the rules to also transpile `.mjs` files
* if (!flowDefaults.module.rules[0].test) {
* throw "Unexpected structure in generated webpack config";
* }
* flowDefaults.module.rules[0].test = /\.m?js$/
*
* // Include a custom JS in the entry point in addition to generated-flow-imports.js
* if (typeof flowDefaults.entry.index != "string") {
* throw "Unexpected structure in generated webpack config";
* }
* flowDefaults.entry.index = [flowDefaults.entry.index, "myCustomFile.js"];
* </code>
* or add new configuration in the merge block.
* <code>
* module.exports = merge(flowDefaults, {
* mode: 'development',
* devtool: 'inline-source-map'
* });
* </code>
*/
\ No newline at end of file
webpack.generated.js deleted 100644 → 0
View file @ 35d330e8
/**
* NOTICE: this is an auto-generated file
*
* This file has been generated by the `flow:prepare-frontend` maven goal.
* This file will be overwritten on every run. Any custom changes should be made to webpack.config.js
*/
const fs = require('fs');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const CompressionPlugin = require('compression-webpack-plugin');
const {BabelMultiTargetPlugin} = require('webpack-babel-multi-target-plugin');
const ExtraWatchWebpackPlugin = require('extra-watch-webpack-plugin');
// Flow plugins
const StatsPlugin = require('@vaadin/stats-plugin');
const ThemeLiveReloadPlugin = require('@vaadin/theme-live-reload-plugin');
const { ApplicationThemePlugin, processThemeResources, extractThemeName, findParentThemes } = require('@vaadin/application-theme-plugin');
const path = require('path');
const baseDir = path.resolve(__dirname);
// the folder of app resources (main.js and flow templates)
// this matches /themes/my-theme/ and is used to check css url handling and file path build.
const themePartRegex = /(\\|\/)themes\1[\s\S]*?\1/;
const frontendFolder = require('path').resolve(__dirname, 'frontend');
const fileNameOfTheFlowGeneratedMainEntryPoint = require('path').resolve(__dirname, 'target/frontend/generated-flow-imports.js');
const mavenOutputFolderForFlowBundledFiles = require('path').resolve(__dirname, '');
const devmodeGizmoJS = '@vaadin/flow-frontend/VaadinDevmodeGizmo.js'
// public path for resources, must match Flow VAADIN_BUILD
const build = 'build';
// public path for resources, must match the request used in flow to get the /build/stats.json file
const config = 'config';
// folder for outputting index.js bundle, etc.
const buildFolder = `${mavenOutputFolderForFlowBundledFiles}/${build}`;
// folder for outputting stats.json
const confFolder = `${mavenOutputFolderForFlowBundledFiles}/${config}`;
// file which is used by flow to read templates for server `@Id` binding
const statsFile = `${confFolder}/stats.json`;
// Folders in the project which can contain static assets.
const projectStaticAssetsFolders = [
path.resolve(__dirname, 'src', 'main', 'resources', 'META-INF', 'resources'),
path.resolve(__dirname, 'src', 'main', 'resources', 'static'),
frontendFolder
];
const projectStaticAssetsOutputFolder = require('path').resolve(__dirname, '../VAADIN/static');
// Folders in the project which can contain application themes
const themeProjectFolders = projectStaticAssetsFolders.map((folder) =>
path.resolve(folder, 'themes')
);
// Target flow-fronted auto generated to be the actual target folder
const flowFrontendFolder = require('path').resolve(__dirname, 'target/frontend');
// make sure that build folder exists before outputting anything
const mkdirp = require('mkdirp');
const devMode = process.argv.find(v => v.indexOf('webpack-dev-server') >= 0);
!devMode && mkdirp(buildFolder);
mkdirp(confFolder);
let stats;
const transpile = !devMode || process.argv.find(v => v.indexOf('--transpile-es5') >= 0);
const watchDogPrefix = '--watchDogPort=';
let watchDogPort = devMode && process.argv.find(v => v.indexOf(watchDogPrefix) >= 0);
let client;
if (watchDogPort) {
watchDogPort = watchDogPort.substr(watchDogPrefix.length);
const runWatchDog = () => {
client = new require('net').Socket();
client.setEncoding('utf8');
client.on('error', function () {
console.log("Watchdog connection error. Terminating webpack process...");
client.destroy();
process.exit(0);
});
client.on('close', function () {
client.destroy();
runWatchDog();
});
client.connect(watchDogPort, 'localhost');
}
runWatchDog();
}
const flowFrontendThemesFolder = path.resolve(flowFrontendFolder, 'themes');
const frontendGeneratedFolder = path.resolve(frontendFolder, "generated");
const themeOptions = {
devMode: devMode,
// The following matches ./frontend/generated/theme.js
// and for theme in JAR that is copied to target/frontend/themes/
themeResourceFolder: flowFrontendThemesFolder,
themeProjectFolders: themeProjectFolders,
projectStaticAssetsOutputFolder: projectStaticAssetsOutputFolder,
frontendGeneratedFolder: frontendGeneratedFolder
};
let themeName = undefined;
let themeWatchFolders = undefined;
if (devMode) {
// Current theme name is being extracted from theme.js located in
// frontend/generated folder
themeName = extractThemeName(frontendGeneratedFolder);
const parentThemePaths = findParentThemes(themeName, themeOptions);
const currentThemeFolders = [...projectStaticAssetsFolders
.map((folder) => path.resolve(folder, "themes", themeName)),
path.resolve(flowFrontendThemesFolder, themeName)];
// Watch the components folders for component styles update in both
// current theme and parent themes. Other folders or CSS files except
// 'styles.css' should be referenced from `styles.css` anyway, so no need
// to watch them.
themeWatchFolders = [...currentThemeFolders, ...parentThemePaths]
.map((themeFolder) => path.resolve(themeFolder, "components"));
}
const processThemeResourcesCallback = (logger) => processThemeResources(themeOptions, logger);
exports = {
frontendFolder: `${frontendFolder}`,
buildFolder: `${buildFolder}`,
confFolder: `${confFolder}`
};
module.exports = {
mode: 'production',
context: frontendFolder,
entry: {
bundle: fileNameOfTheFlowGeneratedMainEntryPoint,
...(devMode && { gizmo: devmodeGizmoJS })
},
output: {
filename: `${build}/vaadin-[name]-[contenthash].cache.js`,
path: mavenOutputFolderForFlowBundledFiles,
publicPath: 'VAADIN/',
},
resolve: {
// Search for import 'x/y' inside these folders, used at least for importing an application theme
modules: [
'node_modules',
flowFrontendFolder,
...projectStaticAssetsFolders,
],
extensions: ['.ts', '.js'],
alias: {
Frontend: frontendFolder
}
},
devServer: {
// webpack-dev-server serves ./ , webpack-generated, and java webapp
contentBase: [mavenOutputFolderForFlowBundledFiles, 'src/main/webapp'],
after: function(app, server) {
app.get(`/stats.json`, function(req, res) {
res.json(stats);
});
app.get(`/stats.hash`, function(req, res) {
res.json(stats.hash.toString());
});
app.get(`/assetsByChunkName`, function(req, res) {
res.json(stats.assetsByChunkName);
});
app.get(`/stop`, function(req, res) {
// eslint-disable-next-line no-console
console.log("Stopped 'webpack-dev-server'");
process.exit(0);
});
}
},
module: {
rules: [
...(transpile ? [
{
test: /\.tsx?$/,
use: [ BabelMultiTargetPlugin.loader(), 'ts-loader' ],
}
] : [{
test: /\.tsx?$/,
use: ['ts-loader']
}]),
...(transpile ? [{ // Files that Babel has to transpile
test: /\.js$/,
use: [BabelMultiTargetPlugin.loader()]
}] : []),
{
test: /\.css$/i,
use: [
{
loader: 'css-loader',
options: {
url: (url, resourcePath) => {
// Only translate files from node_modules
const resolve = resourcePath.match(/(\\|\/)node_modules\1/)
&& fs.existsSync(path.resolve(path.dirname(resourcePath), url));
const themeResource = resourcePath.match(themePartRegex) && url.match(/^themes\/[\s\S]*?\//);
return resolve || themeResource;
},
// use theme-loader to also handle any imports in css files
importLoaders: 1
},
},
{
// theme-loader will change any url starting with './' to start with 'VAADIN/static' instead
// NOTE! this loader should be here so it's run before css-loader as loaders are applied Right-To-Left
loader: '@vaadin/theme-loader',
options: {
devMode: devMode
}
}
],
},
{
// File-loader only copies files used as imports in .js files or handled by css-loader
test: /\.(png|gif|jpg|jpeg|svg|eot|woff|woff2|otf|ttf)$/,
use: [{
loader: 'file-loader',
options: {
outputPath: 'static/',
name(resourcePath, resourceQuery) {
if (resourcePath.match(/(\\|\/)node_modules\1/)) {
return /(\\|\/)node_modules\1(?!.*node_modules)([\S]+)/.exec(resourcePath)[2].replace(/\\/g, "/");
}
if (resourcePath.match(/(\\|\/)frontend\1/)) {
return /(\\|\/)frontend\1(?!.*frontend)([\S]+)/.exec(resourcePath)[2].replace(/\\/g, "/");
}
return '[path][name].[ext]';
}
}
}],
},
]
},
performance: {
maxEntrypointSize: 2097152, // 2MB
maxAssetSize: 2097152 // 2MB
},
plugins: [
// Generate compressed bundles when not devMode
...(devMode ? [] : [new CompressionPlugin()]),
// Transpile with babel, and produce different bundles per browser
...(transpile ? [new BabelMultiTargetPlugin({
babel: {
plugins: [
// workaround for Safari 10 scope issue (https://bugs.webkit.org/show_bug.cgi?id=159270)
"@babel/plugin-transform-block-scoping",
// Edge does not support spread '...' syntax in object literals (#7321)
"@babel/plugin-proposal-object-rest-spread"
],
presetOptions: {
useBuiltIns: false // polyfills are provided from webcomponents-loader.js
}
},
targets: {
'es6': { // Evergreen browsers
browsers: [
// It guarantees that babel outputs pure es6 in bundle and in stats.json
// In the case of browsers no supporting certain feature it will be
// covered by the webcomponents-loader.js
'last 1 Chrome major versions'
],
},
'es5': { // IE11
browsers: [
'ie 11'
],
tagAssetsWithKey: true, // append a suffix to the file name
}
}
})] : []),
new ApplicationThemePlugin(themeOptions),
...(devMode && themeName ? [new ExtraWatchWebpackPlugin({
files: [],
dirs: themeWatchFolders
}), new ThemeLiveReloadPlugin(processThemeResourcesCallback)] : []),
new StatsPlugin({
devMode: devMode,
statsFile: statsFile,
setResults: function (statsFile) {
stats = statsFile;
}
}),
// Generates the stats file for flow `@Id` binding.
function (compiler) {
compiler.hooks.done.tapAsync('FlowIdPlugin', (compilation, done) => {
// trigger live reload via server