Delete queries.json config linefor build configuration

Author: simonvbrae

bin/generate.js

@@ -50,22 +50,29 @@ if (args.h || args.help || args._.length > 1) {
     const settingsFile = args.s || path.join(__dirname, '..', 'settings.json');
     const outputFile = 'queries.json';
     compileSettings(queryDir, settingsFile, outputFile);
-
+    
     // Compile Web version
     const destinationPath = args.d || 'build';
     const mode = args.m || 'production';
     const baseURL = args.b || 'https://query.linkeddatafragments.org/';
     const webpackConfig = require(args.w ? path.resolve(process.cwd(), args.w) : '../webpack.config.js');
 
+    // Remove the location of queries.json which shouldn't be present in the build configuration.
+    webpackConfig[0].entry=webpackConfig[0].entry.filter(x => !x.endsWith('queries.json'));
+
     // Override the baseURL in the webpack config
     webpackConfig.baseURL.replace = baseURL;
-
+    
+    // Override the buildContext in the webpack config
+    webpackConfig.buildContext.dir = destinationPath;
+    
     for (const entry of webpackConfig) {
         entry.mode = mode;
         if (entry.output) {
             entry.output.path = path.resolve(process.cwd(), destinationPath);
         }
     }
+
     webpack(webpackConfig, (err, stats) => {
         if (err) {
             console.error(err.stack || err);
@@ -74,14 +81,15 @@ if (args.h || args.help || args._.length > 1) {
             }
             process.exit(1);
         }
-
+        
         console.error(stats.toString({ colors: true }));
         if (stats.hasErrors()) {
             process.exit(1);
         }
-
+        
         fs.unlinkSync('.tmp-comunica-engine.js');
     });
+
     if (fs.existsSync(path.join(process.cwd(), 'queries.json'))) {
         fs.renameSync(path.join(process.cwd(), 'queries.json'), path.join(process.cwd(), `${destinationPath}/queries.json`));
     };

package.json

@@ -54,7 +54,7 @@
     "lint": "eslint src/*.js",
     "dev-prod-ci": "comunica-compile-config config/config-default.json > .tmp-comunica-engine.js && ./bin/queries-to-json.js && webpack --config webpack.config.js --mode production",
     "dev-ci": "comunica-compile-config config/config-default.json > .tmp-comunica-engine.js && ./bin/queries-to-json.js && webpack --config webpack.config.js --mode development",
-    "dev-prod": "comunica-compile-config config/config-default.json > .tmp-comunica-engine.js && ./bin/queries-to-json.js && webpack serve --config webpack.config.js --mode production",
+    "dev-prod": "comunica-compile-config config/config-default.json > .tmp-comunica-engine.js && ./bin/queries-to-json.js && webpack serve --config webpack.config.dev.js --mode production",
     "dev": "comunica-compile-config config/config-default.json > .tmp-comunica-engine.js && ./bin/queries-to-json.js && webpack serve --config webpack.config.js --mode development",
     "build": "node ./bin/generate.js",
     "version": "manual-git-changelog onversion"

webpack.config.js

@@ -41,7 +41,7 @@ module.exports = [
       path.join(__dirname, './images/sparql.png'),
       path.join(__dirname, './favicon.ico'),
       path.join(__dirname, './solid-client-id.jsonld'),
-      path.join(process.cwd(), './queries.json'),
+      path.join(__dirname, './queries.json'),
     ],
     output: {
       filename: 'scripts/ldf-client-ui.min.js',