weboptimizer 4.0.99 → 4.0.100-1

package/dist/index.js

@@ -167,7 +167,12 @@ environment = eval('process.env')) => {
           for (const [chunkName, chunk] of Object.entries(configuration.injection.entry.normalized)) for (const moduleID of chunk) {
             const filePath = determineModuleFilePath(moduleID, configuration.module.aliases, configuration.module.replacements.normal, {
               file: configuration.extensions.file.internal
-            }, configuration.path.context, configuration.path.source.asset.base, configuration.path.ignore, configuration.module.directoryNames, configuration.package.main.fileNames, configuration.package.main.propertyNames, configuration.package.aliasPropertyNames, configuration.encoding);
+            }, configuration.path.context,
+            /*
+                NOTE: Module ids are already resolved
+                against the source asset base.
+            */
+            '', configuration.path.ignore, configuration.module.directoryNames, configuration.package.main.fileNames, configuration.package.main.propertyNames, configuration.package.aliasPropertyNames, configuration.encoding);
             let type = null;
             if (filePath) type = determineAssetType(filePath, configuration.buildContext.types, configuration.path);
             if (typeof type === 'string' && Object.prototype.hasOwnProperty.call(configuration.buildContext.types, type)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weboptimizer",
-  "version": "4.0.99",
+  "version": "4.0.100-1",
   "description": "A generic web optimizer, (module) bundler and development environment.",
   "keywords": [
     "webpack",
@@ -1377,7 +1377,7 @@
             "javaScript": "javaScript/",
             "template": "template/"
           },
-          "base": "source/",
+          "base": "src/",
           "test": "test/"
         },
         "target": {
@@ -1393,7 +1393,7 @@
             "javaScript": "javaScript/",
             "template": "template/"
           },
-          "base": "build/",
+          "base": "dist/",
           "manifest": "manifest.appcache",
           "public": "",
           "test": "./"

package/readme.md

@@ -184,7 +184,7 @@ default source, target, asset or build paths do it in your **package.json**:
         "manifest": "manifest.appcache",
         "target": {
             ...
-            "base": "build/",
+            "base": "dist/",
             ...
         },
         "tidyUp": ["crap"],

package/tsconfig.application.json

@@ -4,15 +4,15 @@
     "compilerOptions": {
         "declaration": false,
         "paths": {
-            "@asset/*": ["../../source/*"],
-            "@cascadingStyleSheet/*": ["../../source/cascadingStyleSheet/*"],
-            "@data/*": ["../../source/data/*"],
-            "@font/*": ["../../source/font/*"],
-            "@image/*": ["../../source/image/*"],
-            "@javaScript/*": ["../../source/javaScript/*"],
-            "@root/*": ["../../source/*"],
-            "@source/*": ["../../source/*"],
-            "@template/*": ["../../source/template/*"]
+            "@asset/*": ["../../src/*"],
+            "@cascadingStyleSheet/*": ["../../src/cascadingStyleSheet/*"],
+            "@data/*": ["../../src/data/*"],
+            "@font/*": ["../../src/font/*"],
+            "@image/*": ["../../src/image/*"],
+            "@javaScript/*": ["../../src/javaScript/*"],
+            "@root/*": ["../../src/*"],
+            "@source/*": ["../../src/*"],
+            "@template/*": ["../../src/template/*"]
         }
     },
 
@@ -20,10 +20,8 @@
         "../../*.ts", "../../*.tsx",
         "../../*/*.ts", "../../*/*.tsx",
 
-        "../../assets/source/**/*.ts", "../../assets/source/**/*.tsx",
         "../../assets/src/**/*.ts", "../../assets/src/**/*.tsx",
 
-        "../../source/**/*.ts", "../../source/**/*.tsx",
         "../../src/**/*.ts", "../../src/**/*.tsx",
 
         "../../test/*.ts", "../../test/*.tsx",

package/tsconfig.json

@@ -34,9 +34,7 @@
         "*/declarations.d.ts",
 
         "assets/src/**/*.ts", "/assets/src/**/*.tsx",
-        "assets/source/**/*.ts", "/assets/source/**/*.tsx",
 
-        "source/**/*.ts", "source/**/*.tsx",
         "src/**/*.ts", "src/**/*.tsx",
 
         "test/*.ts", "test/*.tsx",

package/tsconfig.library.json

@@ -20,10 +20,8 @@
         "../../*.ts", "../../*.tsx",
         "../../*/*.ts", "../../*/*.tsx",
 
-        "../../assets/source/**/*.ts", "../../assets/source/**/*.tsx",
         "../../assets/src/**/*.ts", "../../assets/src/**/*.tsx",
 
-        "../../source/**/*.ts", "../../source/**/*.tsx",
         "../../src/**/*.ts", "../../src/**/*.tsx",
 
         "../../test/*.ts", "../../test/*.tsx",