Skip to content
This repository has been archived by the owner on May 15, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into feature/mount-user-one-app-directory
Browse files Browse the repository at this point in the history
  • Loading branch information
bishnubista authored Sep 29, 2023
2 parents 02fa397 + 6f239ab commit 086f139
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 7 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/set-tag.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Set npm Registry Latest Tag

on:
workflow_dispatch:
inputs:
name:
description: 'Name of package'
default: 'holocron'
required: true
type: choice
options:
- '@americanexpress/one-app-runner'
- '@americanexpress/one-app-locale-bundler'
- '@americanexpress/one-app-dev-bundler'
- '@americanexpress/one-app-bundler'
- '@americanexpress/eslint-plugin-one-app'
version:
description: 'version to tag'
required: true
type: string
tag:
description: 'tag'
default: 'latest'
required: true
type: choice
options:
- latest
- alpha
- beta
jobs:
set-tag:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v3
with:
node-version: 18
registry-url: https://registry.npmjs.org/
- run: npm dist-tag add ${{ github.event.inputs.name }}@${{ github.event.inputs.version}} ${{ github.event.inputs.tag }}
env:
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
8 changes: 8 additions & 0 deletions packages/holocron-dev-server/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.3](https://github.com/americanexpress/one-app-cli/compare/@americanexpress/holocron-dev-server@0.2.2...@americanexpress/holocron-dev-server@0.2.3) (2023-09-28)

**Note:** Version bump only for package @americanexpress/holocron-dev-server





## [0.2.2](https://github.com/americanexpress/one-app-cli/compare/@americanexpress/holocron-dev-server@0.2.1...@americanexpress/holocron-dev-server@0.2.2) (2023-09-18)

**Note:** Version bump only for package @americanexpress/holocron-dev-server
Expand Down
4 changes: 2 additions & 2 deletions packages/holocron-dev-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@americanexpress/holocron-dev-server",
"version": "0.2.2",
"version": "0.2.3",
"description": "A micro-frontend dev server for Holocron Modules",
"license": "Apache-2.0",
"keywords": [
Expand Down Expand Up @@ -38,7 +38,7 @@
"module": "src/index.js",
"dependencies": {
"@americanexpress/fetch-enhancers": "^1.0.3",
"@americanexpress/one-app-bundler": "^6.21.2",
"@americanexpress/one-app-bundler": "^6.21.3",
"@americanexpress/one-app-ducks": "^4.1.1",
"@americanexpress/one-app-router": "^1.1.0",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.0-beta.1",
Expand Down
8 changes: 8 additions & 0 deletions packages/one-app-bundler/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [6.21.3](https://github.com/americanexpress/one-app-cli/compare/@americanexpress/one-app-bundler@6.21.2...@americanexpress/one-app-bundler@6.21.3) (2023-09-28)

**Note:** Version bump only for package @americanexpress/one-app-bundler





## [6.21.2](https://github.com/americanexpress/one-app-cli/compare/@americanexpress/one-app-bundler@6.21.0...@americanexpress/one-app-bundler@6.21.2) (2023-09-18)

**Note:** Version bump only for package @americanexpress/one-app-bundler
Expand Down
4 changes: 2 additions & 2 deletions packages/one-app-bundler/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@americanexpress/one-app-bundler",
"version": "6.21.2",
"version": "6.21.3",
"description": "A command line interface(CLI) tool for bundling One App and its modules.",
"main": "index.js",
"bin": {
Expand Down Expand Up @@ -39,7 +39,7 @@
"license": "Apache-2.0",
"dependencies": {
"@americanexpress/eslint-plugin-one-app": "^6.13.5",
"@americanexpress/one-app-dev-bundler": "^1.5.2",
"@americanexpress/one-app-dev-bundler": "^1.5.3",
"@americanexpress/one-app-locale-bundler": "^6.6.0",
"@americanexpress/purgecss-loader": "4.0.0",
"@babel/core": "^7.17.5",
Expand Down
11 changes: 11 additions & 0 deletions packages/one-app-dev-bundler/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.5.3](https://github.com/americanexpress/one-app-cli/compare/@americanexpress/one-app-dev-bundler@1.5.2...@americanexpress/one-app-dev-bundler@1.5.3) (2023-09-28)


### Bug Fixes

* **dev-bundler:** styles loader ([#571](https://github.com/americanexpress/one-app-cli/issues/571)) ([c928874](https://github.com/americanexpress/one-app-cli/commit/c928874288adb68cf3bd5c3e73c93e586f2d0a50))





## [1.5.2](https://github.com/americanexpress/one-app-cli/compare/@americanexpress/one-app-dev-bundler@1.5.1...@americanexpress/one-app-dev-bundler@1.5.2) (2023-09-18)


Expand Down
4 changes: 2 additions & 2 deletions packages/one-app-dev-bundler/esbuild/plugins/styles-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* permissions and limitations under the License.
*/

import * as sass from 'sass';
import { compile as sassCompile } from 'sass';
import postcss from 'postcss';
import cssModules from 'postcss-modules';
import crypto from 'crypto';
Expand All @@ -40,7 +40,7 @@ const stylesLoader = (cssModulesOptions = {}, { bundleType } = {}) => ({
// Compile scss to css
let cssContent;
if (args.path.endsWith('scss')) {
cssContent = sass.compile(args.path, { loadPaths: ['./node_modules'] }).css.toString();
cssContent = sassCompile(args.path, { loadPaths: ['./node_modules'] }).css.toString();
} else {
cssContent = await fs.promises.readFile(args.path, 'utf8');
}
Expand Down
2 changes: 1 addition & 1 deletion packages/one-app-dev-bundler/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@americanexpress/one-app-dev-bundler",
"version": "1.5.2",
"version": "1.5.3",
"description": "A development bundler focussed on speed and modern features.",
"main": "index.js",
"bin": {
Expand Down

0 comments on commit 086f139

Please sign in to comment.