Merge branch 'master' into ISSUE-203

3axap4eHko · 3axap4eHko · commit 3bb97ed84a01 · 2023-03-28T10:47:19.000-04:00
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -40,7 +40,7 @@ jobs:
               echo "File count do not match source count: ${SOURCE_JS_COUNT} to build ${BUILD_JS_COUNT}"
               exit 1
             fi
-          } 
+          }
 
           mkdir -p integration-tests/three.js
           git clone --depth 1 https://github.com/mrdoob/three.js.git integration-tests/three.js
@@ -66,20 +66,20 @@ jobs:
           EOF
 
           echo "Run swc sync"
-          rm -rf build 
+          rm -rf build
           yarn swc --sync src -d build
           checkBuild "src" "build"
 
-          rm -rf build-editor 
+          rm -rf build-editor
           yarn swc --sync editor -d ./build-editor/
           checkBuild "editor" "build-editor"
 
           echo "Run swc async"
-          rm -rf build 
+          rm -rf build
           yarn swc src -d ./build/
           checkBuild "src" "build"
 
-          rm -rf build-editor 
+          rm -rf build-editor
           yarn swc editor -d ./build-editor/
           checkBuild "editor" "build-editor"
 
@@ -108,7 +108,7 @@ jobs:
               echo "File count do not match source count: ${SOURCE_JS_COUNT} to build ${BUILD_JS_COUNT}"
               exit 1
             fi
-          } 
+          }
 
           mkdir -p integration-tests/rxjs
           git clone --depth 1 https://github.com/ReactiveX/rxjs.git integration-tests/rxjs
@@ -142,7 +142,7 @@ jobs:
           yarn swc --sync spec -d build-spec
           checkBuild "spec" "build-spec"
 
-          rm -rf build 
+          rm -rf build
 
           echo "Run swc async"
           rm -rf build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x, 14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -26,6 +26,9 @@ jobs:
       - name: Build
         run: yarn types
 
+      - name: Format
+        run: yarn prettier --check src examples
+
       - name: Test
         run: yarn test
 
diff --git a/examples/spack-basic/spack.config.js b/examples/spack-basic/spack.config.js
@@ -1,12 +1,11 @@
-const { config } = require('@swc/core/spack')
-
+const { config } = require("@swc/core/spack");
 
 module.exports = config({
-    entry: {
-        'web': __dirname + '/src/index.ts',
-    },
-    output: {
-        path: __dirname + '/lib'
-    },
-    module: {},
-});
+  entry: {
+    web: __dirname + "/src/index.ts",
+  },
+  output: {
+    path: __dirname + "/lib",
+  },
+  module: {},
+});
diff --git a/examples/spack-basic/src/common.ts b/examples/spack-basic/src/common.ts
@@ -1,2 +1,2 @@
-export const A = 'foo';
-export const B = 'bar';
+export const A = "foo";
+export const B = "bar";
diff --git a/examples/spack-basic/src/index.ts b/examples/spack-basic/src/index.ts
@@ -1,3 +1,3 @@
 import { B } from "./common";
 
