innetjs 2.0.8 → 2.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/bin/innet +8 -7
  2. package/helpers.d.ts +1 -1
  3. package/index.d.ts +3 -1
  4. package/index.es6.js +7 -6
  5. package/index.js +7 -6
  6. package/package.json +1 -1
package/bin/innet CHANGED
@@ -175,11 +175,11 @@ function getFile(file) {
175
175
  }
176
176
  return file;
177
177
  }
178
- function convertIndexFile(data, version) {
178
+ function convertIndexFile(data, version, baseUrl) {
179
179
  return __awaiter(this, void 0, void 0, function* () {
180
180
  return data
181
181
  .toString()
182
- .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
182
+ .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
183
183
  });
184
184
  }
185
185
  const reporter = (options, outputOptions, info) => {
@@ -201,7 +201,7 @@ const innetEnv = Object.keys(process.env).reduce((result, key) => {
201
201
  return result;
202
202
  }, {});
203
203
  class InnetJS {
204
- constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
204
+ constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
205
205
  this.projectFolder = path__default["default"].resolve(projectFolder);
206
206
  this.publicFolder = path__default["default"].resolve(publicFolder);
207
207
  this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -218,6 +218,7 @@ class InnetJS {
218
218
  this.port = port;
219
219
  this.proxy = proxy;
220
220
  this.api = api;
221
+ this.baseUrl = baseUrl;
221
222
  }
222
223
  // Methods
223
224
  init(appName, { template, force = false } = {}) {
@@ -336,7 +337,7 @@ class InnetJS {
336
337
  yield copyFiles(this.publicFolder, this.buildFolder);
337
338
  const data = yield fs.promises.readFile(this.publicIndexFile);
338
339
  const pkg = yield this.getPackage();
339
- yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
340
+ yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
340
341
  }
341
342
  }));
342
343
  if (pkg) {
@@ -365,7 +366,7 @@ class InnetJS {
365
366
  preserveEntrySignatures: 'strict',
366
367
  output: {
367
368
  dir: this.devBuildFolder,
368
- sourcemap: true
369
+ sourcemap: true,
369
370
  },
370
371
  plugins: [
371
372
  commonjs__default["default"](),
@@ -556,7 +557,7 @@ class InnetJS {
556
557
  app = express__default["default"]();
557
558
  const update = () => __awaiter(this, void 0, void 0, function* () {
558
559
  const data = yield fs.promises.readFile(this.publicIndexFile);
559
- yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
560
+ yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
560
561
  });
561
562
  fs__default["default"].watch(this.publicIndexFile, update);
562
563
  yield update();
@@ -615,7 +616,7 @@ class InnetJS {
615
616
  }
616
617
  }
617
618
 
618
- var version = "2.0.8";
619
+ var version = "2.0.9";
619
620
 
620
621
  require('dotenv').config();
621
622
  const innetJS = new InnetJS();
package/helpers.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /// <reference types="node" />
2
2
  import { FileSizeRender } from 'rollup-plugin-filesize';
3
3
  export declare function getFile(file: any): any;
4
- export declare function convertIndexFile(data: Buffer, version: string): Promise<string>;
4
+ export declare function convertIndexFile(data: Buffer, version: string, baseUrl: string): Promise<string>;
5
5
  export declare const reporter: FileSizeRender<string | Promise<string>>;
package/index.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  declare type Extensions = 'js' | 'ts' | 'tsx' | 'jsx';
2
2
  export default class InnetJS {
3
+ baseUrl: string;
3
4
  projectFolder: string;
4
5
  publicFolder: string;
5
6
  buildFolder: string;
@@ -18,8 +19,9 @@ export default class InnetJS {
18
19
  api: string;
19
20
  private projectExtension;
20
21
  private package;
21
- constructor({ projectFolder, publicFolder, buildFolder, srcFolder, sourcemap, cssModules, cssInJs, sslKey, sslCrt, proxy, port, api, }?: {
22
+ constructor({ projectFolder, baseUrl, publicFolder, buildFolder, srcFolder, sourcemap, cssModules, cssInJs, sslKey, sslCrt, proxy, port, api, }?: {
22
23
  projectFolder?: string;
24
+ baseUrl?: string;
23
25
  publicFolder?: string;
24
26
  buildFolder?: string;
25
27
  srcFolder?: string;
package/index.es6.js CHANGED
@@ -145,11 +145,11 @@ function getFile(file) {
145
145
  }
146
146
  return file;
147
147
  }
148
- function convertIndexFile(data, version) {
148
+ function convertIndexFile(data, version, baseUrl) {
149
149
  return __awaiter(this, void 0, void 0, function* () {
150
150
  return data
151
151
  .toString()
152
- .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
152
+ .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
153
153
  });
154
154
  }
155
155
  const reporter = (options, outputOptions, info) => {
@@ -171,7 +171,7 @@ const innetEnv = Object.keys(process.env).reduce((result, key) => {
171
171
  return result;
172
172
  }, {});
173
173
  class InnetJS {
174
- constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
174
+ constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
175
175
  this.projectFolder = path$1.resolve(projectFolder);
176
176
  this.publicFolder = path$1.resolve(publicFolder);
177
177
  this.buildFolder = path$1.resolve(buildFolder);
@@ -188,6 +188,7 @@ class InnetJS {
188
188
  this.port = port;
189
189
  this.proxy = proxy;
190
190
  this.api = api;
191
+ this.baseUrl = baseUrl;
191
192
  }
192
193
  // Methods
193
194
  init(appName, { template, force = false } = {}) {
@@ -306,7 +307,7 @@ class InnetJS {
306
307
  yield copyFiles(this.publicFolder, this.buildFolder);
307
308
  const data = yield promises.readFile(this.publicIndexFile);
308
309
  const pkg = yield this.getPackage();
309
- yield promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
310
+ yield promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
310
311
  }
311
312
  }));
312
313
  if (pkg) {
@@ -335,7 +336,7 @@ class InnetJS {
335
336
  preserveEntrySignatures: 'strict',
336
337
  output: {
337
338
  dir: this.devBuildFolder,
338
- sourcemap: true
339
+ sourcemap: true,
339
340
  },
340
341
  plugins: [
341
342
  commonjs(),
@@ -526,7 +527,7 @@ class InnetJS {
526
527
  app = express();
527
528
  const update = () => __awaiter(this, void 0, void 0, function* () {
528
529
  const data = yield promises.readFile(this.publicIndexFile);
529
- yield promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
530
+ yield promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
530
531
  });
531
532
  fs.watch(this.publicIndexFile, update);
532
533
  yield update();
package/index.js CHANGED
@@ -173,11 +173,11 @@ function getFile(file) {
173
173
  }
174
174
  return file;
175
175
  }
176
- function convertIndexFile(data, version) {
176
+ function convertIndexFile(data, version, baseUrl) {
177
177
  return __awaiter(this, void 0, void 0, function* () {
178
178
  return data
179
179
  .toString()
180
- .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
180
+ .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
181
181
  });
182
182
  }
183
183
  const reporter = (options, outputOptions, info) => {
@@ -199,7 +199,7 @@ const innetEnv = Object.keys(process.env).reduce((result, key) => {
199
199
  return result;
200
200
  }, {});
201
201
  class InnetJS {
202
- constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
202
+ constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
203
203
  this.projectFolder = path__default["default"].resolve(projectFolder);
204
204
  this.publicFolder = path__default["default"].resolve(publicFolder);
205
205
  this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -216,6 +216,7 @@ class InnetJS {
216
216
  this.port = port;
217
217
  this.proxy = proxy;
218
218
  this.api = api;
219
+ this.baseUrl = baseUrl;
219
220
  }
220
221
  // Methods
221
222
  init(appName, { template, force = false } = {}) {
@@ -334,7 +335,7 @@ class InnetJS {
334
335
  yield copyFiles(this.publicFolder, this.buildFolder);
335
336
  const data = yield fs.promises.readFile(this.publicIndexFile);
336
337
  const pkg = yield this.getPackage();
337
- yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
338
+ yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
338
339
  }
339
340
  }));
340
341
  if (pkg) {
@@ -363,7 +364,7 @@ class InnetJS {
363
364
  preserveEntrySignatures: 'strict',
364
365
  output: {
365
366
  dir: this.devBuildFolder,
366
- sourcemap: true
367
+ sourcemap: true,
367
368
  },
368
369
  plugins: [
369
370
  commonjs__default["default"](),
@@ -554,7 +555,7 @@ class InnetJS {
554
555
  app = express__default["default"]();
555
556
  const update = () => __awaiter(this, void 0, void 0, function* () {
556
557
  const data = yield fs.promises.readFile(this.publicIndexFile);
557
- yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
558
+ yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
558
559
  });
559
560
  fs__default["default"].watch(this.publicIndexFile, update);
560
561
  yield update();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "innetjs",
3
- "version": "2.0.8",
3
+ "version": "2.0.9",
4
4
  "description": "CLI for innet boilerplate",
5
5
  "homepage": "https://github.com/d8corp/innetjs",
6
6
  "author": "Mikhail Lysikov <d8corp@mail.ru>",