Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jaywcjlove/tsbb
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.0.2
Choose a base ref
...
head repository: jaywcjlove/tsbb
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.0.3
Choose a head ref
  • 3 commits
  • 12 files changed
  • 3 contributors

Commits on Sep 1, 2021

  1. chore(deps): update dependency compile-less-cli to v1.8.8 (#259)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Sep 1, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    8d928da View commit details
  2. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c18b75c View commit details
  3. released v3.0.3

    jaywcjlove committed Sep 1, 2021
    Copy the full SHA
    eefadc1 View commit details
4 changes: 2 additions & 2 deletions example/basic/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@template/basic",
"private": true,
"version": "3.0.2",
"version": "3.0.3",
"description": "Basic Example.",
"scripts": {
"start": "node lib/index.js",
@@ -17,6 +17,6 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
}
}
4 changes: 2 additions & 2 deletions example/express-typeorm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/express-typeorm",
"version": "3.0.2",
"version": "3.0.3",
"private": true,
"description": "Express Typeorm Example.",
"scripts": {
@@ -35,7 +35,7 @@
"nodemon": "2.0.12",
"ts-node": "10.2.1",
"ts-node-dev": "1.1.8",
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
},
"dependencies": {
"compression": "1.7.4",
4 changes: 2 additions & 2 deletions example/express/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/express",
"version": "3.0.2",
"version": "3.0.3",
"private": true,
"description": "Express Example.",
"scripts": {
@@ -33,7 +33,7 @@
"@types/http-errors": "1.8.1",
"nodemon": "2.0.12",
"ts-node-dev": "1.1.8",
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
},
"dependencies": {
"compression": "1.7.4",
4 changes: 2 additions & 2 deletions example/hapi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/hapi",
"version": "3.0.2",
"version": "3.0.3",
"private": true,
"description": "hapi Example.",
"main": "index.js",
@@ -30,7 +30,7 @@
"devDependencies": {
"@types/hapi__hapi": "20.0.9",
"nodemon": "2.0.12",
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
},
"dependencies": {
"@babel/runtime": "7.15.3",
4 changes: 2 additions & 2 deletions example/koa/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/koa",
"version": "3.0.2",
"version": "3.0.3",
"private": true,
"description": "Koa Example",
"scripts": {
@@ -28,7 +28,7 @@
"devDependencies": {
"@types/koa": "2.13.4",
"nodemon": "2.0.12",
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
},
"dependencies": {
"koa": "2.13.1"
6 changes: 3 additions & 3 deletions example/react-component-tsx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/react-component-tsx",
"version": "3.0.2",
"version": "3.0.3",
"description": "React Component Example for TypeScript.",
"private": true,
"main": "lib/index.js",
@@ -46,14 +46,14 @@
"@tsbb/babel-preset-tsbb": "1.14.2",
"@types/react": "17.0.19",
"@types/react-dom": "17.0.9",
"compile-less-cli": "1.8.5",
"compile-less-cli": "1.8.8",
"husky": "7.0.2",
"kkt": "6.11.0",
"lint-staged": "11.1.2",
"prettier": "2.3.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
},
"eslintConfig": {
"extends": [
6 changes: 3 additions & 3 deletions example/react-component/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@template/react-component",
"version": "3.0.2",
"version": "3.0.3",
"private": true,
"description": "React Component Example.",
"scripts": {
@@ -38,11 +38,11 @@
"@tsbb/babel-preset-tsbb": "1.14.2",
"babel-plugin-transform-remove-imports": "1.5.5",
"babel-plugin-transform-rename-import": "2.3.0",
"compile-less-cli": "1.8.5",
"compile-less-cli": "1.8.8",
"less": "4.1.1",
"parcel": "2.0.0-rc.0",
"react-test-renderer": "17.0.2",
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
},
"dependencies": {
"@parcel/transformer-react-refresh-wrap": "2.0.0-alpha.3",
4 changes: 2 additions & 2 deletions example/transform-typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@template/transform-typescript",
"private": true,
"version": "3.0.2",
"version": "3.0.3",
"description": "Transform Typescript Example.",
"scripts": {
"start": "node lib/index.js",
@@ -18,6 +18,6 @@
"keywords": [],
"license": "MIT",
"devDependencies": {
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
}
}
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.0.2",
"version": "3.0.3",
"packages": [
"example/*",
"packages/*"
4 changes: 2 additions & 2 deletions packages/create-tsbb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-tsbb",
"version": "3.0.2",
"version": "3.0.3",
"description": "Creates a TSBB application using the command line.",
"homepage": "https://jaywcjlove.github.io/tsbb",
"author": "Kenny Wong <wowohoo@qq.com> (https://github.com/jaywcjlove)",
@@ -36,7 +36,7 @@
"frontend"
],
"devDependencies": {
"tsbb": "^3.0.2"
"tsbb": "^3.0.3"
},
"dependencies": {
"create-kkt": "2.1.6"
2 changes: 1 addition & 1 deletion packages/tsbb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tsbb",
"version": "3.0.2",
"version": "3.0.3",
"description": "TSBB is a zero-config CLI that helps you develop, test, and publish modern TypeScript project.",
"author": "kenny wang <wowohoo@qq.com>",
"license": "MIT",
65 changes: 42 additions & 23 deletions packages/tsbb/src/babel/index.ts
Original file line number Diff line number Diff line change
@@ -36,40 +36,54 @@ export function transform(filename: string, options?: TransformHandleOptions): P
require.resolve('@babel/plugin-syntax-dynamic-import'),
require.resolve('babel-plugin-add-module-exports'),
require.resolve('babel-plugin-transform-typescript-metadata'),
/**
* Use the legacy (stage 1) decorators syntax and behavior.
* https://babeljs.io/docs/en/babel-plugin-proposal-decorators#legacy
* If you are including your plugins manually and using `@babel/plugin-proposal-class-properties`,
* make sure that `@babel/plugin-proposal-decorators` comes before `@babel/plugin-proposal-class-properties`.
*/
[require.resolve('@babel/plugin-proposal-decorators'), { legacy: true }],
],
};

if (!babelOptions.envName) {
babelOptions.envName = process.env.BABEL_ENV;
}

const runtimeVersion = semver.clean(require('@babel/runtime/package.json').version);
if (cjs) {
babelOptions.presets.push([
require.resolve('@babel/preset-env'),
{
loose: true,
},
]);
babelOptions.envName = 'cjs';
babelOptions.plugins.push([
require.resolve('@babel/plugin-transform-runtime'), {
useESModules: false,
loose: false,
require.resolve('@babel/preset-env'), {
modules: 'cjs',
// https://github.com/babel/babel/issues/10261#issuecomment-549940457
version: require('@babel/helpers/package.json').version,
loose: false,
},
]);
babelOptions.envName = 'cjs';
const transformRuntime = {
modules: 'cjs',
loose: false,
/**
* transform-runtime regression, not requiring _objectSpread helper
* https://github.com/babel/babel/issues/10261#issuecomment-549940457
*/
version: require('@babel/helpers/package.json').version,
};
if (!semver.gte(runtimeVersion, '7.13.0')) {
/**
* ⚠️ This option has been deprecated: starting from version 7.13.0,
* @babel/runtime's package.json uses "exports" option to automatically choose between CJS and ESM helpers.
* https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
*/
(transformRuntime as any).useESModules = !semver.gte(runtimeVersion, '7.13.0');
}
babelOptions.plugins.push([require.resolve('@babel/plugin-transform-runtime'), transformRuntime]);
babelOptions.plugins.push([require.resolve('babel-plugin-transform-remove-imports'), {
test: "\\.(less|css)$"
}]);
babelOptions.plugins.push(["@babel/plugin-proposal-class-properties", { loose: true }]);
babelOptions.plugins.push(["@babel/plugin-transform-classes", { loose: true }]);
babelOptions.plugins.push(["@babel/plugin-proposal-class-properties", { loose: false }]);
babelOptions.plugins.push(["@babel/plugin-transform-classes", { loose: false }]);
}

if (esm) {
const runtimeVersion = semver.clean(require('@babel/runtime/package.json').version);
babelOptions.presets.push([
require.resolve('@babel/preset-env'), {
modules: false,
@@ -81,21 +95,26 @@ export function transform(filename: string, options?: TransformHandleOptions): P
]);
babelOptions.envName = 'esm';
const transformRuntime = {
useESModules: true,
loose: false,
modules: 'auto',
// https://github.com/babel/babel/issues/10261#issuecomment-549940457
/**
* transform-runtime regression, not requiring _objectSpread helper
* https://github.com/babel/babel/issues/10261#issuecomment-549940457
*/
version: require('@babel/helpers/package.json').version,
};
if (!semver.gte(runtimeVersion, '7.13.0')) {
transformRuntime.useESModules = !semver.gte(runtimeVersion, '7.13.0');
/**
* ⚠️ This option has been deprecated: starting from version 7.13.0,
* @babel/runtime's package.json uses "exports" option to automatically choose between CJS and ESM helpers.
* https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
*/
(transformRuntime as any).useESModules = !semver.gte(runtimeVersion, '7.13.0');
}
babelOptions.plugins.push([require.resolve('@babel/plugin-transform-runtime'), transformRuntime]);
babelOptions.plugins.push([require.resolve('@babel/plugin-proposal-class-properties'), {
loose: true
}]);
babelOptions.plugins.push([require.resolve('@babel/plugin-proposal-class-properties'), { loose: true }]);
babelOptions.plugins.push([require.resolve('babel-plugin-transform-rename-import'), {
original: '^(.+?)\\.less$', replacement: '$1.css'
original: '^(.+?)\\.(less|scss|sass|styl)$', replacement: '$1.css'
}]);
}
if (envName) {