Skip to content

Commit

Permalink
upgrade greenwood and GitHub Actions for node 18 (#110)
Browse files Browse the repository at this point in the history
* upgrade greenwood and GitHub Actions for node 18

* update v0.28.0-alpha.1

* upgrade actions/setup-node to v3

* upgrade greenwood alpha.2

* upgrade greenwood alpha.3

* upgrade alpha.5

* upgrade greenwood v0.28.0
  • Loading branch information
thescientist13 committed Apr 15, 2023
1 parent 4a3c15a commit 52cd9b6
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 91 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -9,12 +9,12 @@ jobs:

strategy:
matrix:
node: [16]
node: [18]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
- name: Installing project dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pages.yml
Expand Up @@ -8,15 +8,15 @@ on:
jobs:

build-and-deploy:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
env:
GH_PAGES: true

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18.12.1

- name: Install Dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
16.14.0
18.12.1
2 changes: 1 addition & 1 deletion netlify.toml
Expand Up @@ -6,5 +6,5 @@
skip_processing = true

[build.environment]
NODE_VERSION = "16.14.0"
NODE_VERSION = "18.12.1"
TZ = "America/New_York"
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -16,7 +16,7 @@
"scripts": {
"dev": "greenwood develop",
"build": "NODE_ENV=production greenwood build",
"serve": "NODE_ENV=production greenwood serve",
"serve": "NODE_ENV=production greenwood build && greenwood serve",
"story:dev": "storybook dev -p 6006",
"story:build": "storybook build",
"story:serve": "storybook build && http-server ./storybook-static",
Expand All @@ -29,8 +29,8 @@
},
"devDependencies": {
"@esm-bundle/chai": "^4.3.4",
"@greenwood/cli": "~0.27.0",
"@greenwood/plugin-postcss": "~0.27.0",
"@greenwood/cli": "~0.28.0",
"@greenwood/plugin-postcss": "~0.28.0",
"@ls-lint/ls-lint": "^1.10.0",
"@storybook/addon-actions": "^7.0.0-beta.61",
"@storybook/addon-essentials": "^7.0.0-beta.61",
Expand Down
1 change: 0 additions & 1 deletion src/pages/index.js
@@ -1,4 +1,3 @@
import fetch from 'node-fetch';
import '../components/cast-and-crew/cast-and-crew.js';
import '../components/upcoming-events/upcoming-events.js';
import '../components/spotify-playlist/spotify-playlist.js';
Expand Down
23 changes: 0 additions & 23 deletions web-test-runner.config.js
@@ -1,11 +1,7 @@
import { defaultReporter } from '@web/test-runner';
// import { greenwoodPluginImportCss } from '@greenwood/plugin-import-css/src/index.js';
import { junitReporter } from '@web/test-runner-junit-reporter';
import path from 'path';

// create a direct instance of ImportCssResource
// const importCssResource = greenwoodPluginImportCss()[0].provider({});

export default {
files: './src/**/*.spec.js',
nodeResolve: true,
Expand All @@ -19,25 +15,6 @@ export default {
coverageConfig: {
reportDir: './reports'
},
// plugins: [{
// name: 'import-css',
// async transform(context) {
// const { url } = context.request;
// const shouldIntercept = await importCssResource.shouldIntercept(url, context.body, { request: context.headers });

// if (shouldIntercept) {
// const cssResource = await importCssResource.intercept(url, context.body);
// const { body, contentType } = cssResource;

// return {
// body,
// headers: {
// 'content-type': contentType
// }
// };
// }
// }
// }],
middleware: [
function rewriteIndex(context, next) {
const { url } = context.request;
Expand Down

0 comments on commit 52cd9b6

Please sign in to comment.