@lipemat/js-boilerplate 7.0.0-beta.2 → 7.0.0-beta.3

package/README.md

@@ -15,11 +15,11 @@ A zero configuration starting point for a React or non React app.
 yarn add @lipemat/js-boilerplate
 ```
 
-## Version 6
+## Version 7
 
-**Version 6 has many backward incompatibilities and should be updated with focus and thoroughness.**
+**Version 7 has some backward incompatibilities and should be updated with focus and thoroughness.**
 
-[Migration instructions are here.](https://github.com/lipemat/js-boilerplate/wiki/Version-6-Migration)
+[Migration instructions are here.](https://github.com/lipemat/js-boilerplate/wiki/Version-7-Migration)
 
 ## Usage
 Add the following to your package.json. (this may also be found in the `templates` directory.
@@ -142,9 +142,11 @@ in your `package.json` to have it transformed.
 If you are using https in your local environment, you may point to the certificates in your package.json like so:
 
 ```json
+{
   "certificates": {
-      "cert": "<path to -crt.pem file>",
-      "key": "<path to -key.pem file>"
+    "cert": "<path to -crt.pem file>",
+    "key": "<path to -key.pem file>"
   }
+}
 ```
 

package/config/webpack.dev.js

@@ -25,6 +25,9 @@ if ( configHelper.hasLocalOverride( 'tsconfig.json', true ) ) {
 		logger: {
 			devServer: false,
 		},
+		typescript: {
+			configFile: config.workingDirectory + '/tsconfig.json',
+		},
 	} ) );
 }
 
@@ -32,14 +35,14 @@ const entry = {
 	master: [
 		'webpack-dev-server/client?' + config.url + ':3000',
 		'webpack/hot/only-dev-server',
-		'./src/index.js',
+		config.workingDirectory + '/src/index.js',
 	],
 };
 
-// Loads an admin.js file if it exists @since 5.0.0
-if ( fs.existsSync( path.resolve( config.workingDirectory, './src/admin.js' ) ) ) {
+// Loads an admin.js file if it exists.
+if ( fs.existsSync( path.resolve( config.workingDirectory, '/src/admin.js' ) ) ) {
 	entry.admin = [ ...entry.master ];
-	entry.admin.splice( -1, 1, './src/admin.js' );
+	entry.admin.splice( -1, 1, config.workingDirectory + '/src/admin.js' );
 }
 
 module.exports = {

package/config/webpack.dist.js

@@ -12,14 +12,14 @@ const SriPlugin = require( 'webpack-subresource-integrity' );
 
 const entry = {
 	master: [
-		'./src/index.js',
+		config.workingDirectory + '/src/index.js',
 	],
 };
 
-// Loads an admin.js file if it exists @since 4.3.0
-if ( fs.existsSync( path.resolve( config.workingDirectory, './src/admin.js' ) ) ) {
+// Loads an admin.js file if it exists.
+if ( fs.existsSync( path.resolve( config.workingDirectory, '/src/admin.js' ) ) ) {
 	entry.admin = [ ...entry.master ];
-	entry.admin.splice( -1, 1, './src/admin.js' );
+	entry.admin.splice( -1, 1, config.workingDirectory + '/src/admin.js' );
 }
 
 module.exports = {
@@ -55,7 +55,7 @@ module.exports = {
 	output: {
 		path: path.resolve( config.workingDirectory, 'dist' ),
 		filename: '[name].js',
-		publicPath: config.theme_path + 'js/dist/',
+		publicPath: config.themeUrlPath + 'js/dist/',
 		chunkFilename: '[name].[chunkhash].js',
 		crossOriginLoading: 'anonymous',
 	},

package/helpers/package-config.js

@@ -6,8 +6,8 @@ const fs = require( 'fs' );
 const workingDirectory = fs.realpathSync( process.cwd() );
 
 let packageConfig = require( path.resolve( workingDirectory, 'package.json' ) );
-packageConfig.workingDirectory = workingDirectory;
-packageConfig.theme_path = packageConfig.theme_path || '/';
+packageConfig.workingDirectory = packageConfig.jsPath ? path.resolve( packageConfig.jsPath ) : workingDirectory;
+packageConfig.themeUrlPath = packageConfig.themeUrlPath || '/';
 packageConfig.url = packageConfig.url || 'http://localhost';
 packageConfig.root = packageConfig.root || './';
 packageConfig.regenerate_revision = packageConfig.regenerate_revision || false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lipemat/js-boilerplate",
-  "version": "7.0.0-beta.2",
+  "version": "7.0.0-beta.3",
   "description": "Dependencies and scripts for a no config JavaScript app",
   "engines": {
     "node": ">=14.17.6"

package/scripts/lint.js

@@ -1,3 +1,4 @@
 const eslint = require( 'eslint/lib/cli' );
+const packageConfig = require( '../helpers/package-config' );
 
-eslint.execute( [ '', '', 'src', '--fix', '--ext', '.tsx,.ts,.js,.jsx' ] );
+eslint.execute( [ '', '', packageConfig.workingDirectory + '/src', '--fix', '--ext', '.tsx,.ts,.js,.jsx' ] );