@imtf/profile-scripts 1.0.7 → 1.1.0

package/bin/profile-scripts.js

@@ -1,36 +1,30 @@
 #!/usr/bin/env node
 
-const concurrently = require('concurrently')
-const spawn = require('cross-spawn')
+const concurrently = require('concurrently');
+const spawn = require('cross-spawn');
 
-const args = process.argv.slice(2)
-const scriptIndex = args.findIndex(x => x === 'build' || x === 'start')
-const script = scriptIndex === -1 ? args[0] : args[scriptIndex]
+const args = process.argv.slice(2);
+const scriptIndex = args.findIndex((x) => x === 'build' || x === 'start');
+const script = scriptIndex === -1 ? args[0] : args[scriptIndex];
 
-const scriptPath = require.resolve(`../scripts/esbuild.mjs`)
+const scriptPath = require.resolve(`../scripts/esbuild.mjs`);
 
 switch (script) {
-  case 'start': {
-    concurrently([
-      {
-        command: `node ${scriptPath} --watch`,
-        name: 'watch',
-        cwd: undefined,
-      },
-      { command: 'serve build -l 3010', name: 'serve' },
-    ])
-
-    break
-  }
+  case 'start':
   case 'build': {
-    const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : []
-    const scriptArgs = args.slice(scriptIndex + 1)
-    const processArgs = nodeArgs.concat(scriptPath).concat(scriptArgs)
+    const nodeArgs = scriptIndex > 0 ? args.slice(0, scriptIndex) : [];
+    const scriptArgs = args.slice(scriptIndex + 1);
+
+    if (script === 'start') {
+      scriptArgs.push('--watch');
+    }
+
+    const processArgs = nodeArgs.concat(scriptPath).concat(scriptArgs);
 
     const child = spawn.sync('node', processArgs, {
       stdio: 'inherit',
       env: { ...process.env, NODE_ENV: 'production' },
-    })
+    });
 
     if (child.signal) {
       if (child.signal === 'SIGKILL') {
@@ -38,21 +32,21 @@ switch (script) {
                     The build failed because the process exited too early.
                     This probably means the system ran out of memory or someone called
                     \`kill -9\` on the process.
-                `)
+                `);
       } else if (child.signal === 'SIGTERM') {
         console.log(`
                     The build failed because the process exited too early.
                     Someone might have called  \`kill\` or \`killall\`, or the system could
                     be shutting down.
-                `)
+                `);
       }
 
-      process.exit(1)
+      process.exit(1);
     }
 
-    break
+    break;
   }
   default:
-    console.log(`Unknown script "${script}".`)
-    break
+    console.log(`Unknown script "${script}".`);
+    break;
 }

package/changelog.md

@@ -2,6 +2,14 @@
 
 Here you can find a resume of all changes between versions.
 
+## 1.1.0
+
+### Features
+
+- Upgraded dependencies
+- Use new ESBuild 0.17 APIs for dev watch & rebuild
+- Properly build TS files
+
 ## 1.0.7
 
 ### Features
@@ -25,9 +33,9 @@ Here you can find a resume of all changes between versions.
 ### Features
 
 - Use differents loaders for svgs :
-    * Svgs part of /src except ones that are in /src/assets will be
-      loaded as React components with svgr.
-    * Others will be loaded as dataurl (base64)
+  - Svgs part of /src except ones that are in /src/assets will be
+    loaded as React components with svgr.
+  - Others will be loaded as dataurl (base64)
 
 ## 1.0.3
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imtf/profile-scripts",
-  "version": "1.0.7",
+  "version": "1.1.0",
   "description": "Default scripts to bundle & transpile imtf front-end plugins",
   "main": "index.js",
   "bin": {
@@ -13,9 +13,7 @@
   ],
   "scripts": {
     "build": "NODE_ENV=production node scripts/esbuild.mjs",
-    "watch": "node scripts/esbuild.mjs --watch",
-    "serve": "serve build -l 3010",
-    "start": "concurrently yarn:watch yarn:serve"
+    "start": "node scripts/esbuild.mjs --watch"
   },
   "eslintConfig": {
     "extends": "@imtf/eslint-config-react"
@@ -25,16 +23,16 @@
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
-    "@svgr/core": "^6.2.0",
-    "@svgr/plugin-jsx": "^6.2.0",
-    "@svgr/plugin-svgo": "^6.2.0",
-    "concurrently": "^7.0.0",
-    "esbuild": "^0.14.8",
+    "@svgr/core": "^7.0.0",
+    "@svgr/plugin-jsx": "^7.0.0",
+    "@svgr/plugin-svgo": "^7.0.0",
+    "concurrently": "^8.0.1",
+    "esbuild": "^0.17.16",
     "esbuild-plugin-external-global": "^1.0.1",
-    "serve": "^13.0.2"
+    "serve": "^14.1.2"
   },
   "devDependencies": {
     "@imtf/eslint-config-react": "^1.0.0",
-    "@imtf/prettier-config": "^1.0.0"
+    "@imtf/prettier-config": "^2.0.0"
   }
 }

package/scripts/esbuild.mjs

@@ -1,35 +1,35 @@
-import { build } from 'esbuild'
-import externalGlobalPlugin from 'esbuild-plugin-external-global'
-import minimist from 'minimist'
+import { context, build } from 'esbuild';
+import externalGlobalPlugin from 'esbuild-plugin-external-global';
+import minimist from 'minimist';
 
-import svgPlugin from './svgPlugin.mjs'
+import notifierPlugin from './notifierPlugin.mjs';
+import svgPlugin from './svgPlugin.mjs';
 
-const { watch } = minimist(process.argv.slice(2))
+const { watch, entryPoint } = minimist(process.argv.slice(2));
 
-build({
-  entryPoints: ['src/index.js'],
-  // outfile: 'build/index.js',
+const entryPoints = entryPoint
+  ? typeof entryPoint === 'string'
+    ? [entryPoint]
+    : entryPoint
+  : ['src/index.js'];
+
+/**
+ * @type {import('esbuild').BuildOptions}
+ */
+const config = {
+  entryPoints,
   outdir: 'build',
   platform: 'browser',
   bundle: true,
-  target: 'es6',
-
-  watch: watch
-    ? {
-        onRebuild(error, result) {
-          if (!error) {
-            console.log(`Rebuilt: ${new Date().getTime()}`)
-          }
-        },
-      }
-    : false,
+  target: 'es2020',
 
   minify:
     process.env.NODE_ENV === 'production' &&
     process.env.IMTF_MINIFY_WEBAPP !== 'false',
+
   loader: {
-    // Enable JSX in .js files too
     '.css': 'text',
+    // Enable JSX in .js files too
     '.js': 'jsx',
     // Embed fonts
     '.eot': 'dataurl',
@@ -41,6 +41,7 @@ build({
     '.jpg': 'dataurl',
     '.png': 'dataurl',
   },
+
   plugins: [
     svgPlugin(),
     externalGlobalPlugin.externalGlobalPlugin({
@@ -49,5 +50,20 @@ build({
       'react-router-dom': 'window.reactRouterDom',
       IMTFPlugins: 'window.IMTFPlugins',
     }),
+    notifierPlugin(),
   ],
-})
+};
+
+if (watch) {
+  const ctx = await context(config);
+
+  // Enable watch mode
+  await ctx.watch();
+
+  // Enable serve mode
+  await ctx.serve({
+    port: 3010,
+  });
+} else {
+  build(config);
+}

package/scripts/notifierPlugin.mjs

@@ -0,0 +1,20 @@
+const notifierPlugin = (options = {}) => ({
+  name: 'svgr',
+  setup(build) {
+    let count = 0
+
+    build.onEnd(result => {
+      if (result.errors.length > 0) {
+        return
+      }
+
+      if (count++ === 0) {
+        console.log(`1st build: ${new Date().getTime()}`)
+      } else {
+        console.log(`Rebuilt: ${new Date().getTime()}`)
+      }
+    })
+  },
+})
+
+export default notifierPlugin