-console.log(B)
+console.log(B);
diff --git a/examples/spack-multiple-entry/spack.config.js b/examples/spack-multiple-entry/spack.config.js
@@ -1,13 +1,12 @@
-const { config } = require('@swc/core/spack')
-
+const { config } = require("@swc/core/spack");
 
 module.exports = config({
-    entry: {
-        'web': __dirname + '/src/web.ts',
-        'android': __dirname + '/src/android.ts',
-    },
-    output: {
-        path: __dirname + '/lib'
-    },
-    module: {},
-});
+  entry: {
+    web: __dirname + "/src/web.ts",
+    android: __dirname + "/src/android.ts",
+  },
+  output: {
+    path: __dirname + "/lib",
+  },
+  module: {},
+});
diff --git a/examples/spack-multiple-entry/src/android.ts b/examples/spack-multiple-entry/src/android.ts
@@ -1 +1 @@
-import './common';
+import "./common";
diff --git a/examples/spack-multiple-entry/src/common.ts b/examples/spack-multiple-entry/src/common.ts
@@ -1 +1 @@
-console.log('initializing')
+console.log("initializing");
diff --git a/examples/spack-multiple-entry/src/web.ts b/examples/spack-multiple-entry/src/web.ts
@@ -1 +1 @@
-import './common';
+import "./common";
diff --git a/examples/spack-node-modules/spack.config.js b/examples/spack-node-modules/spack.config.js
@@ -1,12 +1,11 @@
-const { config } = require('@swc/core/spack')
-
+const { config } = require("@swc/core/spack");
 
 module.exports = config({
-    entry: {
-        'web': __dirname + '/src/index.ts',
-    },
-    output: {
-        path: __dirname + '/lib'
-    },
-    module: {},
-});
+  entry: {
+    web: __dirname + "/src/index.ts",
+  },
+  output: {
+    path: __dirname + "/lib",
+  },
+  module: {},
+});
diff --git a/examples/spack-node-modules/src/common.ts b/examples/spack-node-modules/src/common.ts
@@ -1,3 +1,3 @@
-import { join } from 'path';
+import { join } from "path";
 
-export const A = join(__dirname, 'src');
+export const A = join(__dirname, "src");
diff --git a/examples/spack-node-modules/src/index.ts b/examples/spack-node-modules/src/index.ts
@@ -1,3 +1,3 @@
 import { A } from "./common";
 
-console.log(A)
+console.log(A);
diff --git a/package.json b/package.json
@@ -57,16 +57,16 @@
     "@swc/cli": "^0.1.43",
     "@swc/core": "^1.2.66",
     "@swc/jest": "^0.1.2",
-    "@types/jest": "^26.0.23",
+    "@types/jest": "^29.5.0",
     "@types/node": "^12.19.16",
     "@types/semver": "^7.3.13",
     "chokidar": "^3.5.1",
     "deepmerge": "^4.2.2",
-    "jest": "^27.0.3",
+    "jest": "^29.5.0",
     "nano-staged": "^0.4.5",
     "prettier": "^2.5.1",
     "simple-git-hooks": "^2.7.0",
-    "ts-jest": "^27.0.4",
+    "ts-jest": "^29.0.5",
     "typescript": "~4.3.2"
   },
   "peerDependencies": {
diff --git a/src/spack/index.ts b/src/spack/index.ts
@@ -1,70 +1,74 @@
-import { bundle } from '@swc/core';
-import { mkdir, writeFile } from 'fs';
-import { basename, dirname, extname, join, relative } from 'path'
-import { promisify } from 'util';
+import { bundle } from "@swc/core";
+import { mkdir, writeFile } from "fs";
+import { basename, dirname, extname, join, relative } from "path";
+import { promisify } from "util";
 
-import parseSpackArgs from './options';
+import parseSpackArgs from "./options";
 
 const write = promisify(writeFile);
 const makeDir = promisify(mkdir);
 
-
 (async () => {
-    const { spackOptions } = await parseSpackArgs(process.argv);
+  const { spackOptions } = await parseSpackArgs(process.argv);
 
-    function isUserDefinedEntry(name: string) {
-        if (typeof spackOptions.entry === 'string') {
-            return spackOptions.entry === name
-        }
-        if (Array.isArray(spackOptions.entry)) {
-            for (const e of spackOptions.entry) {
-                if (e === name) {
-                    return true;
-                }
-            }
-            return false;
+  function isUserDefinedEntry(name: string) {
+    if (typeof spackOptions.entry === "string") {
+      return spackOptions.entry === name;
+    }
+    if (Array.isArray(spackOptions.entry)) {
+      for (const e of spackOptions.entry) {
+        if (e === name) {
+          return true;
         }
-
-        return name in spackOptions.entry;
+      }
+      return false;
     }
 
+    return name in spackOptions.entry;
+  }
 
-    async function build() {
-        const bundleStart = process.hrtime();
-        const output = await bundle(spackOptions);
-        const bundleEnd = process.hrtime(bundleStart);
-        console.info(`Bundling done: ${bundleEnd[0]}s ${bundleEnd[1] / 1000000}ms`);
-
-        const emitStart = process.hrtime();
-        if (spackOptions.output?.path) {
-            await Object.keys(output).map(async (name) => {
-                let fullPath = '';
-                if (isUserDefinedEntry(name)) {
-                    fullPath = join(spackOptions.output.path, spackOptions.output.name.replace('[name]', name));
-                } else {
-                    const ext = extname(name);
-                    const base = basename(name, ext);
-                    const filename = relative(process.cwd(), name);
-                    fullPath = join(spackOptions.output.path, dirname(filename), `${base}.js`)
-                }
+  async function build() {
+    const bundleStart = process.hrtime();
+    const output = await bundle(spackOptions);
+    const bundleEnd = process.hrtime(bundleStart);
+    console.info(`Bundling done: ${bundleEnd[0]}s ${bundleEnd[1] / 1000000}ms`);
 
-                await makeDir(dirname(fullPath), { recursive: true });
-                await write(fullPath, output[name].code, 'utf-8');
-                if (output[name].map) {
-                    await write(`${fullPath}.map`, output[name].map, 'utf-8')
-                }
-            });
+    const emitStart = process.hrtime();
+    if (spackOptions.output?.path) {
+      await Object.keys(output).map(async name => {
+        let fullPath = "";
+        if (isUserDefinedEntry(name)) {
+          fullPath = join(
+            spackOptions.output.path,
+            spackOptions.output.name.replace("[name]", name)
+          );
         } else {
-            throw new Error('Cannot print to stdout: not implemented yet')
+          const ext = extname(name);
+          const base = basename(name, ext);
+          const filename = relative(process.cwd(), name);
+          fullPath = join(
+            spackOptions.output.path,
+            dirname(filename),
+            `${base}.js`
+          );
         }
-        const emitEnd = process.hrtime(emitStart);
-        console.info(`Done: ${emitEnd[0]}s ${emitEnd[1] / 1000000}ms`);
 
+        await makeDir(dirname(fullPath), { recursive: true });
+        await write(fullPath, output[name].code, "utf-8");
+        if (output[name].map) {
+          await write(`${fullPath}.map`, output[name].map, "utf-8");
+        }
+      });
+    } else {
+      throw new Error("Cannot print to stdout: not implemented yet");
     }
+    const emitEnd = process.hrtime(emitStart);
+    console.info(`Done: ${emitEnd[0]}s ${emitEnd[1] / 1000000}ms`);
+  }
 
-    // if (cliOptions.watch) {
-    //     throw new Error('watch is not implemented yet')
-    // }
+  // if (cliOptions.watch) {
+  //     throw new Error('watch is not implemented yet')
+  // }
 
-    await build();
-})()
+  await build();
+})();
diff --git a/src/spack/options.ts b/src/spack/options.ts
diff --git a/src/swc/__mocks__/fs.ts b/src/swc/__mocks__/fs.ts
diff --git a/src/swc/__tests__/compile.test.ts b/src/swc/__tests__/compile.test.ts
diff --git a/src/swc/__tests__/options.test.ts b/src/swc/__tests__/options.test.ts
diff --git a/src/swc/constants.ts b/src/swc/constants.ts
diff --git a/src/swc/index.ts b/src/swc/index.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`import { B } from "./common";`
`2`	`2`
`3`		`-console.log(B)`
	`3`	`+console.log(B);`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-import './common';`
	`1`	`+import "./common";`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-console.log('initializing')`
	`1`	`+console.log("initializing");`